Digiku
|
eaab2da100
|
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
|
50710c3f10
|
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
|
88a503aa76
|
Add chat_on to non-key move event checks
|
2018-12-23 03:21:32 -05:00 |
|
Alam Arias
|
a81fa9755e
|
Merge pull request #391 from monster-psychic-cat/sw_largeroomfix
Large room fix
|
2018-12-22 19:48:08 -05:00 |
|
Alam Ed Arias
|
59a97a01b9
|
Merge branch 'master' into next
|
2018-12-22 19:36:32 -05:00 |
|
Alam Arias
|
6aa648214d
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-22 19:34:22 -05:00 |
|
Digiku
|
b9e37d1ed0
|
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
|
5ed5d09950
|
Center window on current monitor during vidmode change
|
2018-12-22 01:43:58 -05:00 |
|
mazmazz
|
5a18d89414
|
Don't create movement events from joy or mouse when menu is active
|
2018-12-22 01:20:24 -05:00 |
|
Digiku
|
7136112f9c
|
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
|
e5c308c1d7
|
Don't allow non-keyboard keys to screenshot/gif in menus
|
2018-12-22 00:39:32 -05:00 |
|
Monster Iestyn
|
d46e2ef51b
|
Merge branch 'master' into next
|
2018-12-21 17:41:19 +00:00 |
|
Digiku
|
932daaee22
|
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
|
8e40bdb59d
|
Re-order Special Thanks -- groups first, then names in ABC order
|
2018-12-21 11:40:35 -05:00 |
|
Digiku
|
cb81503f8e
|
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
|
a4ddad6824
|
Add sirjuddington and CodeImp to Special Thanks credits
|
2018-12-20 17:27:25 -05:00 |
|
Digiku
|
7920dbe4a8
|
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
|
2b28d30109
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 19:58:16 -02:00 |
|
Jimita
|
97e57203d6
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 19:57:38 -02:00 |
|
Digiku
|
b6ff4b8930
|
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
|
2b365bd7ce
|
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
|
2cff6dc078
|
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
|
6a62edcae4
|
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
|
32ff0dcd71
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 19:53:24 -02:00 |
|
Digiku
|
f674a77a8e
|
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
|
b584e95cdb
|
bland
|
2018-12-20 18:52:51 -03:00 |
|
mazmazz
|
fb3fbf64bd
|
Update CMake paths for Windows DLLs
|
2018-12-20 16:46:40 -05:00 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|