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
15952 commits 1 branch 12 tags 205 MiB
Commit graph

913 commits

Author SHA1 Message Date
fickleheart
4e5aba836e Merge remote-tracking branch 'remotes/james/netreplays-dedicated-sigsegv-fix' into new_netreplays 2019-03-19 23:44:39 -05:00
fickleheart
be458c1d05 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
 2019-03-19 22:17:25 -05:00
Jaime Passos
fd5fb73671 gl4 2019-03-17 22:27:50 -03:00
mazmazz
378106ad73 Fix MIDI crash bug when changing music between levels 
This happened when the old music was ERZ2 native midi, then warping to any other level.
 2019-03-15 10:02:50 -04:00
mazmazz
5c308c5597 Fade out music upon dying or level change: 2.1 frontport 2019-03-15 04:21:17 -04:00
mazmazz
822b4d12bf Merge branch 'public_next' 2019-03-15 01:43:03 -04:00
mazmazz
9d32ea8b5a Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel 2019-03-15 01:09:12 -04:00
mazmazz
1381343a2e Implement MUSICINTERFADEOUT level header 2019-03-15 01:05:52 -04:00
mazmazz
c427ccbec5 Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel 2019-03-15 00:39:26 -04:00
mazmazz
83e89ba62c Merge branch 'public_next' 2019-03-15 00:33:06 -04:00
mazmazz
2eb04ab17d Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
TehRealSalt
6aa55bdbe2 Merge remote-tracking branch 'kartpublic/next' into fortnite 2019-03-11 13:49:12 -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
wolfy852
b19d9f69f1 Merge remote-tracking branch 'remotes/pub/next' into followme 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
 2019-03-08 02:34:04 -06:00
Latapostrophe
e2c72c08cd Fix map load crash and other additions / clean ups 2019-03-07 23:10:07 +01:00
James R
6949781ca2 Do not record replays when dedicated 2019-03-04 22:26:05 -08:00
fickleheart
843bc6bc1b Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-03 20:24:39 -06:00
Sally Cochenour
75125b726e Merge branch 'next' into minor-item-tweaks 2019-02-27 01:22:38 -05:00
fickleheart
b085355bdd Move fov cvar out of OGL-specific code 2019-02-23 10:18:20 -06:00
James
4f9109501e Hyu b gone 2019-02-19 23:15:31 -05:00
fickleheart
4f8ef7c3aa Fix compile warnings 2019-02-06 21:03:05 -06:00
fickleheart
1c6046ac43 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 
# Conflicts:
#	src/g_game.c
#	src/k_kart.c
 2019-02-06 20:47:35 -06:00
Sally Cochenour
b2d2d64323 Merge branch 'master' into fortnite 2019-02-04 20:01:20 -05:00
Sryder
10af9db31b P_NetKeepAlive should also be here because it potentially pauses mid-game! 2019-02-04 21:54:10 +00:00
fickleheart
5836b0818a Record net replays to replay/online/ 2019-02-03 14:29:54 -06:00
MascaraSnake
3c0cb14a29 In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC 2019-02-03 14:32:07 +01:00
MascaraSnake
3ea09d4ffe Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD 2019-02-03 11:05:22 +01:00
Sryder
5fba15a58b Make waypoints setup on map load 
Refactor some things to make slightly clearer code
Change comments to use completely tabs
Add extra error checks to methods for helpful debugging and safety
Use a heap of waypoints during creation to be able to search for them to make links, to not freeze the game
Add a way to clear waypoints so that the methods don't error after more than one map load
Flip the ambush flag so that adding it will make the waypoint unable to be respawned at when the feature happens
Temporarily disable K_UpdateKartPosition so that it doesn't crash on map load
 2019-02-02 13:50:22 +00:00
fickleheart
37b500a75d Tack on a timestamp to replay filenames 2019-02-01 01:01:14 -06:00
fickleheart
5b4b5ec302 Move where multiplayer replays are started 
This particularly allows a server to record the
first map after startup as a replay. Players
joining mid-map can no longer record replays tho
 2019-01-27 15:45:08 -06:00
toaster
004cde8a57 Code cleanup as requested by Sal and Sryder. 
* majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one.
* Clean up comments in `dehacked.c`.
 2019-01-26 16:58:45 +00:00
toaster
4a87838f06 * Refactor all instances of majormods = true; to route through G_SetGameModified, and catch a few spots I missed in the process. 
* Make G_SetGameModified only console-print for major mods.
* Add amnesty to "major mod" detection while loading files with custom savedatas.
* Improved the console prints for command `isgamemodified`.
 2019-01-17 22:01:28 +00:00
TehRealSalt
3246ca6b33 More finished power level 
broken, can't finish
 2019-01-16 14:49:42 -05:00
toaster
0037f5c91d First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit next or master. 2019-01-15 19:01:55 +00:00
TehRealSalt
a1daaf339b Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way 2019-01-10 01:03:53 -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
TehRealSalt
f8a1cf849f Merge branch 'master' into fortnite 2019-01-08 18:17:09 -05:00
Monster Iestyn
74cb384be2 revert to LF_SAVEGAME system code, removing all traces of saveoverride 
(I believe Sal wanted us to do this anyway, so...)
 2019-01-08 17:14:21 +00:00
mazmazz
4f40d2abdb Merge errors for compile 2019-01-07 17:05:20 -05:00
Nev3r
6acdc428f7 Solved conflicts related to PK3s 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-01-07 19:00:31 +01:00
mazmazz
c4fcdbf687 Resolve p_setup and d_netcmd conflicts (20190101 public merge) 2019-01-07 03:07:24 -05:00
mazmazz
c91ac23ecb Merge branch 'musicplus-core' into musicplus-feature-postboss 2019-01-07 01:17:07 -05:00
mazmazz
e1a566157c Merge remote-tracking branch 'origin/master' into musicplus-core 2019-01-07 01:15:08 -05:00
mazmazz
403565e92f Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss 2019-01-07 01:10:54 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
SeventhSentinel
9365f7f235 Minor touchups/cleanup 2019-01-04 16:47:03 -05:00
SeventhSentinel
8391dd520a Add item spinning, turn into papersprites, spawn more orbs 
Also tried to fix a memory issue I only get from Sev's compiles by removing the need to free memory for this... but didn't fix anything :/
 2019-01-02 14:08:00 -05:00
Steel Titanium
2ba11a6d69 Support for per-map intermission music 2019-01-02 05:15:23 -05:00