thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-07-13 01:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6994 commits 2 branches 14 tags 208 MiB
Commit graph

6994 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
dbff92ea30 Add "tutorialmode" var to help the game know when we're in a tutorial or not, add placeholder for tutorial HUD to test it works 2018-09-04 16:58:49 +01:00
Monster Iestyn
cc20eed183 Merge branch 'master' into tutorial-time 2018-09-04 15:54:50 +01:00
Monster Iestyn
82e46d101c Merge branch 'public_next' 
# Conflicts:
#	src/r_main.c
 2018-09-04 15:53:07 +01:00
Monster Iestyn
6774933263 Merge branch 'addfile-verify-fix' into 'next' 
Addfile command verify fix.

See merge request STJr/SRB2!272
 2018-09-03 17:17:46 -04:00
Monster Iestyn
d68585a9d0 SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general 2018-09-03 20:53:40 +01:00
Monster Iestyn
339ffe8d08 UDP_Socket: I doubt client addresses are meant to be included in the total for broadcast addresses 2018-09-03 15:56:02 +01:00
Monster Iestyn
f5b88ee37d SOCK_Send: Fix what appears to be a mistaken use of i instead of j 2018-09-03 15:52:22 +01:00
Monster Iestyn
4bb12fb79f UDP_Socket: Add missing limit checks for s, for client and broadcast addresses 2018-09-03 15:43:36 +01:00
Digiku
816a81b396 Merge branch 'nightsplus-le' into 'master' 
NiGHTS Linedef Executor Triggers

Closes #102

See merge request STJr/SRB2Internal!142
 2018-09-02 18:10:50 -04:00
mazmazz
df5ac5826c Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-09-02 08:16:40 -04:00
mazmazz
5a278b5168 Linux Compiler fix HAVE_MIXERX cvars 2018-09-02 08:15:55 -04:00
Monster Iestyn
4bd725e7b8 Merge branch 'master' into next 2018-09-02 13:00:56 +01:00
Monster Iestyn
44c4534231 Merge branch 'homremoval-nongreenfix' into 'master' 
Fix for HOM removal in non-green resolutions

See merge request STJr/SRB2!273
 2018-09-01 20:53:49 -04:00
Steel Titanium
4b690b20d3 Merge branch 'master' into addfile-verify-fix 2018-09-01 19:33:59 -04:00
mazmazz
73842cec71 Add MUSICPOSTBOSSFADEIN 2018-09-01 13:10:50 -04:00
mazmazz
797f2b6575 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-09-01 11:38:26 -04:00
mazmazz
abb67d35e3 Reset MIDI music properly on settings change 
* Added reset flag to S_Start (now S_StartEx)
 2018-09-01 11:37:53 -04:00
mazmazz
1aa4035594 Revert "Fix MIDI music not reloading sometimes on settings change" 
This reverts commit be21072b58.
 2018-09-01 11:35:54 -04:00
mazmazz
be21072b58 Fix MIDI music not reloading sometimes on settings change 2018-09-01 11:34:03 -04:00
mazmazz
82512a3ce4 Fix MIDI music not reloading sometimes on settings change 2018-09-01 11:33:39 -04:00
mazmazz
da53fd8f8f Merge branch 'music-cleanup' into musicplus-core 2018-09-01 11:22:15 -04:00
mazmazz
059f364740 Add Mixer X retrieve song length and position natively, if available 2018-08-31 13:52:01 -04:00
mazmazz
0f9f055961 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 13:27:11 -04:00
mazmazz
4810c48c08 Compile in modplug (for libopenmpt file detection) 2018-08-31 13:27:02 -04:00
mazmazz
2cf2b0c66b Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 12:19:03 -04:00
mazmazz
e5b4cf2dcf Fix MIDI not reloading when erroring on a player 2018-08-31 12:18:54 -04:00
Monster Iestyn
7fc4d864a8 Fix HOM removal not working properly for non-green resolutions 2018-08-31 17:14:44 +01:00
mazmazz
a4d6458ecd Revert "Update SDL Windows dependency to 2.0.8" 
This reverts commit adce4db5aa.
 2018-08-31 12:00:33 -04:00
mazmazz
c78472539c Revert "New SDL2 test files" 
This reverts commit 3dfbb61546.
 2018-08-31 11:58:18 -04:00
mazmazz
cc4f59878a Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 11:23:25 -04:00
mazmazz
853fe38569 Compiled fluidsynth into libraries 2018-08-31 11:23:16 -04:00
mazmazz
e33d385a6a Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 02:26:45 -04:00
mazmazz
580a3471a8 Updated SDL Mixer X binaries 2018-08-31 02:26:21 -04:00
Steel Titanium
277bec55c2 Only do this if the admin player isn't the server host also. 2018-08-30 18:32:26 -04:00
Digiku
b24a04989e Merge branch 'nights-nofastattract' into 'master' 
NiGHTS: Dummy out faster item attract

See merge request STJr/SRB2Internal!183
 2018-08-30 17:26:42 -04:00
Monster Iestyn
9d8d239eab Apparently I am blind and missed that splitscreen only CC offset that overrides the code for the other offset below 2018-08-30 20:08:17 +01:00
mazmazz
dcca56bc04 Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -04:00
Digiku
2b18908fe4 Merge branch 'nights-inufixes' into 'master' 
NiGHTS Minor Fixes: Snappier paraloop attract; drill mash penalty; configurable link timer

See merge request STJr/SRB2Internal!156
 2018-08-30 09:12:55 -04:00
mazmazz
f8588739b8 Drill mash penalty fix 2018-08-30 09:09:19 -04:00
mazmazz
631a053e92 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
46be411454 Fix compiler complaints, remove a slipup of mine from when I was dealing with merge conflicts 2018-08-29 22:07:38 +01:00
Monster Iestyn
d9440f419c Use INFLIVES macro in place of 0x7f for infinite lives check 2018-08-29 21:31:15 +01:00
Monster Iestyn
d60ade9f95 Merge branch 'master' into hud-n-menu-tidbits 2018-08-29 21:28:11 +01:00
Monster Iestyn
ede540a259 Merge branch 'hud-cleaning' into 'master' 
Hud cleaning

See merge request STJr/SRB2Internal!170
 2018-08-29 16:22:48 -04:00
Monster Iestyn
a9882bfda4 Merge branch 'master' into hud-cleaning 2018-08-29 20:46:35 +01:00
Monster Iestyn
d130c48787 Fix typo introduced by changes to the setrings command 2018-08-29 20:46:08 +01:00
mazmazz
2c38ecadd1 Add mapmusposition placeholder to LE 413 change music 2018-08-29 15:21:17 -04:00
Monster Iestyn
3c65251bb6 Merge branch 'master' into hud-cleaning 
# Conflicts:
#	src/y_inter.c
 2018-08-29 16:39:02 +01:00
mazmazz
c43c15ff10 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00
Digiku
cc828ce709 Merge branch 'nightsplus-laplogic' into 'master' 
NiGHTS: Track player mare lap variables

See merge request STJr/SRB2Internal!143
 2018-08-29 10:58:05 -04:00