Commit Graph

53 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
darknight 213847e95c feature/templating-level (#74)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#74
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-05 14:11:47 +02:00
stilobique dee1ee5b1b feature/select-puzzle-update (#72)
Si tu peut regarder pour finir la pull request pour l'écran de selection des puzzles !

Co-authored-by: stilobique-i7 <aurelienvlt@free.fr>
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#72
Co-authored-by: stilobique <aurelienvlt@free.fr>
Co-committed-by: stilobique <aurelienvlt@free.fr>
2021-06-04 17:54:23 +02:00
darknight 6f1ac4d03f Fix loading scenes (#70)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#70
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-03 23:17:53 +02:00
darknight d1bf0f76d8 Fix case and move single script in folder scripts (#69)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#69
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-03 22:53:49 +02:00
darknight 0debe0d2d3 feature/update-main-ui (#66)
Co-authored-by: stilobique-i7 <aurelienvlt@free.fr>
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#66
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-03 22:18:50 +02:00
darknight 1c45fac8cb Disconnect signal if exist (#62)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#62
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-05-31 08:52:05 +02:00
darknight ed20465f39 feature/list-object-counter (#60)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#60
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-05-29 21:09:10 +02:00
VAILLANT Jeremy a2c2b5c894 Fix name method ambiant -> ambient 2021-05-25 14:14:17 +02:00
VAILLANT Jeremy fa9838fa87 Addd sound when user click 2021-05-25 14:14:13 +02:00
VAILLANT Jeremy 03fe0c753d Fix word ambient -> ambient 2021-05-25 14:14:03 +02:00
VAILLANT Jeremy c46cb1f41e Add setting true/false audio background in war level 2021-05-25 14:14:03 +02:00
stilobique 242f58e119 Merge branch 'dev' into feature/link-hud-to-code 2021-05-18 10:51:24 +02:00
VAILLANT Jeremy 557444f89d Refactor scene instance for HUD 2021-05-17 10:38:45 +02:00
VAILLANT Jeremy 367ee388da Fix list object 2021-05-15 20:40:16 +02:00
stilobique-surface 73d811a35b Update select scene item, clean old button reset and add *button reset* and *button large*. 2021-05-15 17:29:18 +02:00
VAILLANT Jeremy 890931faa8 Link back button to quit code main menu 2021-05-15 17:17:12 +02:00
darknight 3d37ec00a6 Merge branch 'dev' into feature/save-state-scene 2021-05-15 16:42:32 +02:00
VAILLANT Jeremy 6980458eec Get count element 2021-05-15 16:37:52 +02:00
stilobique-surface c85c878ba7 Interface list :
- generate a subscene to control the list HO
- add back button on Warcraft Scene
2021-05-15 16:27:05 +02:00
VAILLANT Jeremy 7fa7228232 Create method for labels and button to template 2021-05-15 14:14:17 +02:00
VAILLANT Jeremy 6b9e476b00 Use dbb for levels 2021-05-15 14:05:09 +02:00
Vaillant Jeremy ae31945fd8 Fix template select scene 2021-05-15 12:13:37 +02:00
Vaillant Jeremy 7561cfadf7 Change pointer mouse in button 2021-05-15 12:13:24 +02:00
Vaillant Jeremy ad3886d484 Add margin container 2021-05-15 12:13:23 +02:00
Vaillant Jeremy 772219fe8d Clean scene 2021-05-15 12:13:23 +02:00
Vaillant Jeremy b09bec6861 Add blur effect in icon game 2021-05-15 12:13:23 +02:00
Vaillant Jeremy a2d8cdb3da Fix interaction menu 2021-05-15 12:13:23 +02:00
stilobique-surface 74a5c3ac69 Reordering scene, and setup basic scene instance on main view 2021-05-15 12:13:23 +02:00
VAILLANT Jeremy 9eddf8b812 Add useless variables & add id scene 2021-05-14 22:23:57 +02:00
VAILLANT Jeremy 23e8bef1b8 Use BDD for list scenes 2021-05-13 23:20:56 +02:00
VAILLANT Jeremy 3238c76822 Configure gyroscope and settings 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 9ef437a558 Remove useless spaces 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 41d4307c0d Remove useless node 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 5791514d43 Replace scene about by settings 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 1d0f94f39a Move files warcraft scene to folder 2021-05-12 13:10:56 +02:00
VAILLANT Jeremy aaeecb139c Close #8 - Fix loading value progress 2021-05-10 15:32:22 +02:00
VAILLANT Jeremy 1b0a81e3dc Add folder for exporting project 2021-05-10 14:41:54 +02:00
darknight 353233b0ce Merge pull request 'feature/populate-warcraft' (#27) from feature/populate-warcraft into dev
Reviewed-on: Athena/game-source#27
2021-05-10 14:37:10 +02:00
stilobique-surface cab250b73d Update list level select, add a simple label info 2021-05-10 14:24:54 +02:00
stilobique-surface 62e0eff51c Setup list map select 2021-05-10 14:18:45 +02:00
VAILLANT Jeremy c70fbdbfd7 Translate about scene 2021-05-09 23:41:47 +02:00
VAILLANT Jeremy 0de0aa262b Add translate for loading scene 2021-05-09 23:32:43 +02:00
VAILLANT Jeremy 78b566f5b8 Add loading when load warcraft scene 2021-05-09 17:10:40 +02:00
VAILLANT Jeremy 275c0a080f Configure autoload & input end 2021-05-09 17:10:24 +02:00
VAILLANT Jeremy bcd947f334 Refacto open scene UI 2021-05-08 17:25:15 +02:00
VAILLANT Jeremy 165055110b Change position x 2021-05-08 17:25:15 +02:00