vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,285 Commits 50 Branches 7 Tags 75 MiB
Commit Graph

201 Commits

Author SHA1 Message Date
Latapostrophe ff04e0c103 chaos conflict 2019-06-11 17:02:47 +02:00
Jaime Passos de5e44cfbc Merge remote-tracking branch 'upstream/master' into gl_shaders 2019-06-10 16:21:46 -03:00
Monster Iestyn 6f6d912fa6 Update version to 2.1.24 2019-06-07 15:48:33 +01:00
Jaime Passos d3dfd77ae7 Hardware mode y-shearing matches software mode mouselook 2019-05-17 17:49:04 -03:00
wolfy852 f61f7f4411 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 2c363c4e1e 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 5022cde443 Merge branch 'version-prep' into 'master' 
Version prep

See merge request KartKrew/Kart!148

(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)

183e75ff Final v1 colors
9629fb32 Modify the first shade of Byzantium
39bea80b Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
f99a5a6a Fix wheel animations
fd148ec2 Dumbass typo
e772a750 Missed a spot
3d71a0aa Merge branch 'next-colors' into 'v1'
071b335d Merge branch 'anim-fix' into 'v1'
0cd815cb Merge branch 'deadzone-bullshit' into 'v1'
30c19caa Update version number
8f07ed77 Update patch.kart hash
 2019-05-06 22:05:56 -04:00
TehRealSalt f720dd3ddb Merge v1 2019-05-06 21:23:29 -04:00
wolfy852 97493fdfd7 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 4638722632 Remove unique version number 2019-05-02 01:34:25 -04:00
Jaime Passos 0bc8d2a49d 01052019 2019-05-01 19:37:42 -03:00
Jaime Passos 2ff4a3ca75 Match Kart-Public's next since it got merged anyway 
and fix something else
 2019-04-30 20:59:32 -03:00
TehRealSalt 183e75ff53 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 42d47a10f3 "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
Jaime Passos fa7f627c88 stuff 2019-04-06 23:33:34 -03:00
fickleheart 7af0554aba Prepare for a demo format upgrade! 2019-03-24 17:47:24 -05:00
fickleheart 7fc1f02b07 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 1cfdd07ee0 gl4 2019-03-17 22:27:50 -03:00
fickleheart 3aa1e78345 Update version and patch hash 2019-03-11 22:40:15 -05:00
wolfs 24b5079f20 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 af67c7abf5 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 3de3f10ad3 Make sure Fairy is before Popcorn 2019-03-11 00:10:03 -05:00
Sal 4f8665c785 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 3873635629 Merge remote-tracking branch 'remotes/pub/next' into maxskins-bump 2019-03-06 20:13:30 -06:00
Sally Cochenour c18935fbdd Reorder colors, ensure colored names are set properly 2019-03-06 03:15:07 -05:00
James R 62820bb4bf Merge remote-tracking branch 'origin/next' into longdouble 2019-03-04 18:51:11 -08:00
James R f0a0666223 Use long double suffix 2019-03-02 15:56:44 -08:00
Sally Cochenour b95d0ac279 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 44462d0dd7 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 7de2cf8d39 Fix Super colors from base SRB2 giving a garbage color 2019-02-26 07:14:03 -05:00
wolfy852 23f1974117 Bump MAXSKINS to 128 
Can't believe people actually need this now.
 2019-02-20 18:55:53 -06:00
fickleheart c260e27cd9 Support netreplays in titledemos 
TDEMO###, where ### is a number from 1 to 255.
 2019-02-17 13:13:45 -06:00
Sally Cochenour f46eab6b8a Update version 2019-02-04 22:00:36 -05:00
TehRealSalt e63d7537e0 bump maxskins to 64, fix overflow error 2019-01-14 18:16:07 -05:00
Marco Z 7806c43ecf Kart Public Next merge 2019-01-08 18:43:49 -05:00
wolfy852 ad01dcc5ac 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 8736952aad 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 73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
wolfy852 15b0e3ab51 Fix a randomly changed comment (?) 2019-01-02 15:45:04 -06:00
mazmazz b7bb570f97 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz 9b698d24b9 Set srb2home name to srb2kart 2018-12-30 18:57:33 -05:00
wolfy852 cbc4529039 Disable DEVELOP, since this is ready to merge 2018-12-27 21:23:32 -06:00
mazmazz 894c139bf1 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz 842bcfc8a0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz 10a3e3fec9 Define EPSILONs only if not already defined 
Fixes OSX buildbot
 2018-12-24 20:36:28 -05:00
mazmazz e9e5128754 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Digiku 8d56c2f486 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 7a64e3d1a8 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 f1fea30045 Properly restrict EXECVERSION from cvar updates 2018-12-20 17:56:51 -05:00
mazmazz 9be1ee4ac7 Hardcode define MAJOREXECVERSION to MODVERSION 2018-12-20 17:16:04 -05:00