thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6602 commits 1 branch 12 tags 205 MiB
Commit graph

260 commits

Author SHA1 Message Date
TehRealSalt
a37eb798e0 Fix bad merge 2019-10-15 22:23:01 -04:00
TehRealSalt
e7d0fde5fd Merge branch 'master' into sal-waypoints 2019-10-15 21:34:41 -04:00
TehRealSalt
d1c20c2a5a Don't allow finish lines to be hit multiple times per tic 2019-10-15 21:30:23 -04:00
wolfy852
027dec6702 Fix Ring Drain sectors for v2 rings 2019-10-05 19:07:26 -05:00
TehRealSalt
c6566ec31a Merge branch 'master' into versus-record 2019-10-03 01:32:59 -04:00
TehRealSalt
bc3f0568ee Merge master 2019-09-27 23:09:54 -04:00
TehRealSalt
77aeb4663b Merge branch 'master' into versus-record 2019-09-23 07:03:56 -04:00
TehRealSalt
47da526313 Use texture names instead of predesignated sky numbers 2019-09-18 19:29:28 -04:00
Sryder
0f7a704444 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/p_spec.c
 2019-08-10 11:41:49 +01:00
Nev3r
35ebe947c4 Things spawning over copied slopes now properly align on the new plane 
While I believe the opposite behavior was intentional at first, it has proven to be problematic and makes alignment a tedious task for copied planes.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-07-17 12:04:14 -07:00
Sryder
20f8037351 Respawn at waypoints once first crossing the finish line. 2019-06-29 11:05:35 +01:00
Sryder
b2d5521d34 Finish Line linedef needs condition flipped for correct crossing of it. 2019-06-16 23:30:39 +01:00
Sryder
6bcc283d3b Reimplement system for specials that activate when crossing a linedef from DOOM 
Used for the finish line, crossing it the correct way increments the lap count, the wrong way decrements it
Remove usability of the sector special for the finish line
Undo another check of numstarposts to force all of them to need passing to complete the stage
player laps start from 0 now, it goes to lap 1 when you initially cross the start line.
 2019-06-16 22:03:57 +01:00
Sryder
530214aa87 Remove now unused waypoint player variables. 2019-06-15 17:04:16 +01:00
Sryder
5ad7db9d64 Revert to needing to touch every checkpoint to complete a lap. 2019-06-15 15:50:04 +01:00
Sryder
622c2eac07 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/k_kart.c
 2019-06-02 18:15:30 +01:00
TehRealSalt
31534fe96b Merge branch 'master' into versus-record 2019-05-29 22:23:17 -04:00
Sryder
43936013f7 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/d_netcmd.h
#	src/k_kart.c
#	src/p_setup.c
 2019-05-25 12:09:47 +01:00
TehRealSalt
5c3cac52e6 Merge branch 'master' into rings 2019-05-12 15:28:15 -04:00
TehRealSalt
db5f8e8c6b Merge branch 'v1' 2019-05-12 15:26:03 -04:00
TehRealSalt
933ca5c3a4 Add an array for unsynced, HUD animation variables 
Reduces the size of kartstuff_t, and makes it easy to add even more HUD animations. Fixes viewpoints being wonky for rings.
 2019-05-12 14:33:18 -04:00
wolfy852
9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1 
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
 2019-05-12 03:40:02 -05:00
TehRealSalt
41a66ac50a Use IsDisplayPlayer for more things 
Makes viewpoints in spectating/demos do client-side effects a little better
 2019-05-10 15:28:39 -04:00
Alam Arias
9163a05192 fix up misleading indentation of a if statement 2019-05-09 23:03:32 -04:00
TehRealSalt
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -04:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
 2019-05-06 22:40:12 -05:00
TehRealSalt
4006045f12 Merge branch 'v1' 2019-05-06 22:06:59 -04:00
TehRealSalt
929d26806c Offroad adjustments 
- Restored old offroad leniency timer
- Allow minor boosts in offroad again (drift sparks, rings, drop dash)
- Scale offroad strength with game speed (Hard gets harsher offroad, Easy gets more lenient offroad)
 2019-05-02 14:57:36 -04:00
TehRealSalt
ea2bcb3b99 Update from master 2019-04-19 20:14:06 -04:00
TehRealSalt
a3d2b48329 Fix up more stuff 
Now in a mergable state
 2019-04-18 12:20:13 -04:00
TehRealSalt
089be795a2 Huge splitscreen refactor 
Did not get to finish all refactoring or even compile this, I'll continue later
 2019-04-18 03:08:11 -04:00
Monster Iestyn
11b5b624bb Whoops forgot this 2019-04-03 19:46:21 +01:00
Monster Iestyn
07e8ef6627 Split off part of P_SpawnSpecials into a new function called P_InitSpecials 
This allows tag lists, gravity, weather, and the "CheckFor" vars to be initialised before running P_LoadThings or P_ResetDynamicSlopes, in case they could affect mobj spawning or cause a netgame desync somehow by carrying over the previous level's values

# Conflicts:
#	src/p_spec.c
 2019-04-03 19:46:10 +01:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
TehRealSalt
e3434cf724 Merge branch 'doubled-boost' into draft 2019-03-14 19:45:33 -04:00
mazmazz
06f4f355ff Fix custom fade source bug for Change Music linedef 2019-03-13 19:53:16 -04:00
Latapostrophe
395df49ff0 Fix what was discussed, minus the rocksneaker math which is still shady, but let's not break what currently works 2019-03-11 18:53:23 +01:00
TehRealSalt
0f4fd73533 Try out boost stacking 2019-03-11 12:00:39 -04:00
wolfy852
2dc5dde769 Merge remote-tracking branch 'remotes/origin/master' into waypoints 
# Conflicts:
#	src/k_kart.c
 2019-03-08 12:24:03 -06:00
Latapostrophe
2b47818d66 Fix respawning in reverse gravity 2019-02-18 14:00:36 +01:00
Sryder
a72630942d Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/p_mobj.c
 2019-02-01 17:29:17 +00:00
toaster
4e4d663b3e Do a bit more cleanup. Notably, prevent skins setting a bunch of things in preperation for this branch hitting the mainstream. 
Also, make SF_RUNONWATER set off majormods. I was under strong pressure to remove it and almost did but honestly it's kind of endearing and I think like one character in Releases uses it..?
 2019-01-26 19:13:49 +00:00
TehRealSalt
3246ca6b33 More finished power level 
broken, can't finish
 2019-01-16 14:49:42 -05:00
TehRealSalt
3491a22a94 Add disable for music credit showing on the change music linedef 2019-01-09 21:17:10 -05:00
TehRealSalt
5be9f9e2d4 Add MUSICDEF lump for defining custom songs & replacing existing songs 
Very rudimentary at the moment, but it's workable
 2019-01-09 21:00:45 -05:00
TehRealSalt
09da50000e Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
TehRealSalt
301477f212 Misc level init fixes 2019-01-08 20:14:58 -05:00
SeventhSentinel
74aba46823 In-game music credits 2019-01-04 04:44:55 -05:00
mazmazz
6086a9f238 Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core 2019-01-02 03:47:51 -05:00
mazmazz
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00