Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correctly define path to control box switch mesh #14

Merged
merged 8 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions .godot/global_script_class_cache.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ list=Array[Dictionary]([{
"language": &"GDScript",
"path": "res://scripts/item/car.gd"
}, {
"base": &"Node",
"class": &"Config",
"icon": "",
"language": &"GDScript",
"path": "res://addons/logger/config.gd"
}, {
"base": &"Observable",
"class": &"DarkRoad",
"icon": "",
Expand Down Expand Up @@ -95,6 +101,18 @@ list=Array[Dictionary]([{
"language": &"GDScript",
"path": "res://scripts/item/generic/item.gd"
}, {
"base": &"RefCounted",
"class": &"JsonData",
"icon": "",
"language": &"GDScript",
"path": "res://addons/logger/json-data.gd"
}, {
"base": &"Node",
"class": &"LogStream",
"icon": "",
"language": &"GDScript",
"path": "res://addons/logger/log-stream.gd"
}, {
"base": &"Observable",
"class": &"Mechanism",
"icon": "",
Expand Down Expand Up @@ -125,12 +143,6 @@ list=Array[Dictionary]([{
"language": &"GDScript",
"path": "res://scripts/item/generic/observable.gd"
}, {
"base": &"Node",
"class": &"OptionsConstants",
"icon": "",
"language": &"GDScript",
"path": "res://addons/EasyMenus/Scripts/options_constants.gd"
}, {
"base": &"Resource",
"class": &"ProtonScatterBaseShape",
"icon": "",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="e498578efefc577ddbb0e257552fac7d"
dest_md5="1de5bc52ef763bc03ffb753bdfa5eab6"
dest_md5="53934533203a8657f61908a5a02be5a1"
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="a7594812277c0f513192cb7969b6573c"
dest_md5="5f91dd82d872c7cbdcefd8ec910a9f30"
dest_md5="4720028adf4fcd64b6ef9fb97ffd60e8"
Binary file modified .godot/imported/brick.glb-d79404ecf88b29143e6e07e77bacb44c.scn
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="2363f5129d4bd1510e126638c39f7379"
dest_md5="95d670224f15a320c95c3732144568a6"
dest_md5="82c6536b61aa9ba45d55612bfcdc5c43"
Binary file modified .godot/imported/bush.glb-28e0128066fe8d913839a6b96204b1c6.scn
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="d28fc1b4998adc3f0ef9aeebc3099059"
dest_md5="43e7cf69ccc9b54a8a560968ca86ab7c"
dest_md5="3120e8627fd85e0dffaa930f089b9191"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="81425403dffc8e4a8722edc480988edb"
dest_md5="82b37f1033cf12357c82cb49f073421a"
dest_md5="f77681161bf685758a8fb067cefe48a5"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="acf67c6d4b4eddc4751a018ed6cf3ca9"
dest_md5="f37a94e0b17a4e60ba899f1459003892"
dest_md5="001d331d10fb156de30d4d918cc0d32c"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="47b2f0428ac459670abcb7eed226e03e"
dest_md5="091fe4b7e5fde3bcfdd7ac311c5575dc"
dest_md5="6f0dfad3090721e9eda817b8de14d359"
Binary file modified .godot/imported/gobot.glb-36505aa16090f2bc2f34fbe5362f44e8.scn
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="78c80a15562fc393dc8d024b43f1dd75"
dest_md5="87b3e6b8aca9d8e3051d2628f4e1d5d9"
dest_md5="70d8b873a7cdd5494936a1283092db23"
Binary file modified .godot/imported/grass.glb-0ef73576363e4c601b9f45b1787e1487.scn
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="c8ea57ccd2f30a806bfd7c6c516a9391"
dest_md5="1e048276a6630a1b26d955bdd544a52a"
dest_md5="64f1d5e37347a6f24c9f521529912fc6"
Binary file modified .godot/imported/grass_2.glb-2dc56a32acf64077863c701e8b94ea02.scn
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="1fc3800f498ce772e019676efe8fb1c8"
dest_md5="560c32023579075e39a419583d3690c5"
dest_md5="8cd3ead11cdf497a5f909cd7936b4246"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="d41b4c6d18ea38557a3db75c02211906"
dest_md5="5e9079268ddfcfc248354c743987729c"
dest_md5="1821bde55f93880ecd8f16965bfeee62"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="9cca2d6634b61774d490534b8f565fce"
dest_md5="1a88b93d5eb9c3ef3b6d823f7a079ef3"
dest_md5="6ef3a97eb62cabea5d1a54967f924517"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="6061dbc319955281054c4160679e3aa2"
dest_md5="7e72593e0be8336037513a000505c686"
dest_md5="ca7bd4f03890dc71ab31e5f0c750e255"
Binary file modified .godot/imported/small_rock.glb-9b9690e480edfa6e23f0243045338de9.scn
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source_md5="a4c148dcac1393f31f0aca35e3497b59"
dest_md5="c052c91364a9aa97136c6b97900728ed"
dest_md5="e130df7991ae2a15a5993328aa07905c"
Binary file modified .godot/imported/tree.glb-86fae6fb2428df7d74097b1a7c75b288.scn
Binary file not shown.
18 changes: 6 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,22 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### Security
### Dependencies

## [1.0.2]
### Fixed
- Correctly define path to control box switch mesh [#14](https://github.com/MechanicalFlower/HazyRoad/pull/14)

## [1.0.1]
### Added
### Changed
### Deprecated
### Removed
### Fixed
- Add the English translation [#13](https://github.com/MechanicalFlower/HazyRoad/pull/13)
### Security
### Dependencies

## [1.0.0]
### Added
### Changed
- Optimize images via ImgBot [#1](https://github.com/MechanicalFlower/HazyRoad/pull/1)
- Update sky shader to add clouds [#4](https://github.com/MechanicalFlower/HazyRoad/pull/4)
### Deprecated
### Removed
### Fixed
- Include `.godot` folder to fix the CI build step [#2](https://github.com/MechanicalFlower/HazyRoad/pull/2)
### Security
### Dependencies

[Unreleased]: https://github.com/MechanicalFlower/HazyRoad/compare/1.0.1...HEAD
[Unreleased]: https://github.com/MechanicalFlower/HazyRoad/compare/1.0.2...HEAD
[1.0.2]: https://github.com/MechanicalFlower/HazyRoad/compare/1.0.1...1.0.2
[1.0.1]: https://github.com/MechanicalFlower/HazyRoad/compare/1.0.0...1.0.1
[1.0.0]: https://github.com/MechanicalFlower/HazyRoad/commits/1.0.0
3 changes: 3 additions & 0 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ butler *ARGS: check-butler
sed -i "s,application/version=.*$,application/version=\"{{ game_version }}\",g" ./export_presets.cfg
sed -i "s,application/short_version=.*$,application/short_version=\"{{ short_version }}\",g" ./export_presets.cfg

echo "Update version in the project.godot"
sed -i "s,config/version=.*$,config/version=\"{{ game_version }}\",g" ./project.godot

echo "Create the override.cfg"
touch override.cfg
echo -e '[build_info]\npackage/version="{{ game_version }}"\npackage/build_date="{{ build_date }}"\nsource/commit="{{ commit_hash }}"' > override.cfg
Expand Down
22 changes: 14 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,23 @@ A short puzzle game with a dark atmosphere, made with [Godot Engine](https://god

</div>

## About
# About

You're on your way home and come to a crossroads where a barrier is blocking your way. You decide to get out of your car to find a way through.
Ever had one of those days where even getting home feels like a puzzle? Well, that's exactly what happens in __Hazy Road__. You're cruising home, and bam! A barrier shows up out of nowhere, blocking your way. So, you do what any sane person would do – step out of your car and figure out how to get the heck out of this crossroads mess.

### Controls
Explore and interact with object to figure out how to unblock your way at the crossroads.

- `WASD` to move.
- `Mouse` to move the camera around.
- `Shift` to sprint.
- `Space` to jump.
- `ESC` to open and close settings menu.
## Controls

Keep it simple and straight:

- <kbd>W</kbd><kbd>A</kbd><kbd>S</kbd><kbd>D</kbd>: Move around, just like in real life.
- <kbd>Mouse</kbd>: Look around, because that's what you'd do.
- <kbd>Shift</kbd>: Speed things up with a good old sprint.
- <kbd>Space</kbd>: Jump – because life's full of unexpected obstacles.
- <kbd>ESC</kbd>: Press this when you need a breather, to fiddle with settings or take a break.

It's not the fanciest game, but hey, neither is life. So, go on, tackle that crossroads puzzle, and let's see if you've got what it takes to outsmart a stubborn barrier. Good luck!

### Screenshots

Expand Down
2 changes: 1 addition & 1 deletion assets/models/lamp_post_bench_trashcan/control_box.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

[node name="ControlBox" type="Node3D"]

[node name="ControlBox_1" parent="." instance=ExtResource("1_6goij")]
[node name="ControlBoxMesh" parent="." instance=ExtResource("1_6goij")]
6 changes: 3 additions & 3 deletions export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ application/modify_resources=true
application/icon=""
application/console_wrapper_icon=""
application/icon_interpolation=4
application/file_version="1.0.0.20231231"
application/product_version="1.0.0.20231231"
application/file_version="1.0.1.20240114"
application/product_version="1.0.1.20240114"
application/company_name="Mechanical Flower"
application/product_name="Marble"
application/file_description=""
Expand Down Expand Up @@ -131,7 +131,7 @@ application/bundle_identifier="io.itch.MechanicalFlower"
application/signature=""
application/app_category="Games"
application/short_version="1.0"
application/version="1.0.0"
application/version="1.0.1"
application/copyright="2023-present Mechanical Flower"
application/copyright_localized={}
application/min_macos_version="10.12"
Expand Down
1 change: 1 addition & 0 deletions plug.gd
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ func _plugging():
"HolonProduction/godot_kanban_tasks",
{"commit": "cfc914caa1dabd085024ff196bcb8578eaee1e67", "include": ["addons/kanban_tasks"]}
)
plug("florianvazelle/Log", {"commit": "51878aa55c4169f19b2c000f0e53b77439654829"})

# Patched version
plug("florianvazelle/EasyMenus", {"commit": "4d960ef6ab9f51a206e2eb40c2cc0b8f8eced71a"})
8 changes: 6 additions & 2 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@ config_version=5
[addons]

universal_fade/patterns_directory="res://addons/UniversalFade/Patterns"
logger/log_message_format="{hour}:{minute}:{second} [{level}] {log_name} : {message}"
logger/use_utc_time_format=true
logger/break_on_error=false

[application]

config/name="Hazy Road"
config/description="You're on your way home and come to a crossroads where a barrier is blocking your way. You decide to get out of your car to find a way through."
config/version="1.0.0"
config/version="1.0.1"
run/main_scene="res://scenes/menu.tscn"
config/features=PackedStringArray("4.2")

Expand All @@ -30,6 +33,7 @@ DebugMenu="*res://addons/debug_menu/debug_menu.tscn"
GlobalSignal="*res://scripts/framework/global_signal.gd"
GameState="*res://scripts/framework/game_state.gd"
MenuTemplateManager="*res://addons/EasyMenus/Nodes/menu_template_manager.tscn"
Log="*res://addons/logger/logger.gd"

[display]

Expand All @@ -38,7 +42,7 @@ window/size/viewport_height=720

[editor_plugins]

enabled=PackedStringArray("res://addons/debug_menu/plugin.cfg", "res://addons/dialogue_label/plugin.cfg", "res://addons/kanban_tasks/plugin.cfg", "res://addons/proton_scatter/plugin.cfg", "res://addons/scenetomeshconverter/plugin.cfg")
enabled=PackedStringArray("res://addons/debug_menu/plugin.cfg", "res://addons/dialogue_label/plugin.cfg", "res://addons/kanban_tasks/plugin.cfg", "res://addons/logger/plugin.cfg", "res://addons/proton_scatter/plugin.cfg")

[filesystem]

Expand Down
2 changes: 1 addition & 1 deletion scenes/item/receptacle/fuse_box.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ translation_keys = Array[String](["FUSE_BOX"])
identifier = "fuse_box"
icon = ExtResource("2_dkrrj")

[node name="ControlBox_1" parent="." instance=ExtResource("3_bhemg")]
[node name="ControlBox" parent="." instance=ExtResource("3_bhemg")]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.1, 0, 0)

[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
Expand Down
Loading
Loading