Commit graph

445 commits

Author SHA1 Message Date
Weston Salinas 1a58634348 portal overlap fixes 2023-04-02 11:54:00 -05:00
Weston Salinas a87efb2046 Added Readme addition for portal overlapping issue. 2023-04-01 14:35:22 -05:00
Weston Salinas 2cac746e40 Various Portal Visual Bug Fixes
- fixes "holes" being left behind
- fixes portals in same x position (aligned vertically) not being displayed properly
- fixes a hardware only crash where two portals being placed at roughly the same time would crash the game

Fixes #53
2023-04-01 11:22:28 -05:00
James Lambert 0d312e1f79 More work on test chamber 07 2023-03-31 21:10:42 -06:00
James Lambert 0cdb9bf8c0 More work on test chamber 07 2023-03-30 16:40:49 -06:00
James Lambert 8c50e8f4fa More work on test chamber 7 2023-03-30 08:02:53 -06:00
James Lambert 31390f0d29 work on test chamber 07 2023-03-29 19:59:16 -06:00
James Lambert e5e6bc577f Work on test chamber 07 2023-03-27 21:24:10 -06:00
lambertjamesd 717c04941b
Merge pull request #80 from westonCoder/portalgun-movement
Adds Movement to Portal Gun
2023-03-27 14:14:58 -06:00
lambertjamesd 202ef9392b
Merge pull request #84 from westonCoder/readme-logo-addition2
added an animated portal64 logo to readme
2023-03-27 14:10:51 -06:00
Weston Salinas 5077f65b61 added an animated portal64 logo to readme 2023-03-27 14:35:30 -05:00
lambertjamesd b96c241260
Merge pull request #81 from westonCoder/new-player-controls-fixes
Simply fixed grabbing controls
2023-03-26 21:38:14 -06:00
James Lambert e9e443ebeb Refactor door to be controlled by animation controller to allow for multiple door types 2023-03-26 21:33:23 -06:00
Weston Salinas 6b909f778b Simply fixed grabbing controls
- the player shouldnt be able to shoot a portal while grabbing an object (as in game)
- if the player does shoot while grabbing an object then the object is dropped (as in game)
2023-03-25 09:58:18 -05:00
Weston Salinas 1b58e47d4f Adds Movement to Portal Gun
- The portal gun now has its own .c/.h files
- the portal gun is a struct containing a CollisionObject and RigidBody
- portal gun CollisionObject is set as a permanent player point constraint
- portal gun also moves while shooting
- video attached of it working
- was tested on N64 hardware no game breaking issues.
2023-03-24 20:38:58 -05:00
James Lambert 4736414bed Document how to use the debugger with the evedrive 2023-03-23 22:44:35 -06:00
lambertjamesd f92a592b70
Merge pull request #78 from westonCoder/readme-todolist-additions
Some README additions to track issues and new features
2023-03-23 20:28:30 -06:00
Weston Salinas e41e75f322 Some README additions to track issues and new features
- removed long list of completed tasks
- added some new features
- added a sound addition todolist
- added a prioritized bug todolist (all hardware verified)
2023-03-22 20:16:43 -05:00
lambertjamesd a700cc9d98
Merge pull request #72 from westonCoder/grabbing-through-wall-fix
Fixed Objects Clipping Through Walls
2023-03-22 17:07:58 -06:00
lambertjamesd 1c7d55d6db
Merge pull request #74 from westonCoder/fizzler-portal-crash-fix
Fixes Game Crash On Portal Exit Fizzler Enter
2023-03-22 17:06:54 -06:00
lambertjamesd f177d9c1e0
Merge pull request #76 from westonCoder/objects-dissappear-between-rooms
Fixed Objects Dissapearing Between Rooms
2023-03-22 17:06:11 -06:00
lambertjamesd 04de43b46a
Merge pull request #73 from westonCoder/objects-clipping-through-doors-fix
Fixes Objects Clipping Through Doors
2023-03-22 17:05:22 -06:00
Weston Salinas e6ce03faef moved room changing code to collision_scene in its own function 2023-03-22 15:32:11 -05:00
Weston Salinas 0b7fec38c2 fixed to use flags rather than function call. 2023-03-22 13:52:14 -05:00
Weston Salinas 4d88d9c3c4 Requested alterations implemented 2023-03-21 22:13:03 -05:00
Weston ef096a54f7
Merge branch 'master' into objects-clipping-through-doors-fix 2023-03-21 21:44:04 -05:00
lambertjamesd f55dd41501
Merge pull request #71 from westonCoder/add-various-sound-effects
Added Various Sounds to Game
2023-03-21 18:27:08 -06:00
lambertjamesd 40fb30c000
Merge pull request #67 from westonCoder/portal-pedastal-fix
Fixes #57
2023-03-21 18:25:40 -06:00
Weston Salinas ac697d8114 Fixed Objects Dissapearing Between Rooms
previously if the player walked with a decore object to a new room
within a level, the object would dissapear (because it was no longer
set to the correct currentRoom). This can be seen in test chamber 0 with the
radio for example.

- this is a simple fix to change the currentRoom of a grabbed object
to the players room if the player walks through a doorway.
2023-03-19 16:37:32 -05:00
Weston Salinas 0c8a96e796 Fixes Game Crash On Portal Exit Fizzler Enter
- only allows fizzler to close portals if the player is not in a portal currently.

Fixes #28
2023-03-17 09:59:07 -05:00
Weston Salinas 7ad51a2766 Fixes Objects Clipping Through Doors
- simply added a collision layer to doors so that decore objects cant clip through them anymore when closed
2023-03-17 09:40:20 -05:00
Weston Salinas 62cc0289c0 Fixed Objects Clipping Through Walls
This fix was implemented by checking the distance from the player to
the nearest collision object (thats not the player and the object they're
holding) and if that is too close, adjusting the grab point back towards the player.

grab point is also bounded to -1.5 -> 0 so that the grab point doesnt go somewhere odd.

Also if a player is holding an object and they are much too close to a wall
(less than 0.3 distance) it will disable grabbing on the object and drop the
object.

Fixes #32
Fixes #11
2023-03-16 14:49:24 -05:00
Weston Salinas e360a288df Added A Few More Sounds and Utilized Flags
- Door open and close sound implemented
- Pedestal rotating sound implemented
- Elevator moving sound and timing implemented
- fixed implementation to make use of object flags rather than global variables (this was a good catch because it fixed a bug when there were two buttons loaded at once)
2023-03-15 18:04:08 -05:00
lambertjamesd 030ba98694
Merge pull request #63 from westonCoder/hud-finishing-touches
HUD Finishing Touches
2023-03-14 21:26:14 -06:00
Weston Salinas ef476af8a3 Added Various Sounds to Game
- intercom on sound triggers when its the first queued sound
- intercom off sound triggers when its the last queued sound in a string of sounds
- button press sound implemented
- cube dropper now has a sound when it drops cube
- pedestal now has a shooting sound
2023-03-14 15:34:34 -05:00
Weston d3f32ba5b2
Merge branch 'master' into portal-pedastal-fix 2023-03-14 11:29:25 -05:00
Weston Salinas b6f3e33a2f Changed How Fix Was Implemented
- save checkpoint is now at a few more places
- removed previous revision
- removed portalgun flag from being saved to a save file in player.c
  this was due to the fact that that information is already saved in
  checkpoints (I think?) and doesnt seem to serve a purpose
- the only downside (or maybe this is intended) is when a player
  loads from a checkpoint it only seems to load from the start of the
  blender file level (so if there are two levels in one blender file
  and the player clipped out or died in the second level then it would load
  back to the first level in that blender file)
2023-03-14 11:21:04 -05:00
Weston 53c7d10130
Merge branch 'master' into hud-finishing-touches 2023-03-14 09:36:55 -05:00
Weston Salinas 05762daa42 small fixes to adhere to coding standards 2023-03-14 09:33:57 -05:00
James Lambert 1f2992fbb6 Work on the test chamber some more 2023-03-13 21:58:11 -06:00
lambertjamesd 8cfe569c00
Merge pull request #70 from westonCoder/player-action-sounds
Player Action Sound Additions
2023-03-13 21:41:52 -06:00
James Lambert aac8af391e Work on test chamber 07 2023-03-13 21:13:47 -06:00
James Lambert f4b149d24b Start work on test chamber 07 2023-03-13 21:13:47 -06:00
Weston 718b19a95b
Merge branch 'master' into player-action-sounds 2023-03-13 22:10:50 -05:00
Weston Salinas 52ede9d936 Player Action Sound Additions
- player now has footsteps (always sounds like concrete steps)
- player now has jump footstep
- player now has landing footstep
- player has select (grabbing) sound
- player now has select denied sound
- player has various new additions to flags to accomodate sounds

Fixes #20
Fixes #69
2023-03-13 22:04:31 -05:00
lambertjamesd 274194a3dc
Merge pull request #64 from westonCoder/camera-centering-functionality
Looking Forward/Backward Functionality
2023-03-13 20:29:10 -06:00
lambertjamesd b9e9a0d69c
Merge pull request #66 from westonCoder/signage_flickering
Flickering Signage Addition
2023-03-13 20:28:28 -06:00
lambertjamesd ff2345e58a
Merge pull request #68 from westonCoder/portal-gun-reset-at-level-zero
Resets Portal Gun State at Level 0
2023-03-13 20:26:01 -06:00
Weston Salinas 89576f28a8 Fixes #35 2023-03-12 14:59:14 -05:00
Weston Salinas 82e7c0f99a Fixes #57 2023-03-12 14:10:01 -05:00