Commit graph

827 commits

Author SHA1 Message Date
James Lambert 4d66641be7 Update lookTransform when teleporting the player 2023-08-25 22:17:10 -06:00
lambertjamesd baa8664a2e
Merge pull request #216 from hackgrid/master
mute DecorObjects in main_menu (Fixes #213)
2023-08-25 08:39:35 -06:00
hackgrid 3014e55285
fix typo 2023-08-25 09:14:16 +02:00
hackgrid 42c24768c4
reset DecorObject flags outside of main_menu 2023-08-25 09:10:19 +02:00
hackgrid 452e83b0b8
use definition flags in DecorObject 2023-08-25 09:08:48 +02:00
hackgrid c20a43fd69
revert / remove flags from DecorObject 2023-08-25 09:07:38 +02:00
James Lambert c56db8c2e9 Finish up some level polish 2023-08-24 22:12:40 -06:00
James Lambert 009f99bae5 touch up details in test chamber 06 2023-08-24 22:03:15 -06:00
James Lambert 3007b98fbf touch up another test chamber 2023-08-24 21:57:59 -06:00
James Lambert 328848c355 More test chamber touch up 2023-08-24 21:48:58 -06:00
James Lambert c178e98286 touch up test chamber 03 2023-08-24 21:44:33 -06:00
James Lambert d8cf4c5bdf More touch up 2023-08-24 21:24:48 -06:00
James Lambert 4e2086dc47 touch up test chamber 02 2023-08-24 21:23:21 -06:00
James Lambert 6f0ea79c72 fix rigidbody sleeping 2023-08-24 20:39:59 -06:00
hackgrid ba3751178d
oops v2 2023-08-24 19:00:19 +02:00
hackgrid 85e4531389
oops 2023-08-24 18:50:00 +02:00
hackgrid 9ddf2ad7dd
update main_menu to ignore decor element sounds 2023-08-24 18:12:48 +02:00
hackgrid a64874f2ee
implement mainMenuMode for sceneInitNoPauseMenu 2023-08-24 18:11:40 +02:00
hackgrid 58cba4ff1d
don't play sounds for muted DecorObjects 2023-08-24 18:10:17 +02:00
hackgrid 1761e6e9cd
add flags to DecorObject 2023-08-24 18:08:02 +02:00
hackgrid b7cf3bd4a3
add mainMenuMode for sceneInitNoPauseMenu 2023-08-24 18:00:15 +02:00
hackgrid 19881808ec
add new Muted flag to DecorObject 2023-08-24 17:57:53 +02:00
lambertjamesd f5cc71c43a
Merge pull request #215 from hackgrid/master
loop ambient music in main_menu (Fixes #213)
2023-08-24 08:31:28 -06:00
hackgrid 5f314d5bbb
loop ambient music in main_menu 2023-08-24 10:36:14 +02:00
James Lambert abababe5a8 more test chamber 01 touch up 2023-08-23 21:29:08 -06:00
James Lambert 313607df62 Implement rigidbody sleeping
touch up test chamber 01
2023-08-22 22:26:51 -06:00
James Lambert 519feb9505 Update some todos on the readme 2023-08-21 20:47:14 -06:00
James Lambert 3621b70709 use sphere collider for player 2023-08-21 19:27:17 -06:00
James Lambert 60485246d1 Add collision to portal border 2023-08-20 21:57:49 -06:00
James Lambert e4d12713ec z sort portal gun 2023-08-18 22:12:20 -06:00
lambertjamesd adff490004
Merge pull request #212 from hackgrid/master
skelatool64: Avoid truncate warning in CFileDefinition
2023-08-14 10:28:58 -06:00
hackgrid 3aff473bcc
Avoid truncate warning in CFileDefinition 2023-08-07 12:22:09 +02:00
lambertjamesd b78bcc9df9
Merge pull request #209 from westonCoder/sound-overlap-bug
Sound Crackling Noise Fix
2023-08-06 20:12:32 -06:00
lambertjamesd 40c1dacceb
Merge pull request #210 from westonCoder/chamber-7-staircase-collision
Fixes Collision Issue in Chamber 7
2023-08-06 20:11:32 -06:00
James Lambert 1a991fdd98 Update readme todo 2023-08-06 19:44:25 -06:00
westonCoder 70befbce47 Fixes Collision Issue in Chamber 7
Fixed collision layer in blender file so player cant fall out of map in chamber 7.

also marked off a few things in readme.
2023-08-06 17:38:03 -05:00
James Lambert 2930f845df Always reuse replace the near clipping plane with the portal surface 2023-08-06 13:23:51 -06:00
westonCoder 0bebdbd8b9 Sound Crackling Noise Fix
this bug was caused by too many sounds playing at once. to alleviate this two things were implemented

- lowered the max number of active sounds from 16 to 12, this based on my testing eliminated all crackling sounds
- made an array of sound clips that are "skippable". also added a function to check if a given sound ID is skippable based on the list.

the idea here is there are some sounds (footsteps, portal shooting, portal entering, etc.) that are acceptable to be skipped. there are other
sounds that are more important to not skip (glados speaking, menu sounds, buttons pressed, etc.). by marking some as skippable, those sounds
will not be able to be played after the number of active sounds passes a MAX_SKIPPABLE_SOUNDS threshold. this makes the event of skipping an
important sound like glados speaking MUCH less likely. as more sound effects are added to the game we will need to make sure to add them to
that list if they are less important.

Fixes #183
2023-08-06 12:43:33 -05:00
lambertjamesd ae5b57109b
Merge pull request #205 from westonCoder/lua-compilation-fix
Force luac5.4 Compile
2023-08-05 20:58:25 -06:00
lambertjamesd 2085847001
Merge pull request #207 from westonCoder/savefile-chamber-number
Correct Chamber Numbers
2023-08-05 20:58:14 -06:00
lambertjamesd f03dec9f2c
Merge pull request #206 from westonCoder/hud-console-color-flip
HUD Conforms to Console Version of Game
2023-08-05 20:56:42 -06:00
James Lambert 8086bbdae4 Fix z fighting with portals as they grow 2023-08-05 20:55:55 -06:00
James Lambert 1ab857e008 Bring changes over from work done for n64 game jam 2023-08-05 13:07:08 -06:00
westonCoder 6d2687dd1d Correct Chamber Numbers
chamber numbers displayed in both the save and load screen menu's are now the correct number.
I acheived this by making a function that creates a mapping from level/room numbers -> chamber numbers

this mapping will need to be updated when new levels are added to the game, however its such low overhead that I think its okay. another option would be to store the chamber number when passing in or out of elevators and saving that number as the player progresses.

screenshots (of a couple chambers) attached.
all chambers verified to be working.
2023-08-04 16:47:19 -05:00
westonCoder cf16f07c8a HUD Conforms to Console Version of Game
previously the HUD was conforming to the PC version of the game (orange on right, blue on left), however because we are targeting the console version for the remake the HUD colors have now been inverted (blue on right, orange on left)
fully tested on emulator, new colored HUD images attached.
2023-07-28 10:02:28 -05:00
westonCoder ba6ee8cce5 Force luac 5.4 Compile
one line change in makefile for skeletool, simply requires that user use luac5.4 just incase they have multiple luac/lua versions.
2023-07-28 09:15:49 -05:00
James Lambert a1542b34fe Remove unused imports 2023-07-18 20:05:46 -06:00
lambertjamesd f5ca58de2f
Merge pull request #203 from hackgrid/master
Fix normal build without debugger
2023-07-18 20:04:48 -06:00
James Lambert 83e9648ed1 Fix glitchyness when objects are passing through portals 2023-07-18 20:03:47 -06:00
James Lambert fb457e8c41 Fix some security camera issues 2023-07-18 08:04:07 -06:00