mazmazz
|
2b8cdc0381
|
Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'""
This reverts commit c0c05043e6.
|
2018-12-23 18:04:01 -05:00 |
|
Digiku
|
140152c2e7
|
Merge branch '2122-next' into 'next'
Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
See merge request STJr/SRB2!419
|
2018-12-23 18:00:18 -05:00 |
|
mazmazz
|
c0c05043e6
|
Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
This reverts commit b5d4bb3530, reversing
changes made to 2d675750cf.
|
2018-12-23 17:57:50 -05:00 |
|
Digiku
|
b5d4bb3530
|
Merge branch 'menu-mpjoy-fix' into 'next'
Menu: Fix joystick events causing the player to move during multiplayer system menu
See merge request STJr/SRB2!414
|
2018-12-23 17:55:02 -05:00 |
|
Monster Iestyn
|
2d675750cf
|
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
|
2018-12-23 21:52:49 +00:00 |
|
mazmazz
|
aa77038dfc
|
Add chat_on to non-key move event checks
|
2018-12-23 03:21:32 -05:00 |
|
Alam Arias
|
c5ec1e30a4
|
Merge pull request #391 from monster-psychic-cat/sw_largeroomfix
Large room fix
|
2018-12-22 19:48:08 -05:00 |
|
Alam Ed Arias
|
4265be776c
|
Merge branch 'master' into next
|
2018-12-22 19:36:32 -05:00 |
|
Alam Arias
|
194f9ea8c0
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-22 19:34:22 -05:00 |
|
Digiku
|
974a8e3e2b
|
Merge branch 'sdl-vidmode-display-fix' into 'master'
SDL: Center window on current monitor during vidmode change
Closes #47
See merge request STJr/SRB2!415
|
2018-12-22 09:06:55 -05:00 |
|
mazmazz
|
8707b2f40a
|
Center window on current monitor during vidmode change
|
2018-12-22 01:43:58 -05:00 |
|
mazmazz
|
cb619e0353
|
Don't create movement events from joy or mouse when menu is active
|
2018-12-22 01:20:24 -05:00 |
|
Digiku
|
66dc5a8712
|
Merge branch 'menu-screenshot-fix' into 'master'
Menu screenshot fix
Closes #45
See merge request STJr/SRB2!413
|
2018-12-22 00:40:18 -05:00 |
|
TehRealSalt
|
1291d35e08
|
Don't allow non-keyboard keys to screenshot/gif in menus
|
2018-12-22 00:39:32 -05:00 |
|
Monster Iestyn
|
a72d79da54
|
Merge branch 'master' into next
|
2018-12-21 17:41:19 +00:00 |
|
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 |
|
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 |
|
mazmazz
|
f66ee8c4cd
|
Add sirjuddington and CodeImp to Special Thanks credits
|
2018-12-20 17:27:25 -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 |
|
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 |
|
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
|
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 |