mazmazz
|
d8e70c32e0
|
Remove console messages for joynames
|
2018-12-03 05:39:10 -05:00 |
|
mazmazz
|
19d19543b7
|
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
|
2018-12-03 05:37:07 -05:00 |
|
mazmazz
|
9186f259cb
|
Adjustments
|
2018-12-03 04:55:25 -05:00 |
|
mazmazz
|
5687c3b0e6
|
A README line
|
2018-12-03 01:43:27 -05:00 |
|
mazmazz
|
6694b203e0
|
Finishing touches 2
|
2018-12-03 01:06:25 -05:00 |
|
mazmazz
|
d4718fa6d1
|
Add new Windows installer scripts
|
2018-12-03 00:53:29 -05:00 |
|
Alam Arias
|
6c0e0b9d08
|
Merge pull request #353 from monster-psychic-cat/lua_mapchange
Change MapChange so Lua returns the map number you change
|
2018-12-02 17:27:07 -05:00 |
|
Monster Iestyn
|
978a28004d
|
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
|
2018-12-02 21:52:30 +00:00 |
|
Monster Iestyn
|
13b0e9c3c5
|
make menu respond to joystick axis events without joyscale having to be 0
|
2018-12-02 21:18:28 +00:00 |
|
MonsterIestyn
|
10832db244
|
Merge branch 'next' into lua_mapchange
|
2018-12-02 20:54:32 +00:00 |
|
Monster Iestyn
|
a63ba7084a
|
Disable the axis parts of I_GetJoystickEvents and its player2 counterpart.
(This is what I should have done in the first place)
|
2018-12-02 17:42:51 +00:00 |
|
Monster Iestyn
|
ce4e63a366
|
Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet
|
2018-12-02 17:12:05 +00:00 |
|
Monster Iestyn
|
33c1ac33f5
|
Merge branch 'next' into 21-version
# Conflicts:
# src/d_netcmd.c
|
2018-12-02 15:45:07 +00:00 |
|
Monster Iestyn
|
72f080d5b3
|
Merge branch 'multiadmin-backport' into '21-version'
Multi-Admin Backport
See merge request STJr/SRB2!351
|
2018-12-02 10:34:57 -05:00 |
|
wolfy852
|
e12890c84e
|
s
|
2018-12-02 09:08:05 -06:00 |
|
wolfy852
|
2af04203ea
|
Fix a dumb mistake
|
2018-12-02 08:57:35 -06:00 |
|
Monster Iestyn
|
26a8f51c8e
|
Merge branch 'searchblockmap-backport' into 'next'
Lua: Blockmap search library backport
See merge request STJr/SRB2!353
|
2018-12-02 09:49:42 -05:00 |
|
Steel Titanium
|
0f11116e7b
|
Fix up controller menu support
|
2018-12-01 20:13:14 -05:00 |
|
Monster Iestyn
|
068e947292
|
Merge branch 'master' into next
|
2018-11-30 21:09:32 +00:00 |
|
Monster Iestyn
|
11cb163435
|
Backport the Blockmap library I made two years ago
|
2018-11-30 17:11:11 +00:00 |
|
Jimita
|
6d7689c1a7
|
Merge branch 'next' into lua_mapchange
|
2018-11-30 15:10:59 -02:00 |
|
MPC
|
54cae84849
|
Change MapChange so Lua returns the map number you change
|
2018-11-30 14:01:40 -03:00 |
|
Monster Iestyn
|
e0a1c43813
|
Free lump names *before* either lumpinfo or the WAD itself!
|
2018-11-30 14:19:47 +00:00 |
|
Sryder
|
bc1f08f89d
|
Fix 2 of the Unsuffixed Float Constant warnings
The other one is related to M_PI for me, which I'm still not sure about where it's getting it from
|
2018-11-29 22:12:14 +00:00 |
|
Sryder
|
c5e8e0badb
|
Merge branch 'master' into tiny-makefile-fix
|
2018-11-29 21:57:47 +00:00 |
|
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 |