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
9a18b83c2a
Disable DEVELOP mode
2018-11-07 16:19:02 -05:00
499faec555
Merge remote-tracking branch 'srb2public/next'
...
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
9de7a9d5cc
Add textures.kart, re-define DEVELOP mode,
...
Disabling DEVELOP can be another branch; this means this can get in master quicker
2018-11-03 03:17:20 -04:00
36595b06af
Merge branch 'master' into update-version
2018-10-17 20:31:56 -04:00
36696b1fbb
Merge branch 'noclip-cam' into 'master'
...
Noclip cam
See merge request KartKrew/Kart!32
2018-10-07 23:15:06 -04:00
fef3c63740
Moved colors around yet again for nicer invincibility effect
...
- Ruby is closer to the pinks (and where purples would be if it wrapped around)
- Sapphire is closer to the cyans
- Dream is right before the teals
2018-10-03 21:18:07 -04:00
c75e40d08d
MODID acquired
...
DEVELOP and USE_PATCH_KART undef'd as well
2018-10-01 16:24:38 -04:00
06c0e609c3
Prefix with Kart
2018-09-24 09:56:02 -04:00
ec04ebdda3
Say "mb.srb2.org" instead of "the forums on srb2.org" :V
2018-09-24 09:53:11 -04:00
2e3f0481b1
Version number update part 1
...
- Change from "v1.4.8" to "v1.0.0"
- Remove the random additional "DevEXE" moniker outside of DEVELOP mode
- For some reason, the version number of "1.4.8" was also set separately in DEVELOP mode, even though in vanilla it's intended to always be 0. Changed this back.
TODO (*after* feature freeze):
- Request and update MODID
- Undef DEVELOP mode
2018-09-24 09:49:53 -04:00
3949d0fcdb
Obvious first commit: enable the NOCLIPCAM define again
2018-09-22 22:22:44 -04:00
e2a7146667
Reeling back on this again
...
Kinda want to save it for another branch
2018-09-20 17:11:59 -04:00
b2099678d1
Enable noclip cam again.
...
It's just... TOO good, despite the couple of issues with it
2018-09-18 23:56:26 -04:00
Sally Cochenour