Commit graph

971 commits

Author SHA1 Message Date
westonCoder 963d0fee09 made numPortalsPassed part of raycast struct 2023-10-31 15:17:32 -05:00
westonCoder 4bacaa9607 Player can hold objects through portals recursively
- fixed a bug where security camera was not updating its PLAYER_STANDING flag
- added a new parameter numPortalsPassed to collisionSceneRaycast to indicate how many portals the raycast went through, if any
- altered all player code involving the grabbingThroughPortal variable
- grabbingThroughPortal is now: 0 if not grabbing through portal, >0 if grabbing through portal 0, <0 if grabbing through portal 1.
- objects are dropped when they are being held through a portal and the player no longer has line of sight to them.
2023-10-31 13:21:49 -05:00
lambertjamesd 02237dcfb3
Merge pull request #392 from westonCoder/falling-funnel-fix
Fixes getting stuck infinitly falling
2023-10-30 20:23:59 -06:00
westonCoder 1b1b564c03 Fixes getting stuck infinitly falling
- if you put your self in an infinite fall and had portal funneling enabled you would be stuck there
- this change allows the player to get out of that if they are moving in x or y dir.
2023-10-30 19:08:28 -05:00
lambertjamesd 2de7b2cdb3
Merge pull request #389 from hackgrid/hide-empty-subtitles
don't render empty subtitles
2023-10-30 08:37:05 -06:00
hackgrid 85fe99db91
fix condition 2023-10-30 12:22:24 +01:00
lambertjamesd a6735203f2
Merge pull request #388 from hackgrid/fix-sliders
make languages sliders bigger and fix last value selection
2023-10-29 19:54:04 -06:00
hackgrid ec80a3b315
don't render empty subtitles 2023-10-29 14:28:49 +01:00
hackgrid 0e644e66eb
make languages sliders bigger and fix last value selection 2023-10-29 13:57:32 +01:00
lambertjamesd f09944e43b
Merge pull request #386 from westonCoder/fix-door-clipping
Fixes Player Clipping Issues
2023-10-28 20:13:57 -06:00
James Lambert a1dce2040f Make font renderer big enough for the largest string
remove commentary from captions
2023-10-28 19:43:47 -06:00
James Lambert f2f94ed7af Finish up non english fonts 2023-10-28 19:24:21 -06:00
James Lambert 3bfe6f4a76 Add support for fonts with more than 256 chracters 2023-10-28 12:31:30 -06:00
westonCoder 9b7ffeb9e4 made air acceleration a bit smaller 2023-10-28 12:52:37 -05:00
westonCoder b04efece5e applied fixes 2023-10-28 12:22:07 -05:00
James Lambert a9f71892ad Align translations to 16 byte boundary 2023-10-27 20:11:07 -06:00
lambertjamesd 5d695170e4
Merge pull request #385 from westonCoder/fix-door-collision
Fix Door Object Collision Issue
2023-10-27 16:13:32 -06:00
westonCoder 3a4e4b8924 Fixes Player Clipping Issues
Fixes #139

- this fixes player clipping through doors, and out of elevator.
- I made the x and y normalized so that the player doesnt go faster while holding down forward x and forward y
- this made movement a bit slower so I increased PLAYER_SPEED a bit
- also removed a is_fast if statment. this seems to be the primary code that was allowing for the clipping.
2023-10-27 13:45:28 -05:00
westonCoder 7a1c9986a5 correct and move logic to world.lua script 2023-10-27 13:01:57 -05:00
westonCoder 6d4c41d379 Fix Door Object Collision Issue
- simply extended the door quad while checking for rigidbody doorway passing

Fixes #344
2023-10-27 09:55:48 -05:00
lambertjamesd 92056d5e4f
Merge pull request #384 from westonCoder/add-ambient-sound
Fix Save Load Current Sound Problem
2023-10-27 08:25:59 -06:00
James Lambert e9a72bc967 Get translation loading mostly working 2023-10-26 22:32:18 -06:00
James Lambert 93d99d6cb5 Build translations into separate files 2023-10-26 22:00:02 -06:00
westonCoder 282a4befce Fix Save Load Current Sound Problem
Fixes #382

- to alleviate the above issue I saved the current sound from each channel in the cutscene runner and serialize r/w appropriately.
- also made a new channel for Ambient Sounds called CH_AMBIENT. there are now 3 total channels CH_GLADOS, CH_MUSIC, and CH_AMBIENT

the only issue that is remaining is because we are relying on cutscene runner to que up the ambient sounds, the ambient sounds dont start until a cutscene starts on a level. this could be alleviated by making a trigger in the starting elevator of each level that simply triggers the ambient sound to play.
2023-10-26 21:47:31 -05:00
James Lambert bd45d91445 Adjust fall rumble thresholds 2023-10-26 19:26:25 -06:00
James Lambert 7e5a9ff495 Triangulate static vertices 2023-10-26 19:18:06 -06:00
James Lambert 2f911fe58f do not triangulate when exporting 2023-10-26 19:06:42 -06:00
James Lambert b38c920525 Work on intro cutscene 2023-10-26 18:56:49 -06:00
lambertjamesd 30fce9981b
Merge pull request #381 from westonCoder/add-ambient-sound
Added Ambient Sound to Game
2023-10-26 17:58:40 -06:00
westonCoder 4c5c23315b Added Ambient Sound to Game
- simply added the ambient_base sound to the game. its actually a very small sound file, so we could layer on other ambient sounds on top that are queued by different parts of the level in the future if we wanted.
- because this is an activeSound it is also effected by the bug where if you save and reload it is no longer playing (just like the current glados voice line activeSound)
- tested in entire game seems to work well.
2023-10-26 12:40:14 -05:00
James Lambert 996de635b6 Fix weird portal surface glitch when portal is moved 2023-10-25 21:56:32 -06:00
lambertjamesd 0d21f9818b
Merge pull request #367 from westonCoder/add-music-to-chambers
Added music to appropriate levels
2023-10-25 14:09:22 -06:00
westonCoder c11baf4397 readme update 2023-10-25 14:20:57 -05:00
westonCoder ef1ea9f04c Added music to appropriate levels
- added 3 new songs and triggered them at appropriate moments according to the wiki
- made a new CH_MUSIC channel for music
- adjusted music volume to be initialized at 50% which seems like the right volume to match the original game.
- tested the entire game to make sure its all working properly.
2023-10-25 14:17:53 -05:00
lambertjamesd f12f18ae4a
Merge pull request #365 from hackgrid/fix-readme-3
Update Blender version in README.md
2023-10-25 08:44:52 -06:00
hackgrid abecd1f093
Update README.md to mention reflections 2023-10-25 15:48:28 +02:00
hackgrid f2a566e865
Update Blender version in README.md 2023-10-25 15:44:13 +02:00
James Lambert f075892f33 Triangulate meshes in blender when exporting to fbx 2023-10-24 22:30:37 -06:00
James Lambert 5a32c2faec Fix bug where dying while touching a portal can lead to a crash 2023-10-24 21:29:25 -06:00
James Lambert 288407ca02 fix countdown clocks
implement cutscene rumble support
2023-10-23 21:50:23 -06:00
James Lambert 714505f9c0 Take portal gun away from player 2023-10-23 21:14:57 -06:00
James Lambert a6d9924e59 Add cutscene rumble support 2023-10-23 21:12:47 -06:00
James Lambert 15644b5e4d Fix inconsistent player landing rumble 2023-10-23 20:51:51 -06:00
James Lambert 7089c29ecb Pause rumble pak when game is paused 2023-10-21 21:43:14 -06:00
James Lambert 7a5267195d animate ball from pedestal
add camera shake and rumble when auto portals open
2023-10-21 21:35:50 -06:00
James Lambert 3d3c012fea Add portal fizzle rumble 2023-10-20 22:00:59 -06:00
James Lambert e1a5a2c852 Get metal reflection effect working 2023-10-20 21:38:11 -06:00
lambertjamesd c01f5051f6
Merge pull request #342 from westonCoder/save-load-crash-fix
Fixes a save load crash and audio bug
2023-10-20 11:05:00 -06:00
lambertjamesd 5584f4c89c
Merge pull request #345 from hackgrid/fix-readme-2
fix Makefile and update docs
2023-10-20 11:02:00 -06:00
hackgrid 0098405262 fix Makefile and update docs 2023-10-20 11:56:31 +02:00