Commit Graph

462 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 ec906117bb Replace godot_db_manager plugin with native DB, port lod plugin
godot_db_manager was incompatible with Godot 4 (used WindowDialog, Tabs,
PopupPanel which were all removed). Replace with a minimal Database.gd
that parses the same ahog.json format and exposes the same surface API
(get_table_by_name, get_data_at_row_idx, edit_data, save_db, etc.) used
by the M* model classes — no changes needed in MBase/MScene/MLevel/MSetting.

Also port the lod plugin: fix class_name syntax (Godot 4 uses @icon
separately from class_name extends) and Particles -> GPUParticles3D.

Rewrite Global.gd async scene loading: the convert-3to4 tool mapped
load_interactive -> load_threaded_request but those have different APIs
(stage count, poll vs. status enum). Reimplement using the new
load_threaded_get_status / load_threaded_get pair.

Clean project.godot: drop the old _global_script_classes table (Godot 4
uses inline class_name declarations), remove gddb_* autoloads, and
remove the godot_db_manager entry from editor_plugins.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 19:21:09 +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
Vaillant Jeremy efa35a444a Migrate to Godot 3.5 LTS
Open project with Godot 3.5.3 to update project.godot to the new
config format (adds physical_scancode field to InputEventKey).
Intermediate step before --convert-3to4 to Godot 4.x.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 19:16:24 +02:00
Vaillant jeremy 1b09871881 Remove volume 2021-08-01 14:48:46 +02:00
Vaillant jeremy 71cce49de9 Add missing volume entry 2021-08-01 14:41:26 +02:00
Vaillant jeremy 7f143ea725 Push only if bin has changed 2021-08-01 14:38:54 +02:00
Vaillant jeremy 1d0c8ac2f2 Ignore .keep files 2021-08-01 14:36:16 +02:00
Vaillant jeremy 842ed4bb98 Replace environment name with string directly 2021-08-01 14:33:35 +02:00
Vaillant jeremy bee1de6a3e Ignore signed apk 2021-08-01 14:18:15 +02:00
Vaillant jeremy 50fc89a9e8 Fix path volumes 2021-08-01 14:09:19 +02:00
Vaillant jeremy d3b540a31f Change image docker for android CI 2021-08-01 13:58:17 +02:00
Vaillant jeremy 53925fe8be Change name export 2021-08-01 13:55:54 +02:00
Vaillant jeremy f1ea980ab1 Add BDD & exclude folder testing scenes 2021-08-01 13:50:37 +02:00
Vaillant jeremy 9f81936398 Configure new export 2021-08-01 13:37:49 +02:00
Vaillant jeremy c8c8c492cd Add 2 pipes (Android/Linux) 2021-08-01 13:37:31 +02:00
Vaillant jeremy b61a3079cb Use direct value instead env secret 2021-08-01 13:23:39 +02:00
Vaillant jeremy 6fe916593c Remove echo command 2021-08-01 13:19:37 +02:00
Vaillant jeremy 6f5bb1c925 FUCK 6 !! 2021-08-01 13:18:01 +02:00
Vaillant jeremy 9a91c406b8 FUCK 5 !! 2021-08-01 13:15:11 +02:00
Vaillant jeremy d76b00e235 FUCK 4 !! 2021-08-01 13:14:36 +02:00
Vaillant jeremy 1f2b24ffba FUCK 3 !! 2021-08-01 13:13:37 +02:00
Vaillant jeremy 2400ce791f FUCK 2 !! 2021-08-01 13:13:08 +02:00
Vaillant jeremy fd384bec25 FUCK !! 2021-08-01 13:12:18 +02:00
Vaillant jeremy 242e2a57ae Try export api key 2021-08-01 13:11:26 +02:00
Vaillant jeremy 8f1c210c9a Revert var env ... 2021-08-01 13:00:11 +02:00
Vaillant jeremy ba971e8d97 Change environment inject 2021-08-01 12:56:09 +02:00
Vaillant jeremy 013f231969 Configure env for butler 2021-08-01 12:43:46 +02:00
Vaillant jeremy 7892b0a617 Remove icon 2021-08-01 12:43:30 +02:00
Vaillant jeremy 8d1497bfe8 Change pCI for build & push windows debug version 2021-08-01 12:33:50 +02:00
Vaillant jeremy 88ab86a0cd Update sources packages 2021-07-31 18:32:28 +02:00
Vaillant jeremy 994dcbe30d Download keystore to pcloud 2021-07-31 18:26:36 +02:00
Vaillant jeremy dc22fe29cd Change container for android 2021-07-31 17:54:58 +02:00
darknight 1b430a3369 feature/jenkins (#1)
Co-authored-by: stilobique-i7 <aurelienvlt@free.fr>
Co-authored-by: Aurelien Vaillant <a.vaillant.moderlab@gmail.com>
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Co-authored-by: Vaillant jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#1
Co-authored-by: darknight <vaillant.jeremy.loic@gmail.com>
Co-committed-by: darknight <vaillant.jeremy.loic@gmail.com>
2021-07-24 18:09:55 +02:00
darknight d48940296f Merge pull request 'Fix anim HUD' (#84) from bugfix/hud-object-list-anim into dev
Reviewed-on: Athena/game-source#84
2021-06-26 15:59:05 +02:00
VAILLANT Jeremy 301ef3f916 Fix anim HUD 2021-06-26 15:42:02 +02:00
darknight a33ecafb81 feature/shader-animation (#83)
Co-authored-by: Vaillant Jeremy <vaillant.jeremy@dev-crea.com>
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#83
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-26 15:33:34 +02:00
darknight 34612f83a8 Add number version (#79)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#79
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-06 19:11:21 +02:00
darknight fcff613a93 bugfix/android-database (#78)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#78
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-06 18:54:25 +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 d3ded14020 Merge pull request 'Add gdignore on release folder' (#76) from feature/ignore-folder into dev
Reviewed-on: Athena/game-source#76
2021-06-05 14:47:33 +02:00
stilobique-i7 9325a591a6 Add gdignore on release folder 2021-06-05 14:46:18 +02:00
stilobique 9712f13365 feature/packages (#75)
Branche dédié pour la generation des packages

Co-authored-by: stilobique-i7 <aurelienvlt@free.fr>
Reviewed-on: Athena/game-source#75
Co-authored-by: stilobique <aurelienvlt@free.fr>
Co-committed-by: stilobique <aurelienvlt@free.fr>
2021-06-05 14:13:44 +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