Digiku
|
cd8a147c95
|
Merge branch '2122-credits-update-2' into 'next'
Re-order Special Thanks -- groups first, then names in ABC order
See merge request STJr/SRB2!411
|
2018-12-21 11:41:41 -05:00 |
|
mazmazz
|
90832938c9
|
Re-order Special Thanks -- groups first, then names in ABC order
|
2018-12-21 11:40:35 -05:00 |
|
mazmazz
|
06ff171e19
|
Adjust vid.width floating point comparson for CHAT
|
2018-12-21 11:37:22 -05:00 |
|
mazmazz
|
e20c70d5fb
|
Skip setting control if keynum is -1 (for KEY_PAUSE) handling
|
2018-12-20 18:27:44 -05:00 |
|
Digiku
|
41a25a68c9
|
Merge branch '2122-credits-update' into 'next'
Add sirjuddington and CodeImp to Special Thanks credits
See merge request STJr/SRB2!409
|
2018-12-20 18:06:08 -05:00 |
|
Digiku
|
edbf9073c6
|
Merge branch '2122-execversion' into '2122-version'
EXECVERSION adjustments (config updater)
See merge request STJr/SRB2!408
|
2018-12-20 18:01:48 -05:00 |
|
mazmazz
|
f1fea30045
|
Properly restrict EXECVERSION from cvar updates
|
2018-12-20 17:56:51 -05:00 |
|
mazmazz
|
f66ee8c4cd
|
Add sirjuddington and CodeImp to Special Thanks credits
|
2018-12-20 17:27:25 -05:00 |
|
mazmazz
|
9be1ee4ac7
|
Hardcode define MAJOREXECVERSION to MODVERSION
|
2018-12-20 17:16:04 -05:00 |
|
mazmazz
|
6affe807e8
|
Merge branch '2122-version' into 2122-execversion
|
2018-12-20 17:14:53 -05:00 |
|
Digiku
|
58a2cec70f
|
Merge branch 'float_equal' into 'master'
Clear Float equal warnings
See merge request STJr/SRB2!383
|
2018-12-20 16:58:37 -05:00 |
|
Jimita
|
2b59cfa63f
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 19:58:16 -02:00 |
|
Jimita
|
b68e01cb2b
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 19:57:38 -02:00 |
|
Digiku
|
9525de2d83
|
Merge branch 'camera-backport' into 'next'
Suggestion: 2.2 camera changes backport
See merge request STJr/SRB2!393
|
2018-12-20 16:57:23 -05:00 |
|
Digiku
|
28c8ad3dbb
|
Merge branch 'jump-spin-axes' into 'next'
Feature: Jump/Spin axes
See merge request STJr/SRB2!389
|
2018-12-20 16:57:05 -05:00 |
|
Digiku
|
75e570f2b4
|
Merge branch 'joy-jump-defaults' into 'next'
Assign joy button defaults for 1 and 2 player
See merge request STJr/SRB2!400
|
2018-12-20 16:56:09 -05:00 |
|
Digiku
|
50221c47e9
|
Merge branch 'menu-2pcontrols-fix' into 'master'
Fix 2p control menu graying out
See merge request STJr/SRB2!407
|
2018-12-20 16:54:52 -05:00 |
|
Jimita
|
2bdf56804c
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 19:53:24 -02:00 |
|
Digiku
|
f405f1ae30
|
Merge branch 'cmake-dllpath-fix' into 'master'
Update CMake paths for Windows DLLs
See merge request STJr/SRB2!406
|
2018-12-20 16:53:06 -05:00 |
|
MPC
|
9d93f54b67
|
bland
|
2018-12-20 18:52:51 -03:00 |
|
mazmazz
|
0519d8c52d
|
Update CMake paths for Windows DLLs
|
2018-12-20 16:46:40 -05:00 |
|
mazmazz
|
fe5001a38a
|
Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu
|
2018-12-20 16:40:59 -05:00 |
|
mazmazz
|
b57204fc12
|
Fix 2p control menu graying out
|
2018-12-20 16:38:58 -05:00 |
|
mazmazz
|
6f8b126586
|
Add G_FilterKeyByVersion() to setcontrol
|
2018-12-20 16:30:37 -05:00 |
|
Monster Iestyn
|
c9a730340a
|
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
|
fcb65951b8
|
change implementation of square root
|
2018-12-20 17:37:06 -03:00 |
|
Jimita
|
5b285a60a2
|
Update r_segs.c
|
2018-12-20 16:15:19 -03:00 |
|
Jimita
|
ffd5061531
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 16:56:05 -02:00 |
|
Monster Iestyn
|
76fe78571e
|
fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic
|
2018-12-20 16:47:17 +00:00 |
|
Monster Iestyn
|
dfbbab35f4
|
Merge branch 'master' into next
|
2018-12-20 16:41:21 +00:00 |
|
Digiku
|
1e15f2365d
|
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
|
e2b8ff26db
|
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua
|
2018-12-20 10:56:36 -05:00 |
|
Digiku
|
dd107724de
|
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
|
71da6836c0
|
Reset default controls for LOADCONFIG command
|
2018-12-20 10:13:43 -05:00 |
|
mazmazz
|
04916edc07
|
Update EXECVERSION to MODVERSION 27
|
2018-12-20 04:03:35 -05:00 |
|
mazmazz
|
9d212b340b
|
Update code versions to 2.1.22
|
2018-12-20 02:35:27 -05:00 |
|
Digiku
|
25f0dc7eae
|
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
|
7f8d16d3cd
|
Add DEVELOP build flag to version string
|
2018-12-20 02:27:30 -05:00 |
|
mazmazz
|
60bcf92525
|
Adjust execversion retrieval in CV_FilterVarByVersion
|
2018-12-20 02:18:59 -05:00 |
|
mazmazz
|
969960a1eb
|
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
|
2018-12-20 02:18:11 -05:00 |
|
mazmazz
|
ed7178bca4
|
Assign joy button defaults for 1 and 2 player
|
2018-12-20 01:47:35 -05:00 |
|
Digiku
|
722ceb5285
|
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
|
78501dcd0c
|
Comment out stray PK3 blockmap message
|
2018-12-20 01:11:07 -05:00 |
|
Digiku
|
223257e237
|
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
|
e5e978f8bd
|
Merge branch 'master' into next
|
2018-12-19 13:20:54 -05:00 |
|
Digiku
|
7982b1695a
|
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
|
bea76aa4bf
|
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
|
4c69fe23f6
|
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
|
387173ea89
|
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
|
2018-12-19 16:50:49 +01:00 |
|
Latapostrophe
|
a31b85e124
|
Some messages relevant to discussions now go in the chat.
|
2018-12-19 16:44:57 +01:00 |
|