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

201 commits

Author SHA1 Message Date
James R
374af9a322 Merge remote-tracking branch 'pub/master' into public-master 2019-07-17 12:33:20 -07:00
Sryder
3d6161c7ca Fix compatibility with the MS (Specifically Doomseeker) 
Send back 32 players worth of playerinfo regardless of MAXPLAYERS. Fill the extra with unconnected nodes.
 2019-06-17 21:04:48 +01:00
Sal
2ce77fdce9 Merge branch 'rings' into 'master' 
Rings

See merge request KartKrew/Kart!128
 2019-05-30 01:58:34 -04:00
TehRealSalt
8ca96168b9 enable patch file 2019-05-29 23:19:52 -04:00
TehRealSalt
4f13f8b98e Change version num to v2, disable 1.0.x demo compatiblity 2019-05-29 22:29:06 -04:00
TehRealSalt
407344299c Rename colors 
My attempt at compromise didn't work, so I'll just have it my way
 2019-05-14 21:00:40 -04:00
TehRealSalt
ddaf5658d5 Finish skincolors 
The only thing remaining is super colors, but I'm not too fussed about that for a merge request because
 2019-05-13 23:21:07 -04:00
TehRealSalt
da7e79ac83 Adjust file loading 
Many files converted to pk3, and we now have a distinct IWAD
 2019-05-12 20:58:26 -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
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
Sal
1c1435aea7 Merge branch 'version-prep' into 'master' 
Version prep

See merge request KartKrew/Kart!148

(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)

2e221946 Final v1 colors
359d06f1 Modify the first shade of Byzantium
3a707c09 Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
889ead78 Fix wheel animations
2d9ae1ab Dumbass typo
e954f0b4 Missed a spot
5316e63a Merge branch 'next-colors' into 'v1'
55db2268 Merge branch 'anim-fix' into 'v1'
26159aae Merge branch 'deadzone-bullshit' into 'v1'
30c19caa Update version number
8f07ed77 Update patch.kart hash
 2019-05-06 22:05:56 -04:00
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
wolfy852
f808072937 Merge remote-tracking branch 'remotes/pub/next' into v1 
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/hw_main.h
#	src/m_menu.c
#	src/r_main.c
#	src/v_video.c
 2019-05-06 14:26:09 -05:00
TehRealSalt
032a755ef7 Remove unique version number 2019-05-02 01:34:25 -04:00
TehRealSalt
2e22194677 Final v1 colors 
- 11 new colors: Skunk, Artichoke, Pigeon, Walnut, Cinnamon, Lemonade, Quarry, Crocodile, Azure, Thunder, & Wristwatch
- Updated Dawn, Sunset, Cream, Gold, Olive, Vomit, Lime, Plague, & Caribbean
- Updated opposite colors for Bubblegum & Camouflage in response to the new colors
 2019-04-26 18:18:53 -04:00
James R
03c27101df "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
fickleheart
d13134bae2 Prepare for a demo format upgrade! 2019-03-24 17:47:24 -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
fickleheart
0a22f07751 Update version and patch hash 2019-03-11 22:40:15 -05:00
wolfs
2195709d31 Merge branch 'color-flip' into 'next' 
Fix color enums more

See merge request KartKrew/Kart-Public!112
 2019-03-11 19:28:24 -04:00
wolfs
f4947820e4 Merge branch 'maxskins-bump' into 'next' 
Bump MAXSKINS to 128 + Clean up skin struct

See merge request KartKrew/Kart-Public!82
 2019-03-11 19:28:16 -04:00
fickleheart
ebee7232c7 Make sure Fairy is before Popcorn 2019-03-11 00:10:03 -05:00
Sal
897331a289 Merge branch 'colors-roundtwo' into 'next' 
16 more colors

See merge request KartKrew/Kart-Public!101
 2019-03-07 21:25:03 -05:00
wolfy852
0829040f6c Merge remote-tracking branch 'remotes/pub/next' into maxskins-bump 2019-03-06 20:13:30 -06:00
Sally Cochenour
5d0fbc2af0 Reorder colors, ensure colored names are set properly 2019-03-06 03:15:07 -05:00
James R
e55a778a81 Merge remote-tracking branch 'origin/next' into longdouble 2019-03-04 18:51:11 -08:00
James R
ca861ba0c5 Use long double suffix 2019-03-02 15:56:44 -08:00
Sally Cochenour
d638d47fad 16 more colors 
- Renamed Crimson to Maroon.
- Renamed Scarlet back to Crimson.
- Renamed Nova to Scarlet.
- Added Brick, Flame, Sunset, Popcorn, Camouflage, Caribbean, Plague, Platinum, Rust, Nova, Ultraviolet, Moonslam, Bubblegum, Mauve, Royal, and Fairy
- Updated Maroon, Robo-Hood, and Ketchup
- Shifted positioning of Aqua Super
 2019-03-02 15:39:52 -05:00
Sally Cochenour
008d9c9dc0 10 new colors 
new Crimson (old Crimson was renamed to Scarlet), new Peach (the replacement from last commit was renamed to Cream), Cherry, Nova, Copper, Handheld, Algae, Pastel, Fuchsia, and Toxic. Also, updated Robo-Hood.
 2019-02-27 00:08:13 -05:00
Sally Cochenour
d88d8adf4c Fix Super colors from base SRB2 giving a garbage color 2019-02-26 07:14:03 -05:00
wolfy852
f9961a87ff Bump MAXSKINS to 128 
Can't believe people actually need this now.
 2019-02-20 18:55:53 -06:00
fickleheart
0b92743244 Support netreplays in titledemos 
TDEMO###, where ### is a number from 1 to 255.
 2019-02-17 13:13:45 -06:00
Sally Cochenour
41e5b16920 Update version 2019-02-04 22:00:36 -05:00
TehRealSalt
19329f9a4a bump maxskins to 64, fix overflow error 2019-01-14 18:16:07 -05:00
Marco Z
74c57ad447 Kart Public Next merge 2019-01-08 18:43:49 -05: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
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
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
wolfy852
b517b738c8 Fix a randomly changed comment (?) 2019-01-02 15:45:04 -06:00
mazmazz
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
c31ef0c821 Set srb2home name to srb2kart 2018-12-30 18:57:33 -05:00
wolfy852
4dc7c6459c Disable DEVELOP, since this is ready to merge 2018-12-27 21:23:32 -06:00
mazmazz
7deac7e603 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz
818438d5d0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz
59ac969594 Define EPSILONs only if not already defined 
Fixes OSX buildbot
 2018-12-24 20:36:28 -05:00
mazmazz
7c3dcd2bf9 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Digiku
15c9404f91 Merge branch 'addons-backport' into '2122-version' 
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
 2018-12-23 18:08:06 -05:00
Digiku
77182e9278 Merge branch 'SRB2-CHAT' into '2122-version' 
Chat and other multiplayer quality of life improvements.

See merge request STJr/SRB2!398
 2018-12-23 17:53:54 -05:00
mazmazz
4e055bd383 Properly restrict EXECVERSION from cvar updates 2018-12-20 17:56:51 -05:00
mazmazz
495ea70a74 Hardcode define MAJOREXECVERSION to MODVERSION 2018-12-20 17:16:04 -05:00