Vaillant Jeremy
21176546eb
Add dagger PBR textures, font import sidecars, migrate_shaders uid
...
- assets/props/dagger/dagger_Dagger_{BC,NM}.png + dagger_dagger_{E,ORM}.png:
complete PBR texture set for the dagger prop.
- assets/fonts/MKX Title.ttf.import + kirsty/*.otf.import: Godot 4 import
metadata sidecars for fonts whose source files were already tracked.
- scripts/migrate_shaders.gd.uid: UID sidecar missed in the previous
migration commit.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
2026-05-16 19:44:56 +02:00
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
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
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
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
stilobique-i7
04d41abc90
Update the Spyglass mesh, push textures and all lods
2021-05-27 22:59:53 +02:00
stilobique-i7
50a14a482f
Fix fiole lightmap
2021-05-27 10:44:52 +02:00
stilobique-i7
c3eb95f872
Fix Warcraft scene and clean stool 2 props
2021-05-27 10:41:57 +02:00
stilobique-i7
b74ac4744d
Clear bad method on Parchment script
2021-05-27 09:35: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
d9bd8c5ec3
Parchment props, make an editable instance scene
2021-05-27 09:35:57 +02:00
stilobique-i7
a43be5179d
Replace stool b with a LOD setup
2021-05-27 09:35:56 +02:00
stilobique-i7
721197ae1d
Change table LOD default mesh
2021-05-27 09:35:56 +02:00
stilobique-i7
f61df80818
Replace candles meshes and candlestick
2021-05-27 09:35:56 +02:00
stilobique-i7
813e27c828
WIP Parchment, make an editor script and set value on Warcraft scene
2021-05-27 09:35:56 +02:00
stilobique-i7
f330135fa8
Replace growler mesh with a lod setup
2021-05-27 09:35:47 +02:00
stilobique-i7
c50f14a882
Props godet, make all LOD and update scene with this new object
2021-05-27 09:35:47 +02:00
stilobique-i7
69ea236583
Parchment, update mesh wood and paper, make a specific scene to control it ; and bake a new lightmap
2021-05-27 09:35:47 +02:00
VAILLANT Jeremy
fa9838fa87
Addd sound when user click
2021-05-25 14:14:13 +02:00
VAILLANT Jeremy
2b0662da9b
Use ogg instead mp3
2021-05-25 14:14:13 +02:00
VAILLANT Jeremy
ca40062a74
Add sounds object
2021-05-25 14:13:54 +02:00
VAILLANT Jeremy
53723b9d4a
Add ambiant sound level warcraft
2021-05-25 14:13:54 +02:00
stilobique-i7
f6a7e2e9ec
Update rock floor, prepare all lod item but get only the last LOD meshes
2021-05-24 16:16:14 +02:00
stilobique-i7
5c9269f2e2
Make lightmap with table and clear book scene items
2021-05-24 15:26:30 +02:00
stilobique-i7
a79a2ef687
Set a new table mesh with LOD
2021-05-24 13:26:03 +02:00
stilobique-i7
c71cfe0efe
Fix parchment paper material
2021-05-24 12:57:32 +02:00
stilobique-i7
f1bc2aa6d2
Fix fiole default value
2021-05-23 22:22:25 +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
9af4cd875c
Add a basic debug color
2021-05-23 15:26:39 +02:00
stilobique-i7
7b2e9ebcc4
Updat ebook meshes and textures
2021-05-23 14:27:31 +02:00
stilobique-i7
06b1bd38dc
Fole material, fix value to default value
2021-05-23 13:33:08 +02:00
stilobique-i7
6bb67a488c
Fix default column material and lightmap
2021-05-23 12:25:48 +02:00
stilobique-i7
12ba465f50
Reimport spyglass
2021-05-18 12:10:46 +02:00
stilobique-i7
86d82145d6
Fix lightmap size and material default
2021-05-18 12:10:45 +02:00
stilobique-i7
dd44fe97d3
Remove fucking Spyglass case error
2021-05-18 12:09:36 +02:00
stilobique-surface
98ee4249c5
Fix material default to HO item
2021-05-18 12:09:34 +02:00
stilobique-surface
58eb0624d2
Update HO props with a lightmap setup
2021-05-18 12:09:33 +02:00
stilobique-surface
24500ac039
Reduce polycount about the Rock Floor mesh
2021-05-18 12:09:33 +02:00
stilobique
242f58e119
Merge branch 'dev' into feature/link-hud-to-code
2021-05-18 10:51:24 +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
9d9ca0a283
Add env base
2021-05-15 16:40:14 +02:00
stilobique-surface
9cb97f9d41
Push again, and again !! And AGAIN !!!! (spoon spyglass)
2021-05-15 16:31:10 +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