Commit Graph

25 Commits

Author SHA1 Message Date
Vaillant Jeremy 4d5db7bb61 Make Main, Settings, ChooseScene, and gameplay run in Godot 4.6
Catch-all commit for everything the --convert-3to4 tool missed during a
manual playtest of the game. All errors raised by clicking through Main
-> Puzzles -> level were fixed.

GDScript:
- PackedScene.instance() -> instantiate() (ChooseScene.gd)
- String(x) constructor doesn't exist -> str(x) (MBase, MScene,
  MLevel, Animation, Levels)
- 'x as int/String/bool' doesn't parse strings -> explicit
  int()/str()/bool(int()) (MScene, MLevel, MSetting)
- BaseButton.pressed (property) -> button_pressed; set_pressed() ->
  direct assignment (Settings.gd)
- AnimationPlayer.add_animation() removed -> go through
  AnimationLibrary (Levels.gd)
- PhysicsDirectSpaceState3D.intersect_ray(from, to, ...) ->
  PhysicsRayQueryParameters3D.create() (Levels.gd)
- @export with type-hint-in-comment ('# (String, ...)') -> explicit
  @export_enum (candle.gd)
- Get effective material with get_active_material() instead of
  get_surface_override_material(), with null guard (Levels.gd)
- get_node() -> get_node_or_null() so missing items from ahog.json
  (e.g. sm_super_dager in Home) don't crash (Levels.gd)

Scenes/resources:
- Remove 14 Tween nodes from WarCraft.tscn — Tween is no longer a
  Node in Godot 4. Rewrite Animation.start_dissolve to use
  create_tween().tween_method().
- Rename property material/N -> surface_material_override/N in every
  .tscn (10 files) — Godot 3 -> 4 rename that --convert-3to4 missed.
  Without this, MeshInstance3D.get_active_material(0) returned the
  glTF-imported StandardMaterial3D instead of the project's custom
  dissolve ShaderMaterial.

Shaders:
- One-shot scripts/migrate_shaders.gd walks every .material under
  assets/ and fixes Godot 3 -> 4 shader code in-place. Fixed 17
  materials: depth_draw_alpha_prepass -> depth_prepass_alpha,
  hint_color -> source_color, NORMALMAP -> NORMAL_MAP.

Result: Main, Settings, ChooseScene, and the WarCraft level all run
without script or shader errors. Remaining noise is non-blocking
(visual_shader graph in text_outline.material, baked lightmap binary
format from Godot 3, and empty animation tracks).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 19:40:03 +02:00
Vaillant Jeremy 770434482d Fix Setting.gd Vector2/Window API, re-import all assets for Godot 4
- apply_resolution: Vector2 strings -> Vector2i(int, int); use
  Window.content_scale_size instead of removed
  Viewport.set_size_2d_override variants.
- Re-import 162 assets to Godot 4 format (.godot/imported/ now,
  .stex -> .ctex, FontFile, CompressedTexture2D, etc.).
- Add .uid sidecars Godot 4 generates next to every script.
- Ignore .godot/ cache and android/ template directories.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 19:26:10 +02:00
Vaillant Jeremy 01ea3af253 Run godot --convert-3to4 (automated conversion)
Apply Godot 4.6 automated conversion: renames Spatial.translate->position,
margin_*->offset_*, tool->@tool, .empty()->.is_empty(), DynamicFont->FontFile,
onready->@onready, export()->@export, and many more.

127 files changed by the tool. Manual fixes still required for:
 - godot_db_manager plugin (incompatible APIs: WindowDialog, Tabs, etc.)
 - lod plugin (Spatial -> Node3D renames)
 - ResourceLoader.load_interactive removed -> load_threaded_request
 - OS.set_window_fullscreen removed -> DisplayServer
 - Viewport.set_size_override removed

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 19:18:27 +02:00
darknight 1883355678 feature/connect-level-and-reset-btn (#77)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#77
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-06 16:54:38 +02:00
stilobique-i7 385d0437ec Increase lightmap (table, book and candle) and fix UV2 fiole 2021-05-27 09:35:57 +02:00
stilobique-i7 5c9269f2e2 Make lightmap with table and clear book scene items 2021-05-24 15:26:30 +02:00
stilobique-i7 3bf46d7e8e Clear old book mesh 2021-05-23 15:38:21 +02:00
stilobique-i7 96ba39ae91 Replace old book mesh with LOD system on warcraft scene 2021-05-23 15:28:08 +02:00
stilobique-i7 7b2e9ebcc4 Updat ebook meshes and textures 2021-05-23 14:27:31 +02:00
stilobique-surface 6301d6f63f Clean files 2021-05-13 22:00:14 +02:00
stilobique-surface 92f1fc6f4f Solve conflict #2 2021-05-13 20:31:47 +02:00
VAILLANT Jeremy 0b3ef7e137 Fix shader 2021-05-12 14:49:59 +02:00
VAILLANT Jeremy 2c00e2b2f3 fix materials props 2021-05-11 19:29:05 +02:00
stilobique-surface 47f205da04 Finish to setup lightmap scene and props 2021-05-11 17:29:08 +02:00
stilobique-surface ca1a6969d1 Update prop book 2021-05-11 15:51:26 +02:00
stilobique-surface 50d9408292 Update lightmap scene test 2021-05-11 11:39:35 +02:00
stilobique-surface 275e96b126 Update book props, split content and prepare the lightmap 2021-05-11 11:19:51 +02:00
stilobique-surface f136022d0d Fix book lightmap and wip lightmap scene test 2021-05-10 14:34:36 +02:00
stilobique-surface 9e7d77b297 Setup props book ready with baking 2021-05-10 14:32:44 +02:00
stilobique-surface af3dd6dffb Props book, split texture and mesh 2021-05-10 14:20:04 +02:00
stilobique-surface 876d2d38c7 Fix book lightmap and wip lightmap scene test 2021-05-10 11:09:50 +02:00
stilobique-surface 35069feb05 Setup props book ready with baking 2021-05-09 22:23:23 +02:00
stilobique-surface ea63efc2a4 Update Warcraft scene, update lighting and populate items 2021-05-09 17:16:16 +02:00
stilobique-surface 8367c2278f Clear unused textures 2021-05-08 14:33:35 +02:00
stilobique 5a14c74e7c Add book asset 2021-05-08 14:33:34 +02:00