Monster Iestyn
|
305ad4f73e
|
backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading
|
2018-11-29 14:16:02 +00:00 |
|
wolfy852
|
c517862f7e
|
I must be some kind of idiot.
|
2018-11-29 07:34:05 -06:00 |
|
wolfy852
|
d294be2054
|
Fix a quick merge mistake.
|
2018-11-29 07:15:54 -06:00 |
|
TehRealSalt
|
c70cf5908d
|
IsPlayerAdmin support, since admin was removed
# Conflicts:
# src/lua_baselib.c
|
2018-11-29 07:12:15 -06:00 |
|
Wolfy
|
b59718d3ad
|
Remove hardcoded limit on admins
# Conflicts:
# src/d_netcmd.c
|
2018-11-29 07:05:49 -06:00 |
|
Wolfy
|
b8ce51bff2
|
Multiple admins
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
|
2018-11-29 06:46:59 -06:00 |
|
Digiku
|
b1c41a193b
|
Merge branch '21-deb' into 'master'
Update debian packaging to work with Launchpad PPA
See merge request STJr/SRB2!350
|
2018-11-29 04:20:30 -05:00 |
|
mazmazz
|
93b6503773
|
Add wget to assets deb depends
|
2018-11-27 18:16:20 -05:00 |
|
Monster Iestyn
|
e158206e55
|
backport string len tweaks I made to LUA_LoadLump in internal
|
2018-11-27 23:06:31 +00:00 |
|
Monster Iestyn
|
cb53bc8afe
|
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
|
2018-11-27 23:05:33 +00:00 |
|
mazmazz
|
0d5d0b2f27
|
Fix i386 Launchpad build by commenting out pkg-config hacks
|
2018-11-27 16:47:00 -05:00 |
|
Monster Iestyn
|
cd57be640c
|
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 |
|
mazmazz
|
559cf93e4a
|
Move binary routine to binary-arch for Launchpad
|
2018-11-27 11:05:34 -05:00 |
|
Monster Iestyn
|
3e6388c183
|
use UINT8 * instead of void or Bytef *
|
2018-11-27 15:49:41 +00:00 |
|
Monster Iestyn
|
6e839d30a2
|
Merge branch 'master' into next
|
2018-11-27 15:31:28 +00:00 |
|
Monster Iestyn
|
95e13d9ad3
|
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
|
1889c36dea
|
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 |
|
mazmazz
|
b0474084f8
|
Actually both libpng names are in the wild
|
2018-11-27 02:30:31 -05:00 |
|
mazmazz
|
0314469c7e
|
Changelog version for main package
|
2018-11-27 02:14:47 -05:00 |
|
mazmazz
|
7c343d0f69
|
Fix debian desktop icon
|
2018-11-27 02:11:57 -05:00 |
|
mazmazz
|
ce32413633
|
Smarter libgme ldflag detection
|
2018-11-27 01:51:22 -05:00 |
|
mazmazz
|
e099d2aaf2
|
Tar-ignore options for main deb
|
2018-11-27 01:26:32 -05:00 |
|
mazmazz
|
e4ce0ab9f1
|
Merge remote-tracking branch 'public-gitlab/master' into 21-deb
|
2018-11-27 01:18:00 -05:00 |
|
mazmazz
|
5599fe61a5
|
Main deb tweaks
|
2018-11-27 01:17:34 -05:00 |
|
mazmazz
|
e7ae21a61c
|
Separate asset files from clean step; No more hacky NOCLEAN file
|
2018-11-27 00:49:07 -05:00 |
|
mazmazz
|
349308ef01
|
Do not clean files before source building
|
2018-11-27 00:39:34 -05:00 |
|
mazmazz
|
77bf02f02e
|
Don't clean files on Launchpad build
|
2018-11-26 23:02:02 -05:00 |
|
mazmazz
|
f6bde1844e
|
Keep the assets/ files; ignore the assets/debian/tmp files in source packaging
|
2018-11-26 22:39:22 -05:00 |
|
mazmazz
|
6a80cc60b6
|
Only package debian/tmp/[data]/file in asset source package; extra instructions
|
2018-11-26 22:23:44 -05:00 |
|
mazmazz
|
0062fded19
|
Fixed broken date strings in debian package files; skip asset download if that file already exists
|
2018-11-26 21:49:25 -05:00 |
|
Alam Ed Arias
|
b7f7c2ecf7
|
PK3: fixup support for newer version of zlib
|
2018-11-26 20:08:26 -05:00 |
|
Alam Ed Arias
|
9a042cd5e2
|
Merge branch 'master' into next
|
2018-11-26 19:49:19 -05:00 |
|
Alam Ed Arias
|
776e920895
|
TravisCI: need WFLAGS for cmake builds
|
2018-11-26 19:39:36 -05:00 |
|
Alam Ed Arias
|
5ba788e089
|
Revert "TravisCi: remove WFLAGS"
This reverts commit fd12e85697.
|
2018-11-26 19:38:30 -05:00 |
|
Alam Ed Arias
|
78a1931bdf
|
Makefile: disable implicit-fallthroug warnings
|
2018-11-26 19:38:14 -05:00 |
|
Alam Ed Arias
|
5a3f469593
|
Makefile: skip implicit-fallthroug warnings
|
2018-11-26 19:28:55 -05:00 |
|
Alam Ed Arias
|
fd12e85697
|
TravisCi: remove WFLAGS
|
2018-11-26 19:20:12 -05:00 |
|
Alam Ed Arias
|
ac2ec6c982
|
Makefile: disable some warnings for GCC 8.x
|
2018-11-26 19:01:40 -05:00 |
|
Alam Ed Arias
|
4e332b3848
|
Fix MSVC build
|
2018-11-26 18:27:07 -05:00 |
|
Digiku
|
a2678dcb2e
|
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
|
fd891aa21d
|
"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
|
4b0d45afd8
|
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
|
9940b53742
|
Merge pull request #348 from Nevur/PK3-BackportNext
Pk3 backport next
|
2018-11-26 20:14:45 +00:00 |
|
mazmazz
|
b5000f1151
|
More debian 2.1.21 tweaks; update some copyright info to STJr
|
2018-11-26 14:40:59 -05:00 |
|
MonsterIestyn
|
b53cd70201
|
Merge branch 'next' into PK3-BackportNext
|
2018-11-26 18:56:51 +00:00 |
|
mazmazz
|
e615784248
|
Debian control syntax fix
|
2018-11-26 09:08:39 -05:00 |
|
mazmazz
|
b3262bfd4e
|
Debian package version to 2.1.21-beta~1
|
2018-11-26 09:07:21 -05:00 |
|
mazmazz
|
ac2e93abbb
|
LibGME debian rules hack
|
2018-11-26 09:06:53 -05:00 |
|
Monster Iestyn
|
a71ca1d259
|
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 |
|
mazmazz
|
9e025cfd33
|
Debian packaging adjustments
|
2018-11-26 07:11:10 -05:00 |