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

4424 commits

Author SHA1 Message Date
Marco Z
74c57ad447 Kart Public Next merge 2019-01-08 18:43:49 -05:00
wolfy852
2794833f8d Fix improperly resolved conflicts 2019-01-08 16:44:56 -06:00
wolfy852
5c5e6a26dd Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 
# Conflicts:
#	CMakeLists.txt
#	appveyor.yml
#	src/command.c
#	src/command.h
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/dehacked.c
#	src/doomdef.h
#	src/hu_stuff.c
#	src/m_misc.c
 2019-01-08 16:32:24 -06:00
Sal
900c6df765 Merge branch 'mobjscale-global' into 'next' 
Add a global for mobjscale

See merge request KartKrew/Kart-Public!10
 2019-01-08 17:00:34 -05:00
TehRealSalt
ab76725038 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
Sal
875f5eb28a Merge branch 'merge-srb2' into 'next' 
Merge SRB2 master & next (round 1)

See merge request KartKrew/Kart-Public!16
 2019-01-08 15:56:41 -05:00
Latapostrophe
654901a4b5 use PLAY as default player MD2 if avaiable. 2019-01-08 18:57:10 +01:00
wolfy852
934b199705 Compile flag for DEVELOP 2019-01-06 20:47:13 -06:00
SeventhSentinel
9490d225de Minimum speed to get drift sparks 2019-01-06 17:17:52 -05:00
wolfy852
8baa538d43 Cast animtimer to int before negating 
Stops a Visual Studio compile error.
 2019-01-06 03:02:12 -06:00
Sal
02f49b2b8b Merge branch 'kill-facefreed' into 'next' 
Remove facefreed/iconfreed

See merge request KartKrew/Kart-Public!15
 2019-01-06 02:02:54 -05:00
SeventhSentinel
716ce5c343 Merge remote-tracking branch 'next' into merge-srb2 2019-01-06 02:02:33 -05:00
SeventhSentinel
3fe7856ba3 Keep execversion stuff on, just dummied out 
Had issues with skin values not changing from the menu, this seemed to fix it
 2019-01-06 01:41:42 -05:00
SeventhSentinel
046d66d803 Fix errors from merge 2019-01-06 01:00:30 -05:00
wolfy852
600cf37c88 Remove facefreed/iconfreed 
Caused an issue where having more than 16 characters loaded would crash the game when compiled with MSVC.
 2019-01-05 20:40:47 -06:00
SeventhSentinel
e70d98d7a6 Merge remote-tracking branch 'srb2public/master' into merge-srb2 2019-01-05 18:42:58 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
fickleheart
f7aa9ebb25 Determine latency with leveltime BS instead of nettics 2019-01-05 01:13:16 -06:00
SeventhSentinel
b9ea18c030 turn these signed before abs-ing em 2019-01-05 00:42:36 -05:00
SeventhSentinel
a595d0ba00 Load sounds.kart after patch.kart 2019-01-05 00:33:24 -05:00
fickleheart
cc9bf72513 test stuff 2019-01-04 23:09:29 -06:00
fickleheart
b3432cef05 Don't turn players more than they're allowed to 
This should account for latency properly.
 2019-01-04 23:09:27 -06:00
fickleheart
7dcee6f0b4 Send latency in players' ticcmds 2019-01-04 23:09:26 -06:00
Steel Titanium
a57626f828 Clean up the comments a bit 2019-01-04 19:55:05 -05:00
Digiku
031e234d86 Merge branch 'changecontrol-text-overflow-fix' into 'master' 
Resolve buffer overflow crash when configuring System Menu and GIF controls

See merge request STJr/SRB2!445
 2019-01-04 19:39:17 -05:00
Digiku
e42e1178ed Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
SeventhSentinel
9365f7f235 Minor touchups/cleanup 2019-01-04 16:47:03 -05:00
SeventhSentinel
74aba46823 In-game music credits 2019-01-04 04:44:55 -05:00
Steel Titanium
d2da1db6c8 Don't increment mainwads for sounds or music.kart 2019-01-04 00:32:01 -05:00
SeventhSentinel
57b25fd385 Actually, let's just do "1" 2019-01-03 16:43:01 -05:00
SeventhSentinel
b885005950 Update SOC version, make base SRB2 SOC throw a warning 2019-01-03 16:30:50 -05:00
mazmazz
34b415bdac Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer 2019-01-03 12:31:26 -05:00
Sal
b69013a4f1 Merge branch 'bump-fixes' into 'next' 
Push bouncing players backwards if they get stuck in a wall

See merge request KartKrew/Kart-Public!3
 2019-01-03 12:27:14 -05:00
mazmazz
f0715d7af3 Updated Kart icons to higher res 2019-01-03 12:26:25 -05:00
Sal
1b02805445 Merge branch 'map-palette-titlefix' into 'next' 
Fix per-map palette not being reset properly when it should.

See merge request KartKrew/Kart-Public!9
 2019-01-03 01:08:42 -05:00
Sal
5c1267d2e6 Merge branch 'waypoint-lap-option' into 'next' 
Add waypoint lap field via Parameter field

See merge request KartKrew/Kart-Public!4
 2019-01-03 00:58:09 -05:00
mazmazz
5347d5390f Fixx GCC 4.4 array-bounds compile errors 2019-01-02 20:58:52 -05:00
mazmazz
72ff758b07 Dummy out unused functions (OSX xcode errors) 2019-01-02 20:10:53 -05:00
mazmazz
93e8751938 Better rewrite for addons draw adjustment [Kart] 2019-01-02 20:03:53 -05:00
mazmazz
5b663bfd28 Remove FIXUPO0 GCC pragma 2019-01-02 20:03:52 -05:00
mazmazz
2fe8317103 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2019-01-02 19:23:59 -05:00
mazmazz
08a788af74 Initialize skinnum for MD2 star colors (fix CLANG error) 2019-01-02 19:23:57 -05:00
mazmazz
238be26915 Fix strncpy nodenum length overflow 2019-01-02 19:23:56 -05:00
wolfy852
b517b738c8 Fix a randomly changed comment (?) 2019-01-02 15:45:04 -06:00
wolfy852
916d87ead6 Whitespace fixes 2019-01-02 15:43:07 -06:00
wolfy852
b3cd4283e4 Fix a duped line 2019-01-02 15:03:13 -06:00
wolfy852
bf5d14c37f Rebind the talk key by default, but move it to D-Pad Down 2019-01-02 14:50:36 -06:00
wolfy852
1c33146e95 Turns out we don't need this 2019-01-02 14:47:24 -06:00
Latapostrophe
40140d4372 More cleanups and WANTED stuff 2019-01-02 20:36:13 +01:00
Steel Titanium
4e0f4ed709 Remove double brackets 2019-01-02 13:04:56 -05:00