Wolfy
|
42fc67a639
|
Remove hardcoded limit on admins
# Conflicts:
# src/d_netcmd.c
|
2018-11-29 07:05:49 -06:00 |
|
Wolfy
|
cabe9871e3
|
Multiple admins
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
|
2018-11-29 06:46:59 -06:00 |
|
Alam Ed Arias
|
dac1285e87
|
Merge remote-tracking branch 'private/master' into EOL
|
2018-11-27 23:36:09 -05:00 |
|
Alam Ed Arias
|
8dbde3dcd7
|
fix EOL on src/p_enemy.c
|
2018-11-27 21:32:15 -05:00 |
|
Monster Iestyn
|
d2c822c583
|
backport string len tweaks I made to LUA_LoadLump in internal
|
2018-11-27 23:06:31 +00:00 |
|
Monster Iestyn
|
b4838e3afa
|
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
|
2018-11-27 23:05:33 +00:00 |
|
mazmazz
|
363541d16a
|
Redundant type 1800 check for MT_COIN
|
2018-11-27 14:10:55 -05:00 |
|
Monster Iestyn
|
a6a4b74692
|
Merge branch '21-controls' into 'next'
Default control changes for 2.1.21
See merge request STJr/SRB2!343
|
2018-11-27 11:50:42 -05:00 |
|
Monster Iestyn
|
f526d99a27
|
use UINT8 * instead of void or Bytef *
|
2018-11-27 15:49:41 +00:00 |
|
Monster Iestyn
|
51d2f52dea
|
Merge branch 'master' into next
|
2018-11-27 15:31:28 +00:00 |
|
Monster Iestyn
|
eefbb82cfb
|
Merge branch 'save-soundmenu-toggles' into 'master'
Save sound toggles to config
See merge request STJr/SRB2!348
|
2018-11-27 10:07:06 -05:00 |
|
Monster Iestyn
|
0109382cb9
|
add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?)
|
2018-11-27 13:57:32 +00:00 |
|
Alam Ed Arias
|
62cae40426
|
PK3: fixup support for newer version of zlib
|
2018-11-26 20:08:26 -05:00 |
|
Alam Ed Arias
|
fc5e97dba9
|
Merge branch 'master' into next
|
2018-11-26 19:49:19 -05:00 |
|
Alam Ed Arias
|
96ef08cd8f
|
Makefile: disable implicit-fallthroug warnings
|
2018-11-26 19:38:14 -05:00 |
|
Alam Ed Arias
|
b608dd9d05
|
Makefile: skip implicit-fallthroug warnings
|
2018-11-26 19:28:55 -05:00 |
|
Alam Ed Arias
|
6759240861
|
Makefile: disable some warnings for GCC 8.x
|
2018-11-26 19:01:40 -05:00 |
|
Alam Ed Arias
|
6dbe534c8e
|
Fix MSVC build
|
2018-11-26 18:27:07 -05:00 |
|
Digiku
|
e2e0069259
|
Merge branch 'public-nights-invertloopfix' into 'next'
NiGHTS fix lap detection on inverted axis
See merge request STJr/SRB2!300
|
2018-11-26 16:08:24 -05:00 |
|
Digiku
|
dcba8ab654
|
"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk
|
2018-11-26 15:48:08 -05:00 |
|
Monster Iestyn
|
a9b813cef2
|
Merge branch 'opengl-noloading' into 'master'
Hide OpenGL loading screen
See merge request STJr/SRB2!349
|
2018-11-26 15:30:45 -05:00 |
|
MonsterIestyn
|
d158d7e011
|
Merge branch 'next' into PK3-BackportNext
|
2018-11-26 18:56:51 +00:00 |
|
Monster Iestyn
|
3750e41347
|
Merge branch 'fof-slope-skew-backport' into 'master'
FOF wall slope skewing backport
See merge request STJr/SRB2!341
|
2018-11-26 08:54:29 -05:00 |
|
Steel Titanium
|
c971171cd2
|
Last minute changes.
|
2018-11-26 00:24:11 -05:00 |
|
Steel Titanium
|
77d12473ae
|
Take the command line params into account
Really I'm just making it return early if either of the parms are used.
|
2018-11-25 22:39:11 -05:00 |
|
mazmazz
|
e6be735a08
|
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
|
2018-11-25 21:47:56 -05:00 |
|
mazmazz
|
9659767e43
|
FORCEWIPEOFF define in place of wipegamestate = -2
|
2018-11-25 19:40:18 -05:00 |
|
mazmazz
|
0d9749f418
|
Merge remote-tracking branch 'origin/master' into menu-execs
|
2018-11-25 19:03:22 -05:00 |
|
Monster Iestyn
|
d824e05a6f
|
Merge branch 'master' into next
|
2018-11-25 20:39:17 +00:00 |
|
mazmazz
|
7e6e9ad6ef
|
Use get_number in dehacked readmenu
|
2018-11-25 15:16:53 -05:00 |
|
mazmazz
|
cc90becce7
|
Remove unused menu hierarchy methods
|
2018-11-25 15:09:25 -05:00 |
|
mazmazz
|
656b4efaed
|
Remove M_ApplyMenuPresState
|
2018-11-25 15:08:36 -05:00 |
|
mazmazz
|
f3914583c6
|
Rearranged menu presentation methods
* Menu parameter retrieval and hierarchy in m_menu
* Presentation logic (background display) in f_finale
|
2018-11-25 15:08:12 -05:00 |
|
Steel Titanium
|
c031801daa
|
Add newline to end of file
|
2018-11-25 14:24:50 -05:00 |
|
Steel Titanium
|
157502310f
|
Save sound toggles to config
|
2018-11-25 14:22:52 -05:00 |
|
Monster Iestyn
|
72fc63eb8a
|
Merge branch 'ms-cvars-fix' into 'master'
Update server name insantly
See merge request STJr/SRB2!344
|
2018-11-25 14:04:12 -05:00 |
|
Monster Iestyn
|
358e84f56d
|
Merge branch 'mpc-software-yslope-fix' into 'master'
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)
See merge request STJr/SRB2!282
|
2018-11-25 11:51:54 -05:00 |
|
Monster Iestyn
|
235c23ded8
|
Merge branch '21-copyright-followup' into 'master'
Print copyright notice in stdout console on program start
See merge request STJr/SRB2!347
|
2018-11-25 11:07:34 -05:00 |
|
Monster Iestyn
|
1983f3bfde
|
Merge branch 'last-min-cleanup' into 'master'
Last min cleanup
See merge request STJr/SRB2!342
|
2018-11-25 10:14:34 -05:00 |
|
Monster Iestyn
|
0897adcf98
|
Merge branch 'cmake-use-internal-libs' into 'master'
CMake: Use internal libs.
See merge request STJr/SRB2!325
|
2018-11-25 09:33:50 -05:00 |
|
Monster Iestyn
|
058b5bcbda
|
Merge branch 'objectplace-skybox-fix' into 'next'
Objectplace skybox fix.
See merge request STJr/SRB2!319
|
2018-11-25 09:30:16 -05:00 |
|
mazmazz
|
91f2c4f8a7
|
Whitespace
|
2018-11-25 08:17:57 -05:00 |
|
mazmazz
|
22d0d8cb2e
|
Print GPL license notice and SEGA disclaimer in console on start
|
2018-11-25 08:12:19 -05:00 |
|
Digiku
|
f79adecdef
|
Merge branch '21-source-copyright' into 'master'
Update source copyrights to 2018
See merge request STJr/SRB2!346
|
2018-11-25 07:36:41 -05:00 |
|
mazmazz
|
951b78ee2d
|
Update source copyrights to 2018, outdated targets
|
2018-11-25 07:35:53 -05:00 |
|
mazmazz
|
c91b2b4456
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
Digiku
|
bacdb3a392
|
Merge branch '21-credits-update' into 'master'
Extra credits update .21
See merge request STJr/SRB2!345
|
2018-11-25 07:21:31 -05:00 |
|
Nev3r
|
df819f2329
|
Forgot the alignment for compact structs.
Signed-off-by: Nev3r <apophycens@gmail.com>
|
2018-11-25 11:35:19 +01:00 |
|
Nev3r
|
63dabd87cd
|
Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext
# Conflicts:
# src/w_wad.c
|
2018-11-25 11:18:28 +01:00 |
|
Nev3r
|
34facc7c60
|
Progress?
Get all IO outputs used for possible errors.
Attempt to fix errors from travis-ci.
Signed-off-by: Nev3r <apophycens@gmail.com>
|
2018-11-25 11:11:50 +01:00 |
|