Commit Graph

22 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
stilobique-i7 c3eb95f872 Fix Warcraft scene and clean stool 2 props 2021-05-27 10:41:57 +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 f61df80818 Replace candles meshes and candlestick 2021-05-27 09:35:56 +02:00
stilobique-i7 86d82145d6 Fix lightmap size and material default 2021-05-18 12:10:45 +02:00
VAILLANT Jeremy 384b1245b9 Fix all material, mesh and lightmap site ; disable light and set the basic fire light 2021-05-14 23:28:46 +02:00
stilobique-surface 332ccf95e7 Fix lightmap uv on candle d and candle top 2021-05-14 23:22:08 +02:00
stilobique-surface 6301d6f63f Clean files 2021-05-13 22:00:14 +02:00
VAILLANT Jeremy 0b3ef7e137 Fix shader 2021-05-12 14:49:59 +02:00
VAILLANT Jeremy 01f8b9de1b Re-import mesh 2021-05-12 13:07:28 +02:00
VAILLANT Jeremy 2c00e2b2f3 fix materials props 2021-05-11 19:29:05 +02:00
VAILLANT Jeremy e613868c65 Calculate lightmap on lightmap scene test 2021-05-11 18:30:01 +02:00
stilobique-surface 47f205da04 Finish to setup lightmap scene and props 2021-05-11 17:29:08 +02:00
stilobique-surface afba69d9e3 Update props candles and candlestick 2021-05-11 15:51:02 +02:00
stilobique-surface 5fcbf405e6 Update props candles 2021-05-11 14:42:55 +02:00
stilobique-surface 85fcfdd00a WIP Candle lightmap setup 2021-05-11 11:39:11 +02:00
stilobique-surface 20c6f964c8 WIP Candlestick split mesh and texture 2021-05-10 14:20:32 +02:00
stilobique-surface d6bf6006af WIP Candle Subsurface setup 2021-05-09 19:57:20 +02:00
stilobique-surface 03295f3711 Add candle subsurface texture 2021-05-09 19:16:21 +02:00
stilobique-surface ec1fc57a81 Add candles props, misc candle variation and a candlestick 2021-05-08 16:42:31 +02:00