thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-27 05:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
23092 commits 2 branches 14 tags 206 MiB
Commit graph

23092 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
52f7b009f0 Move fadingdata (fade_t thinker) to line_t 2018-08-17 01:11:04 -04:00
mazmazz
c56dc6d0c7 Checkpoint: Move fadingdata to line_t (or ffloor_t?) 2018-08-17 00:32:20 -04:00
mazmazz
d92fca91d1 Merge branch 'le-fadefof-remove-storedthinker' into le-fadefof 2018-08-16 23:38:03 -04:00
mazmazz
9f9bf86d2b Rename dofadeinonly to doghostfade 
* Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished
 2018-08-16 22:27:26 -04:00
mazmazz
6dd64bccbc Place backwards Bumpers with the correct Thing angle 2018-08-16 22:07:53 -04:00
Monster Iestyn
004fd77b41 Merge branch 'master' into next 2018-08-16 22:04:00 +01:00
Monster Iestyn
0792e78254 Merge branch 'lua-sector-names-fix' into 'next' 
Lua sector names fix

See merge request STJr/SRB2!263
 2018-08-16 16:57:41 -04:00
Monster Iestyn
6797976531 Merge branch 'sdl_mixer_fixes' into 'master' 
SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260
 2018-08-16 16:57:14 -04:00
mazmazz
5fdece424a Adjust vertical angle and forwards/backwards of NiGHTS bumper in objectplace 2018-08-16 16:51:48 -04:00
mazmazz
4aade072ef Checkpoint (unfinished): player->totalsphere 2018-08-16 13:11:32 -04:00
mazmazz
32939a11f1 Change SETRINGS to support player->spheres in NiGHTS 2018-08-16 12:13:57 -04:00
mazmazz
ed9e74c15a Line from revert 2018-08-16 11:35:35 -04:00
mazmazz
4b8fd01bc0 Revert "SETSPHERES console command for debugging/cheating" 
This reverts commit 9e8784a376.
 2018-08-16 11:34:57 -04:00
mazmazz
2fcb94d408 Make Ideya Anchor use parameter # instead of angle for Ideya ID 2018-08-16 11:25:35 -04:00
toaster
95c11ef732 Realised I'd forgotten to stop the item explosion from being encoremapped. 2018-08-16 15:29:34 +01:00
mazmazz
675ed7ecf0 Don't apply autobrake on NiGHTS bumpers 2018-08-15 23:40:42 -04:00
mazmazz
c7b914c2ce Force non-nights player into rolling animation when destructing capsule 2018-08-15 23:11:32 -04:00
mazmazz
2b5dd97446 Reconcile spheres at end of destruct if you somehow gained or lost an unexpected # after timing calculations 2018-08-15 22:35:09 -04:00
mazmazz
baa4c30e99 Also center non-NiGHTS players on NiGHTS bumpers 2018-08-15 19:09:54 -04:00
mazmazz
6010822c84 Use more efficient position setting. For Z, also adjust for bumper mobj scale. 2018-08-15 18:50:28 -04:00
mazmazz
1381ffc3e6 Fix NiGHTS Bumper player positioning 2018-08-15 18:42:20 -04:00
mazmazz
22e95a58da Recalc capsule timing when leaving the capsule during destruct sequence (somehow) 
* Would be nice to have more sophisticated behavior, e.g., resume the old timing; or drop out the capsule entirely. But how often is this case really going to happen?
 2018-08-15 13:59:27 -04:00
mazmazz
8a348794a3 Fix issue where capsule immediately re-triggers if player gains rings during destruct 2018-08-15 13:49:03 -04:00
mazmazz
c072b15e4f Fixed capsule timing logic 
* Force a total time, stretch out sphere deduction within that time
* Make it more readable
 2018-08-15 13:38:15 -04:00
mazmazz
3288b73ad0 Make camera further if on-foot and destroying the Egg Capsule 2018-08-15 12:29:06 -04:00
mazmazz
513a0a54ec Counter fix 2018-08-15 12:22:46 -04:00
mazmazz
79ebbdc360 Merge branch 'nights-onfootcapsulefix' into nights-fastercapsule 2018-08-15 12:09:46 -04:00
mazmazz
10f8337347 Checkpoint: Basic functions 2018-08-15 12:07:08 -04:00
toaster
b637ae3d73 Additional oversight corrected. 2018-08-15 16:59:28 +01:00
toaster
2b9068378f Correct minor issue with random map name selection. 2018-08-15 16:56:26 +01:00
toaster
0b772c2477 Merge branch 'sonicitems' into encore 2018-08-15 16:12:42 +01:00
toaster
42e63fc32e Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do. 2018-08-15 16:12:36 +01:00
toaster
3e63209d68 Make some minor tweaks to the two server setup menus (splitscreen and not-splitscreen). 
I wouldn't have done this, but I was already in the code to fix the bugs, so I hit something that was bugging me[/sonic adventure voice] as well
 2018-08-15 15:22:50 +01:00
toaster
6596d18ada Add some more safety checks to the item system. 
While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
 2018-08-15 14:40:06 +01:00
toaster
d7f6016e93 Fix alignment of rocket sneaker bar. 2018-08-15 14:05:13 +01:00
mazmazz
49c392334e Hide MusicPlus lua behind an #ifdef HAVE_LUA_MUSICPLUS 
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/p_user.c
 2018-08-15 03:37:11 -04:00
mazmazz
da5fd51feb Fix merge errors 2018-08-15 02:42:50 -04:00
mazmazz
c912fab1da Lua: Make P_RestoreMusic follow the non-local player nil output convention 2018-08-15 02:29:26 -04:00
mazmazz
456652021e Lua: Fix music functions not returning proper values 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:29:04 -04:00
mazmazz
2e3837e656 Lua: Make S_SpeedMusic and S_ChangeMusic return nil for invalid players 2018-08-15 02:23:18 -04:00
mazmazz
8e087a04b4 Music lua: Return nil for invalid players and non-nil for valid players 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:22:52 -04:00
mazmazz
9b50322924 Make S_StopMusic return nil for invalid player, true otherwise 2018-08-15 02:21:18 -04:00
mazmazz
21ec9d49fe Lua S_GetMusicPosition: Remove erroneous position input line 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:20:56 -04:00
mazmazz
5b504509c0 Lua: Make S_GetMusicPosition and S_SetMusicPosition return nil when non-local player is passed 2018-08-15 02:19:12 -04:00
mazmazz
2c4af751d2 Lua: Added player_t input to S_DigitalPlaying, S_MidiPlaying, S_MusicPlaying, S_MusicPaused, S_MusicName 2018-08-15 02:19:06 -04:00
mazmazz
8d1b4ec54e Add player parameter to S_GetMusicPosition lua 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:18:46 -04:00
mazmazz
b24efc7439 Fix #6 #7 SDL looping and counter bugs when looping=false 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 02:15:05 -04:00
mazmazz
afa71ec7cd SDL: Fix looping bug when looping=false; reset bytes counter when non-looping 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 02:11:17 -04:00
mazmazz
074f43f377 Undoing malloc for S_MusicName, pass music_name instead. 
I don't think there's a reason for copying to a new var.
 2018-08-15 02:11:01 -04:00
mazmazz
5e3e23c779 Add S_DigitalPlaying 2018-08-15 02:10:53 -04:00