Commit graph

461 commits

Author SHA1 Message Date
Weston Salinas 8fe8ed17eb updated todo in readme 2023-04-05 19:51:17 -05:00
Weston Salinas ff2101642d Adding Sound for Fast Falling
- added a new function in SoundPlayer that allows to adjust a playing activesound
- added new fast falling whoosh sound
- tuned whoosh sound to be right volume
2023-04-05 19:31:57 -05:00
James Lambert 2cf701f863 Finish up test chamber 11 2023-04-04 06:24:59 -06:00
James Lambert 392f9adf9c Work on cutscenes and triggers for test chamber 07 2023-04-03 07:26:19 -06:00
lambertjamesd 96b508a08b
Merge pull request #91 from westonCoder/add-contributing
Adding a CONTRIBUTING.md to the project
2023-04-03 06:20:49 -06:00
lambertjamesd ca63018394
Merge pull request #90 from westonCoder/add-license
Adding a License
2023-04-03 06:20:13 -06:00
Weston Salinas ad2ed74ae4 Adding a CONTRIBUTING.md to the project 2023-04-02 14:23:17 -05:00
Weston Salinas e135be8c43 Adding a License
Fixes #5

I've looked around a lot at similar types of de-makes/mods and the general consensus seems to use either:
MIT License
or
GPL2.0 or 3.0

Here are a list of examples:

GAME REMAKES:
https://github.com/jonof/jfduke3d - GPL2.0
https://sourceforge.net/p/ufoai/code/ci/master/tree/ - GPL2.0
https://github.com/hasseily/Deathlord-Relorded - GPL3.0
https://github.com/smbx/smbx-legacy-source - MIT
https://github.com/b3dgs/warcraft-remake - GPLv3.0
https://github.com/LazyDuchess/OpenTS2 - Mozilla v2.0
https://github.com/JohanLi/uncharted-waters-2 - MIT License
https://github.com/undefined-darkness/open-horizon - MIT
https://github.com/ChariotEngine/Chariot - MIT
https://github.com/sandsmark/freeaoe - GPL3.0
https://github.com/SFTtech/openage - GPLv3.0
https://github.com/bjaraujo/Bombermaaan - GPLv3.0
https://github.com/GlPortal/glPortal - zlib license
https://github.com/UnknownShadow200/ClassiCube - various licenses
https://github.com/fogleman/Craft - MIT
https://github.com/PistonDevelopers/hematite - MIT
https://github.com/MovingBlocks/Terasology - Apache 2.0
https://github.com/danicat/pacgo - MIT
https://github.com/Novum/vkQuake - GPLv2.0
https://github.com/Triang3l/WebQuake/blob/master/GNU.md - GPL v2.0

OTHER GAME MODS
https://github.com/ForestryMC/ForestryMC - LGPLv3.0
https://github.com/AppliedEnergistics/Applied-Energistics-2 - LGPLv3.0
https://github.com/xCollateral/VulkanMod - LGPLv3.0

https://github.com/miere43/auto-use-spell-tomes - MIT
https://github.com/McJtyMods/RFTools - MIT
https://github.com/mlthelama/SkyrimCharacterSheet/blob/main/LICENSE - MIT
https://github.com/alexsylex/CompassNavigationOverhaul/blob/main/LICENSE - MIT
https://github.com/mort65/mark-of-arkay - MIT

https://github.com/SleepyTrousers/EnderIO - The Unlicense
https://gitlab.com/thor12022/HardcoreWither - BSD 3-Clause
2023-04-02 13:58:26 -05:00
lambertjamesd acf0210a61
Merge pull request #89 from westonCoder/r-for-orange-portal
Slight Controls Change
2023-04-01 21:43:31 -06:00
lambertjamesd 3919d601aa
Merge pull request #87 from westonCoder/portal-gun-movement-cleanup
Portal Gun Movement Cleanup
2023-04-01 21:38:02 -06:00
lambertjamesd 2542711c21
Merge pull request #86 from westonCoder/wall-ground-portal-bug
Wall Ground Portal Bug Fix
2023-04-01 21:37:24 -06:00
Weston Salinas 8fcb7e43bf Slight Controls Change
- before player gets second portal gun l/r/z all shoot blue portal
- after player gets second portal gun l shoots blue, and r and z shoot orange portal
2023-04-01 18:23:35 -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
Weston Salinas a946b027cf Portal Gun Movement Cleanup
- the portal gun has much cleaner movement now
- portal gun has a recoil timer when it shoots for more game accurate animation
- portal gun is being "clamped" to an invisible sphere around its constraint point, so it can only go so far in one direction.
2023-03-29 22:07:11 -05:00
James Lambert 31390f0d29 work on test chamber 07 2023-03-29 19:59:16 -06:00
Weston Salinas 5fc0590ffb Final Version of Wall/Ground Portal Fix
- This version implements a function that clamps all objects to an oval shape if they are touching a single portal
- This aleviates player clipping out of stage with wall/ground portal
- This aleviates physics objects clipping out of stage with wall/ground portal
- player can no longer walk partially into a wall portal then walk into the wall

Fixes #3
Fixes #13
2023-03-28 16:14:10 -05:00
James Lambert e5e6bc577f Work on test chamber 07 2023-03-27 21:24:10 -06:00
Weston Salinas e4d9e57924 Merge branch 'wall-ground-portal-bug' of https://github.com/westonCoder/portal64 into wall-ground-portal-bug 2023-03-27 16:40:55 -05:00
Weston Salinas 5682481ec9 oops flipped a negative 2023-03-27 16:38:31 -05:00
Weston 199489f3f7
Merge branch 'master' into wall-ground-portal-bug 2023-03-27 16:12:01 -05:00
Weston Salinas 0642146034 Implemented oval clipping suggestions, and player boundry 2023-03-27 16:10:32 -05: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 e654225970 Fixes players and objects clipping out of stage with wall/ground portal
- this fix was implemented by simply clamping the x and y of the localPoint
  to -0.1-0.1 and -0.2-0.2 respectively.
- objects can no longer clip through stage
- player can no longer clip through stage

Fixes #13
2023-03-26 15:54:18 -05: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