diff --git a/blends/environment.blend b/blends/environment.blend index d60fc8c..a6722bc 100644 --- a/blends/environment.blend +++ b/blends/environment.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:130c4ea0e790ea4136b96607757dd5ccab2c4a42968563f326c1147032c5c19a -size 1202696 +oid sha256:f9ff0be9e3044c0d5ff831262d95cc294cc106557aacbcfe26dae8114f4bb538 +size 1174808 diff --git a/blends/environment.blend1 b/blends/environment.blend1 index 74ae4f8..6175516 100644 Binary files a/blends/environment.blend1 and b/blends/environment.blend1 differ diff --git a/godot/.import/camera_positions.glb-93772d48b845e88725c00b3f57a174aa.md5 b/godot/.import/camera_positions.glb-93772d48b845e88725c00b3f57a174aa.md5 index 36a7201..16e2a81 100644 --- a/godot/.import/camera_positions.glb-93772d48b845e88725c00b3f57a174aa.md5 +++ b/godot/.import/camera_positions.glb-93772d48b845e88725c00b3f57a174aa.md5 @@ -1,3 +1,3 @@ -source_md5="f6f19525174d964bcfbd5e0d10af60f4" -dest_md5="b244913244895512a1541ec37a177db9" +source_md5="7c602c98ab6b6d162738d3826a346a58" +dest_md5="58079185907704af747ce80864c8e4a0" diff --git a/godot/.import/camera_positions.glb-93772d48b845e88725c00b3f57a174aa.scn b/godot/.import/camera_positions.glb-93772d48b845e88725c00b3f57a174aa.scn index 7658efa..4a96911 100644 Binary files a/godot/.import/camera_positions.glb-93772d48b845e88725c00b3f57a174aa.scn and b/godot/.import/camera_positions.glb-93772d48b845e88725c00b3f57a174aa.scn differ diff --git a/godot/GlobalCursorState.gd b/godot/GlobalCursorState.gd index 1a41935..f4bf896 100644 --- a/godot/GlobalCursorState.gd +++ b/godot/GlobalCursorState.gd @@ -5,6 +5,9 @@ var is_frozen = false signal cursor_interact +func _ready(): + Input.set_mouse_mode(Input.MOUSE_MODE_HIDDEN) + func set_cursor(set_as: Node): cursor = weakref(set_as) diff --git a/godot/assets/room/camera_positions.glb b/godot/assets/room/camera_positions.glb index 74329bd..15ba374 100644 --- a/godot/assets/room/camera_positions.glb +++ b/godot/assets/room/camera_positions.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08de21e2fa6a13cd6764890b234ef54340014be3158c87a6b1a7c38bf783f1d0 -size 3472 +oid sha256:9aaeb4f54cdf38656f2a43a3a82d668b262069e19d146483f52ea91d02bf0fb4 +size 3476 diff --git a/godot/export_presets.cfg b/godot/export_presets.cfg index 5a4c730..c8c04c0 100644 --- a/godot/export_presets.cfg +++ b/godot/export_presets.cfg @@ -40,3 +40,28 @@ application/product_name="" application/file_description="" application/copyright="" application/trademarks="" + +[preset.1] + +name="Linux/X11" +platform="Linux/X11" +runnable=true +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../../Downloads/gb/Goodnight Jellybean.x86_64" +script_export_mode=1 +script_encryption_key="" + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false +texture_format/bptc=false +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +texture_format/no_bptc_fallbacks=true diff --git a/godot/screens/disclaimer.tscn b/godot/screens/disclaimer.tscn index 1f979e6..7ebbd40 100644 --- a/godot/screens/disclaimer.tscn +++ b/godot/screens/disclaimer.tscn @@ -53,7 +53,7 @@ margin_bottom = 842.0 mouse_filter = 1 text = "Welcome to Goodnight Jellybean! We're excited to have you join us on this educational adventure. -We will be interacting with our virutal environment using FunMouse (tm). Simply use the left and right mouse buttons to change the direction of the cursor and use the scroll wheel to move the cursor in its current direction. Interact with nearby objects by pressing the middle mouse button. +We will be interacting with our virutal environment using FunMouse (tm). Simply use the left and right mouse buttons to change the direction of the cursor and use the scroll wheel to move the cursor in its current direction. Interact with nearby objects by pressing the middle mouse button. Please make sure your audio is turned on. Don't have a mouse with a scroll wheel? You can also use the arrow keys and space bar to navigate and interact with the game. However, your child will be missing out on learning an important skill. diff --git a/godot/world.tscn b/godot/world.tscn index e56d991..5b5f6c8 100644 --- a/godot/world.tscn +++ b/godot/world.tscn @@ -245,6 +245,11 @@ transform = Transform( 8.71637, 0, 0, 0, 13.8749, 0, 0, 0, 5.83956, 0, 0, 15.481 on_enter_func = "_on_Cursor_set_camera" call_string = "camera_bookshelf_secret" +[node name="SecretLeave" parent="CameraMoveZones" instance=ExtResource( 6 )] +transform = Transform( 8.71637, 0, 0, 0, 13.8749, 0, 0, 0, 9.43964, 0, 0, 15.4817 ) +on_leave_func = "_on_Cursor_set_camera" +call_string = "camera_bookshelf_secret" + [node name="AmbientSound" parent="." instance=ExtResource( 7 )] [node name="Attic" type="Spatial" parent="."] diff --git a/store_assets/room_screenshot.png b/store_assets/room_screenshot.png new file mode 100644 index 0000000..fadd2bb --- /dev/null +++ b/store_assets/room_screenshot.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ada22939c33f103cd6f7dd9bb40e90e25ccfaf02be205c41ff8d3dda2517184 +size 496477 diff --git a/store_assets/text.png b/store_assets/text.png new file mode 100644 index 0000000..692e335 --- /dev/null +++ b/store_assets/text.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e09e0bb9e1b1e031ca175878f03f19bb0cea8f4b38fece61ecac40aa306dcc91 +size 48754