mazmazz
e54086038f
Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu
2018-12-20 16:40:59 -05:00
mazmazz
8207f126f4
Fix 2p control menu graying out
2018-12-20 16:38:58 -05:00
mazmazz
2cd851652a
Add G_FilterKeyByVersion() to setcontrol
2018-12-20 16:30:37 -05:00
Monster Iestyn
ef90aa7920
Merge branch 'lua-fof-flat-names-fix' into 'next'
...
Lua FOF flat names fix
See merge request STJr/SRB2!405
2018-12-20 15:48:04 -05:00
MPC
8d42a47fdd
change implementation of square root
2018-12-20 17:37:06 -03:00
Jimita
70ce880248
Update r_segs.c
2018-12-20 16:15:19 -03:00
Jimita
b8b2fbb816
Merge branch 'next' into sw_largeroomfix
2018-12-20 16:56:05 -02:00
Monster Iestyn
f7698de3ea
fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic
2018-12-20 16:47:17 +00:00
Monster Iestyn
c22df14771
Merge branch 'master' into next
2018-12-20 16:41:21 +00:00
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
wolfy852
72619a3f71
Extend joystick hotplugging to players 3 and 4
2018-12-19 18:08:38 -06:00
wolfy852
39e01fe643
Revert GameController stuff
2018-12-19 13:11:30 -06: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
toaster
c32ef12082
woops, kicks are player-based, aren't they
2018-12-18 20:13:11 +00: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
toaster
28a87242f8
lj dm'd me so here's a second, more sensible crack at it
2018-12-18 19:40:38 +00: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
toaster
d5bddafd0f
Move some sidemove/forwardmove checks to playsim code rather than have them happen in ticcmd generation.
...
pGetPlayerControlDirection has to die since it was the only other usage of sidemove, and wasn't even relevant anymore anyways.
2018-12-18 18:05:11 +00: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
