stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-15 15:20:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
6610 commits 175 branches 41 tags 262 MiB
Commit graph

6610 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Alam Ed Arias
7bd0900fad Merge remote-tracking branch 'private/master' into EOL 2018-11-27 23:36:09 -05:00
Alam Ed Arias
d7fb5b1b8c Merge branch 'EOL-36' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:27:27 -05:00
Alam Ed Arias
4bd2781055 Merge branch 'EOL-35' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:25:00 -05:00
Alam Ed Arias
7924c5c41b Merge branch 'EOL-34' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:22:10 -05:00
Alam Ed Arias
27dcac7c7c Merge branch 'EOL-33' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:20:14 -05:00
Alam Ed Arias
64f67b0871 Merge branch 'EOL-32' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:18:14 -05:00
Alam Ed Arias
b28c3b106a Merge branch 'EOL-31' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:15:35 -05:00
Alam Ed Arias
5557609978 Merge branch 'EOL-30' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:13:17 -05:00
Alam Ed Arias
eca4f2cbce Merge branch 'EOL-29' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:10:14 -05:00
Alam Ed Arias
87f9cef564 Merge branch 'EOL-28' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:08:58 -05:00
Alam Ed Arias
af859bc337 Merge branch 'EOL-27' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:59:33 -05:00
Alam Ed Arias
1a6e69742f Merge branch 'EOL-26' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:56:43 -05:00
Alam Ed Arias
b09e4ed32d Merge branch 'EOL-25' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:49:49 -05:00
Alam Ed Arias
385aa633d7 Merge branch 'EOL-24' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:47:28 -05:00
Alam Ed Arias
ab27fc29a2 Merge branch 'EOL-23' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:45:24 -05:00
Alam Ed Arias
1b9b667404 Merge branch 'EOL-20' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:38:12 -05:00
Alam Ed Arias
c2d1c4207b Merge branch 'EOL-19' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:35:31 -05:00
Alam Ed Arias
18c2de0003 Merge branch 'EOL-15' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:01:29 -05:00
Alam Ed Arias
47bb524aff Merge branch 'EOL-14' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 21:52:54 -05:00