3aa1e78345
Update version and patch hash
2019-03-11 22:40:15 -05:00
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
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
3de3f10ad3
Make sure Fairy is before Popcorn
2019-03-11 00:10:03 -05:00
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
3873635629
Merge remote-tracking branch 'remotes/pub/next' into maxskins-bump
2019-03-06 20:13:30 -06:00
c18935fbdd
Reorder colors, ensure colored names are set properly
2019-03-06 03:15:07 -05:00
62820bb4bf
Merge remote-tracking branch 'origin/next' into longdouble
2019-03-04 18:51:11 -08:00
f0a0666223
Use long double suffix
2019-03-02 15:56:44 -08:00
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
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
7de2cf8d39
Fix Super colors from base SRB2 giving a garbage color
2019-02-26 07:14:03 -05:00
23f1974117
Bump MAXSKINS to 128
...
Can't believe people actually need this now.
2019-02-20 18:55:53 -06:00
f46eab6b8a
Update version
2019-02-04 22:00:36 -05:00
e63d7537e0
bump maxskins to 64, fix overflow error
2019-01-14 18:16:07 -05:00
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
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
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
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
15b0e3ab51
Fix a randomly changed comment (?)
2019-01-02 15:45:04 -06:00
9b698d24b9
Set srb2home name to srb2kart
2018-12-30 18:57:33 -05:00
cbc4529039
Disable DEVELOP, since this is ready to merge
2018-12-27 21:23:32 -06:00
894c139bf1
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
842bcfc8a0
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-25 00:19:45 -05:00
10a3e3fec9
Define EPSILONs only if not already defined
...
Fixes OSX buildbot
2018-12-24 20:36:28 -05:00
e9e5128754
Use DBL_EPSILON for colormap comparison
2018-12-24 20:22:10 -05:00
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
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
f1fea30045
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
9be1ee4ac7
Hardcode define MAJOREXECVERSION to MODVERSION
2018-12-20 17:16:04 -05:00
6affe807e8
Merge branch '2122-version' into 2122-execversion
2018-12-20 17:14:53 -05:00
04916edc07
Update EXECVERSION to MODVERSION 27
2018-12-20 04:03:35 -05:00
9d212b340b
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
969960a1eb
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
2018-12-20 02:18:11 -05:00
657e7321f6
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
6d94568f4b
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
5fe81afeaa
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug' into unfuck-gamepads
...
# Conflicts:
# src/d_clisrv.c
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/doomdef.h
# src/g_game.c
# src/hu_stuff.c
# src/lua_baselib.c
# src/m_menu.c
# src/sdl/i_system.c
# src/sdl/sdlmain.h
2018-12-06 13:07:39 -06:00
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
936bd43266
Merge branch 'master' into merge-next
2018-11-29 09:46:46 -05:00
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
38ebc4d838
Update version to v1.0.2
2018-11-26 09:34:15 -05:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
36e020c366
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
fb3d0da38f
v1.0.1 prep
...
Enable patch.kart, up version number
2018-11-18 04:00:05 -05:00
106d8c6d3f
Remove "Kart" in front of the version number
...
Just looks silly :V
2018-11-14 01:12:58 -05:00
f10e7bade4
Merge branch 'disable-develop' into 'master'
...
Disable DEVELOP mode
See merge request KartKrew/Kart!85
2018-11-14 00:52:00 -05:00
6af56273bf
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
8ba0f2a177
clipping code didn't seem so bad this time (at least compared to without), let's enable it now?
2018-11-10 16:09:52 +00:00
1e98e3b4f2
More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now
...
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
2018-11-10 16:08:56 +00:00
fickleheart