Digiku
f75d572075
Merge branch 'exitvars-fix' into 'next'
...
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua
See merge request STJr/SRB2!404
2018-12-20 10:58:27 -05:00
mazmazz
e6954eae30
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua
2018-12-20 10:56:36 -05:00
Digiku
12fc077e01
Merge branch 'lua-nextmapoverride' into 'next'
...
Lua: nextmapoverride & skipstats changing outside of G_ExitLevel
See merge request STJr/SRB2!396
2018-12-20 10:55:30 -05:00
mazmazz
e7cc04a46e
Reset default controls for LOADCONFIG command
2018-12-20 10:13:43 -05:00
mazmazz
92eb63d8b5
Update EXECVERSION to MODVERSION 27
2018-12-20 04:03:35 -05:00
mazmazz
8a6031ba01
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
Digiku
f70a023bce
Merge branch 'version-string-develop' into 'master'
...
Add DEVELOP build flag to version string
See merge request STJr/SRB2!401
2018-12-20 02:28:21 -05:00
mazmazz
861805ca0f
Add DEVELOP build flag to version string
2018-12-20 02:27:30 -05:00
mazmazz
436c49e38b
Adjust execversion retrieval in CV_FilterVarByVersion
2018-12-20 02:18:59 -05:00
mazmazz
1e731416d0
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
2018-12-20 02:18:11 -05:00
mazmazz
119b7cb469
Assign joy button defaults for 1 and 2 player
2018-12-20 01:47:35 -05:00
Digiku
bf5a27477e
Merge branch 'pk3-stray-blockmap-msg' into 'master'
...
Comment out stray PK3 blockmap message
See merge request STJr/SRB2!399
2018-12-20 01:11:44 -05:00
mazmazz
8fb1453633
Comment out stray PK3 blockmap message
2018-12-20 01:11:07 -05:00
Digiku
6e196b3ed7
Merge branch 'using-offsetof' into 'next'
...
Use the `offsetof` function
See merge request STJr/SRB2!394
2018-12-19 21:53:37 -05:00
Alam Ed Arias
718f16426e
Merge branch 'master' into next
2018-12-19 13:20:54 -05:00
Digiku
91bed58e6a
Merge branch 'ogl-zfighting-fix' into 'master'
...
OpenGL z-fighting fix [by Azeonus]
Closes #43
See merge request STJr/SRB2!395
2018-12-19 13:05:04 -05:00
Digiku
2ede537861
Merge branch 'save-override' into 'next'
...
Feature: Save override for level header
See merge request STJr/SRB2!392
2018-12-19 13:04:41 -05:00
Digiku
4c69dac654
Merge branch 'kart-luatextures-backport' into 'next'
...
Lua: Kart textures backport (non-foolish vers)
See merge request STJr/SRB2!391
2018-12-19 13:04:24 -05:00
Latapostrophe
d51b5fa676
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
2018-12-19 16:50:49 +01:00
Latapostrophe
d83c3ccfff
Some messages relevant to discussions now go in the chat.
2018-12-19 16:44:57 +01:00
mazmazz
7c5e508f40
Change 0.05 to 0.05f
2018-12-18 16:59:59 -05:00
Azeonus
ae590779f9
dispoffset OGL fix [by Azeonus]
2018-12-18 16:50:03 -05:00
TehRealSalt
b5d86d7263
Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.
2018-12-18 15:03:54 -05:00
Alam Arias
34354185e0
Merge pull request #367 from monster-psychic-cat/the_second_remote_view_camera_fix
...
Fix remote viewpoint cameras for real this time
2018-12-18 15:00:59 -05:00
TehRealSalt
3cecf00c83
G_SetCustomExitVars for setting nextmapoverride & skipstats
...
This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.
2018-12-18 14:48:04 -05:00
Alam Arias
8c8e72cb72
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 14:11:43 -05:00
Alam Ed Arias
c56645d193
Merge branch 'master' into next
2018-12-18 14:05:07 -05:00
Alam Arias
69398d8910
Merge pull request #373 from monster-psychic-cat/sw_planefixes
...
Software plane fixes
2018-12-18 14:02:21 -05:00
Alam Arias
09f41f0e68
Merge pull request #368 from monster-psychic-cat/automap_fix
...
Automap fix
2018-12-18 14:02:05 -05:00
Alam Arias
632982ef68
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 13:57:48 -05:00
TehRealSalt
4ad9801b21
Revert default changes
...
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00
Latapostrophe
cd1b929524
Merge branch 'srb2chat' into 'SRB2-CHAT'
...
fix my fucking code
See merge request SinnamonLat/SRB2!1
2018-12-18 11:51:18 -05:00
Latapostrophe
5395378d73
Merge branch 'SRB2-CHAT-COMPILE' into 'SRB2-CHAT'
...
Compile fixes for buidbots
See merge request SinnamonLat/SRB2!2
2018-12-18 11:45:01 -05:00
mazmazz
d07f44457f
Fix strncpy nodenum length overflow
2018-12-17 21:31:00 -05:00
mazmazz
54abae1dde
Change int to INT32
2018-12-17 19:09:05 -05:00
mazmazz
a607372283
Mixed D&C fixes for HU_DrawTeamTabRankings
2018-12-17 19:03:09 -05:00
mazmazz
6a87980afd
Mixed D&C fixes; replace a couple int's with INT32
2018-12-17 19:02:22 -05:00
mazmazz
7c7d85bf74
Fix compile errors
2018-12-17 18:55:21 -05:00
Monster Iestyn
1478374723
Merge branch 'frame-backslash-fix' into 'next'
...
Accept '+' as substitute for '\' for sprite frames (PK3)
See merge request STJr/SRB2!380
2018-12-17 17:34:41 -05:00
MPC
79653dd094
fix the fucking warning
2018-12-17 18:09:29 -03:00
MPC
a28aeaf23b
fix my fucking code
2018-12-17 17:57:53 -03:00
Latapostrophe
71074ccce1
make sure to change p_dispy and not y for /pm list. Also make MPC happy.
2018-12-17 21:39:49 +01:00
Latapostrophe
be35a106c5
Don't overlap ringslinger HUD
2018-12-17 21:31:31 +01:00
Jimita
97cc111f3e
Merge branch 'master' into automap_fix
2018-12-17 17:46:29 -02:00
Jimita
f08e73bc82
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 17:46:17 -02:00
Jimita
91037eae12
Merge branch 'master' into sw_planefixes
2018-12-17 17:45:36 -02:00
Latapostrophe
4c88271cfb
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
mazmazz
1d4fd996cf
Attempt to fix cv_execversion being accessible by console
2018-12-17 13:39:24 -05:00
mazmazz
80d027ee47
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
Jimita
180de2fbb2
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 15:40:20 -02:00
