stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
2789 commits 60 branches 11 tags 94 MiB
Commit graph

2130 commits

Author SHA1 Message Date
Monster Iestyn
582c5332f4 Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens 2018-12-11 18:39:58 +00:00
mazmazz
47ee3525af Indentation 2018-12-08 14:10:56 -05:00
mazmazz
01f1933f69 Force directsound to fix wrong-pitch sound effects 2018-12-08 14:05:58 -05:00
mazmazz
df89781623 Windows string adjustment 2018-12-06 15:42:58 -05:00
mazmazz
ba60989c00 Adjust version strings 2018-12-06 15:39:19 -05:00
Digiku
17e9188c89 Merge branch 'execversion' into '21-version' 
Block previous versions' config defaults with EXECVERSION consvar

See merge request STJr/SRB2!371
 2018-12-06 12:41:20 -05:00
mazmazz
3ceeb6a205 Register execversion and remove CV_SAVE because we write manually 2018-12-06 12:28:30 -05:00
mazmazz
0be61e8830 a stray if block 2018-12-06 12:03:53 -05:00
mazmazz
a5eb62b73e alwaysfreelook -> alwaysmlook string 2018-12-06 12:02:45 -05:00
mazmazz
70aa4ce18e Add alwaysfreelook2 and mousemove2 to config versioning 
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
 2018-12-06 11:59:34 -05:00
mazmazz
f0c7848e50 Use proper DD define for use_joystick 2018-12-06 06:50:18 -05:00
mazmazz
5b3a1e0c55 Implement EXECVERSION consvar to invalidate previous versions' default config values 2018-12-06 06:28:34 -05:00
mazmazz
a802069313 Move joyaxis_fire default to right trigger 2018-12-06 05:55:56 -05:00
mazmazz
aaf5d2e1dc Change 2p controller defaults 2018-12-06 05:26:28 -05:00
mazmazz
9055c9aeab Hex instead of octal colors 2018-12-05 13:08:25 -05:00
mazmazz
c5b349ddc4 More concise bitness check 2018-12-05 13:06:56 -05:00
mazmazz
1ea2fa447a Make the ifdefs cleaner 2018-12-05 13:00:42 -05:00
mazmazz
389c2d4ea1 _WINDOWS instead of _WIN32 for DD 2018-12-05 12:55:05 -05:00
mazmazz
6d9fb0d3fd Merge remote-tracking branch 'public-gitlab/21-version' into versionflags 2018-12-05 12:49:21 -05:00
Monster Iestyn
aee8dcdff8 Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server 
it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck
 2018-12-05 17:39:02 +00:00
mazmazz
a6dcd5555e Add various flags to version string 2018-12-05 11:43:33 -05:00
Monster Iestyn
ae14fd2f85 Fix motd being broken for admins 
It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands
 2018-12-04 21:09:28 +00:00
Monster Iestyn
b4b82e681c Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart 2018-12-04 18:54:36 +00:00
Monster Iestyn
e353e2ef70 Merge branch 'next' into 21-version 2018-12-04 17:19:36 +00:00
Monster Iestyn
f2b0db5a1c Merge branch 'master' into next 2018-12-04 17:18:19 +00:00
Digiku
e6e5856fd8 Merge branch 'auto-joystick' into 'master' 
Use Joystick 1 and Joystick 2 by default if plugged in

See merge request STJr/SRB2!364
 2018-12-04 11:53:58 -05:00
Digiku
631f6ed406 Merge branch 'joystick-juggling' into 'master' 
Joystick juggling

See merge request STJr/SRB2!355
 2018-12-04 11:51:55 -05:00
Monster Iestyn
d1a8e3acdb Merge branch 'tiny-makefile-fix' into 'master' 
Tiny Makefile Fix

See merge request STJr/SRB2!289
 2018-12-04 08:09:27 -05:00
mazmazz
c799584f3d Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart) 2018-12-03 23:36:36 -05:00
mazmazz
60feae1014 Update OSX icon 2018-12-03 23:09:54 -05:00
Digiku
ba81e26f71 Merge branch 'controller-menu-touchup' into 'master' 
Controller select menu improvements.

See merge request STJr/SRB2!354
 2018-12-03 23:00:36 -05:00
Digiku
42cb597731 Merge branch 'joystick-juggling-two' into 'next' 
Joystick additions for menu, axis defaults, and vertical look toggle

See merge request STJr/SRB2!359
 2018-12-03 22:59:19 -05:00
Steel Titanium
fbb2cde800 Make this be consistent with non-CMake builds 2018-12-03 15:42:37 -05:00
Steel Titanium
168647275c One small change 2018-12-03 13:32:24 -05:00
mazmazz
6ca1130551 Hardcode Screenshot, GIF, and Viewpoint to their F keys 2018-12-03 13:21:16 -05:00
mazmazz
205e52f6d4 thisjoyaiming fix for chasefreelook 2018-12-03 13:13:01 -05:00
mazmazz
7ce092128b Revert "Make pause key bring up the menu if it's a joy button" 
This reverts commit 9de31cf2e7.
 2018-12-03 13:11:48 -05:00
mazmazz
6730c6c765 Menu for joy first/third person vertical look 2018-12-03 13:10:49 -05:00
mazmazz
ed57d0d9f9 Add Joy2 for network abort 2018-12-03 13:10:47 -05:00
mazmazz
9de31cf2e7 Make pause key bring up the menu if it's a joy button 
* Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames
 2018-12-03 13:10:27 -05:00
mazmazz
7e523a1e35 Reset vertical look when toggling joyaiming 2018-12-03 13:10:24 -05:00
mazmazz
0bb113130b Add alwaysfreelook to joystick menu 2018-12-03 13:10:20 -05:00
mazmazz
59cabea8bd Add joyaiming qualifier for joystick look up/down 2018-12-03 13:10:19 -05:00
mazmazz
3134d72c12 Preserve event ch for other responders 2018-12-03 13:10:18 -05:00
mazmazz
6bf31492b7 Make M_Responder respond to joy buttons only in-menu (multiplayer bug?) 2018-12-03 13:10:16 -05:00
mazmazz
6dd44ca1de Change PC axis defaults to 360-friendly values 2018-12-03 13:10:15 -05:00
mazmazz
78dde93f3e Remap menu actions to better joy keys 2018-12-03 13:10:12 -05:00
mazmazz
06faf6ffe4 Unneeded input header in st_stuff 2018-12-03 12:36:42 -05:00
mazmazz
8851f39b84 Use static joyname instead of malloc 2018-12-03 12:35:12 -05:00
mazmazz
6c78af3542 Missed (unused?) viewpoint strings 2018-12-03 12:20:19 -05:00
mazmazz
3d8bc85494 Forgot config strings for menu keys 2018-12-03 12:19:41 -05:00
mazmazz
5314c0e36b Make F12 spectator string constant because of wrapping issues 2018-12-03 12:13:36 -05:00
mazmazz
60b16289e5 Change spectator string for "Press F12 to watch" 2018-12-03 12:11:03 -05:00
mazmazz
31f23fda8d Add gc_viewpoint from Kart 2018-12-03 11:50:57 -05:00
mazmazz
2a87093ece Add gc_screenshot and gc_recordgif from Kart 2018-12-03 11:31:48 -05:00
mazmazz
8e190932e7 Add gc_systemmenu from Kart 2018-12-03 11:21:25 -05:00
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
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
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
Steel Titanium
0f11116e7b Fix up controller menu support 2018-12-01 20:13:14 -05: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
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
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
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
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
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
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
b53cd70201
Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00: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
Steel Titanium
ba111d42ca Last minute changes. 2018-11-26 00:24:11 -05:00
Steel Titanium
cf01e820c4 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
930835f1a2 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00