dd107724de
Merge branch 'lua-nextmapoverride' into 'next'
...
Lua: nextmapoverride & skipstats changing outside of G_ExitLevel
See merge request STJr/SRB2!396
2018-12-20 10:55:30 -05:00
71da6836c0
Reset default controls for LOADCONFIG command
2018-12-20 10:13:43 -05:00
04916edc07
Update EXECVERSION to MODVERSION 27
2018-12-20 04:03:35 -05:00
9d212b340b
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
25f0dc7eae
Merge branch 'version-string-develop' into 'master'
...
Add DEVELOP build flag to version string
See merge request STJr/SRB2!401
2018-12-20 02:28:21 -05:00
7f8d16d3cd
Add DEVELOP build flag to version string
2018-12-20 02:27:30 -05:00
60bcf92525
Adjust execversion retrieval in CV_FilterVarByVersion
2018-12-20 02:18:59 -05:00
969960a1eb
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
2018-12-20 02:18:11 -05:00
ed7178bca4
Assign joy button defaults for 1 and 2 player
2018-12-20 01:47:35 -05:00
722ceb5285
Merge branch 'pk3-stray-blockmap-msg' into 'master'
...
Comment out stray PK3 blockmap message
See merge request STJr/SRB2!399
2018-12-20 01:11:44 -05:00
78501dcd0c
Comment out stray PK3 blockmap message
2018-12-20 01:11:07 -05:00
223257e237
Merge branch 'using-offsetof' into 'next'
...
Use the `offsetof` function
See merge request STJr/SRB2!394
2018-12-19 21:53:37 -05:00
e5e978f8bd
Merge branch 'master' into next
2018-12-19 13:20:54 -05:00
7982b1695a
Merge branch 'ogl-zfighting-fix' into 'master'
...
OpenGL z-fighting fix [by Azeonus]
Closes #43
See merge request STJr/SRB2!395
2018-12-19 13:05:04 -05:00
bea76aa4bf
Merge branch 'save-override' into 'next'
...
Feature: Save override for level header
See merge request STJr/SRB2!392
2018-12-19 13:04:41 -05:00
4c69fe23f6
Merge branch 'kart-luatextures-backport' into 'next'
...
Lua: Kart textures backport (non-foolish vers)
See merge request STJr/SRB2!391
2018-12-19 13:04:24 -05:00
387173ea89
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
2018-12-19 16:50:49 +01:00
a31b85e124
Some messages relevant to discussions now go in the chat.
2018-12-19 16:44:57 +01:00
96cad09db6
Change 0.05 to 0.05f
2018-12-18 16:59:59 -05:00
67cd6dcdd2
dispoffset OGL fix [by Azeonus]
2018-12-18 16:50:03 -05:00
42a9e66883
Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.
2018-12-18 15:03:54 -05:00
0e34e7f32f
G_SetCustomExitVars for setting nextmapoverride & skipstats
...
This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.
2018-12-18 14:48:04 -05:00
b62e6ee909
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 14:11:43 -05:00
d5c7ca1d23
Merge branch 'master' into next
2018-12-18 14:05:07 -05:00
056cfe71a4
Merge pull request #373 from monster-psychic-cat/sw_planefixes
...
Software plane fixes
2018-12-18 14:02:21 -05:00
afecb2fc85
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 13:57:48 -05:00
03a4bd8f53
Revert default changes
...
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00
9f17039e2e
Merge branch 'srb2chat' into 'SRB2-CHAT'
...
fix my fucking code
See merge request SinnamonLat/SRB2!1
2018-12-18 11:51:18 -05:00
1fcf607b41
Fix strncpy nodenum length overflow
2018-12-17 21:31:00 -05:00
876ddd48f1
Change int to INT32
2018-12-17 19:09:05 -05:00
bf21b7c483
Mixed D&C fixes for HU_DrawTeamTabRankings
2018-12-17 19:03:09 -05:00
7a92c9d3d0
Mixed D&C fixes; replace a couple int's with INT32
2018-12-17 19:02:22 -05:00
245a125551
Fix compile errors
2018-12-17 18:55:21 -05:00
bd58ff8c49
Merge branch 'frame-backslash-fix' into 'next'
...
Accept '+' as substitute for '\' for sprite frames (PK3)
See merge request STJr/SRB2!380
2018-12-17 17:34:41 -05:00
ca4329bcb6
fix the fucking warning
2018-12-17 18:09:29 -03:00
82601e881b
fix my fucking code
2018-12-17 17:57:53 -03:00
2fdf27c507
make sure to change p_dispy and not y for /pm list. Also make MPC happy.
2018-12-17 21:39:49 +01:00
ff957baae3
Don't overlap ringslinger HUD
2018-12-17 21:31:31 +01:00
1d40676f3a
Merge branch 'master' into automap_fix
2018-12-17 17:46:29 -02:00
3329c10b60
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 17:46:17 -02:00
f3956ffb4c
Merge branch 'master' into sw_planefixes
2018-12-17 17:45:36 -02:00
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
b64dd82034
Attempt to fix cv_execversion being accessible by console
2018-12-17 13:39:24 -05:00
657e7321f6
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
362fb491f7
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 15:40:20 -02:00
e9be5e895e
Merge branch 'master' into next
2018-12-17 17:34:41 +00:00
b958f00f17
Better rewrite for addons draw adjustment
2018-12-17 10:59:27 -05:00
bef3bb23f8
Undo dc92bb49
2018-12-16 21:36:54 -05:00
97639848e1
Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport
2018-12-16 21:22:06 -05:00
9e596d15af
Save override for level header
...
Kind of like 2.2's, but with backwards-compatability with 2.1
2018-12-16 20:09:59 -05:00
6dbe930997
Use labs for long value
2018-12-16 19:47:02 -05:00
2d2bd59099
Remove FIXUPO0 GCC pragma
2018-12-16 19:39:16 -05:00
296b678d7e
Wstrict-overflow adjustment
2018-12-16 19:38:46 -05:00
ec53e12294
Foolish
2018-12-16 18:19:53 -05:00
e763eab6cd
2.2 camera changes backport
...
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.
These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
2018-12-16 18:18:59 -05:00
14e98df69b
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
...
This reverts merge request !387
2018-12-16 22:57:39 +00:00
c69cfefb6d
2.2 backport of jump/spin axes
...
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
6b1b11441d
Merge branch 'sdl-sound-fix' into 'master'
...
SDL: Force use DirectSound driver to fix wrong-pitch sound effects
See merge request STJr/SRB2!375
2018-12-16 17:16:49 -05:00
1b7a9aaa01
2.1 Score/Time/Rings lump name
2018-12-16 16:53:13 -05:00
899120e475
Revert NMUSlist to original 2.1
2018-12-16 16:42:57 -05:00
d7321fd8c4
Pull expanded NMUSlist from 2.2
2018-12-16 16:40:40 -05:00
046d36a657
Remove Kart entries from NMUSlist
2018-12-16 16:08:31 -05:00
6d94568f4b
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
cc22ef3f05
Add deprecation warning to admin
2018-12-16 16:05:18 -05:00
4ba23e1028
Expose R_TextureNumForName
...
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
c3ff0b6d16
Uncomment Secrets menu toggle when exiting Addons
2018-12-16 15:52:01 -05:00
6e79722437
Fix float-equal warning in Win32 interface
2018-12-16 14:01:28 -05:00
11aef0b3f1
Merge branch 'master' into float_equal
2018-12-16 13:52:45 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
f0967520ed
Compile fixes; enable PK3 support in addons menu
...
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
2018-12-15 21:44:39 -05:00
37950341ec
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
0a3b3736bf
Handle Kart-specific changes; add PK3 to exttable
2018-12-15 20:50:33 -05:00
b32f50648d
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
15d0673685
fix compiling for clang
2018-12-14 21:31:37 -05:00
78634679f1
fix compiling for MSVC
2018-12-14 20:42:37 -05:00
6fd66bdb49
Clear float equal warnings
2018-12-14 20:34:06 -05:00
f4ce770c1c
try out using offsetof for these three macros in d_clisrv.h
2018-12-14 23:56:11 +00:00
e0079ea1a2
remove NearVertice (which was unused anyway), clean up maz's changes
2018-12-14 23:28:07 +00:00
de96fe8e7b
Revert "compiler SSE tweak for 32-bit"
...
This reverts commit 09d9a555c6
2018-12-14 16:47:38 -05:00
abae63a64b
SameVertice floating point match; fixes 64-bit OGL holes
2018-12-14 16:47:24 -05:00
66efc7ea7f
Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup
2018-12-14 16:23:42 -05:00
c1e0041a0b
copy doom legacy's replacement for the den == 0.0 calc in fracdivline
2018-12-14 21:22:13 +00:00
09d9a555c6
compiler SSE tweak for 32-bit
2018-12-14 16:21:07 -05:00
623d1574ce
minor cleanup
2018-12-14 21:00:53 +00:00
9c04a066d9
Update r_plane.h
2018-12-14 15:49:32 -03:00
b42c306ef3
remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway
2018-12-14 18:14:08 +00:00
52fd3dcbed
split loading status code into a separate function
2018-12-14 18:11:30 +00:00
02fc845a72
Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all
2018-12-14 18:01:18 +00:00
4089b6b8e9
use continue if NULL instead of a big if block if ...not NULL
...
also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards
2018-12-14 18:00:08 +00:00
3a125dbbd5
compare with actual doubles, not ints
2018-12-14 17:14:03 +00:00
cf792ef4f3
Merge branch 'master' into the_second_remote_view_camera_fix
2018-12-14 15:09:24 -02:00
9c2197db17
Software plane fixes
2018-12-14 14:08:25 -03:00
d70dbada1c
Merge branch 'master' into automap_fix
2018-12-14 15:07:53 -02:00
ef6533fb83
Merge branch 'master' into next
2018-12-13 22:21:31 +00:00
880c017f8f
Merge branch 'cfg-srb2home-fix' into 'master'
...
Apply srb2home path to EXEC, SAVECONFIG, and debugfile
See merge request STJr/SRB2!379
2018-12-13 16:16:52 -05:00
dc7992a815
R_Char2Frame special case for backslash: accept plus as substitute
2018-12-13 14:59:12 -05:00
d18b2cda59
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
93f7f0a8df
Apply srb2home to debugfile
2018-12-13 13:23:09 -05:00
b1641aa8e9
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
93eda4e7c9
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
b84470ec51
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-13 12:01:07 -05:00
2cb2b02b73
Fix Ballhog under the last commit...
...
It actually uses trailing item's throw speeds instead of its own, oddly enough; I don't want to mess with the gameplay there, so I just gave it its own exception.
2018-12-13 09:47:14 -05:00
6d19be6412
Make SPB follow the same rules too
2018-12-13 09:34:27 -05:00
bbf8222767
Stupid Orbinaut bullshit
...
- Fix Orbinaut/Jawz not accepting top speed changes (This means back-spam being slower now for real works, and the speed buff on boosters for real works.)
- Make the top-speed buffs for boosters not work for back-spam
2018-12-12 21:25:18 -05:00
e628d98f20
Update am_map.c
2018-12-12 19:59:21 -02:00
a5874019cb
Update am_map.c
2018-12-12 19:57:52 -02:00
649b6c9ca1
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
6b22dc183b
Fix the automap
2018-12-12 18:01:52 -03:00
966afb6017
Update p_user.c
2018-12-12 13:09:47 -02:00
c68875ad93
Fix remote viewpoint cameras for real
...
I'm so sorry
2018-12-11 20:48:45 -03:00
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
348ed1e43f
Large room fix
2018-12-09 19:34:17 -03:00
47ee3525af
Indentation
2018-12-08 14:10:56 -05:00
01f1933f69
Force directsound to fix wrong-pitch sound effects
2018-12-08 14:05:58 -05:00
df89781623
Windows string adjustment
2018-12-06 15:42:58 -05:00
ba60989c00
Adjust version strings
2018-12-06 15:39:19 -05:00
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
3ceeb6a205
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
0be61e8830
a stray if block
2018-12-06 12:03:53 -05:00
a5eb62b73e
alwaysfreelook -> alwaysmlook string
2018-12-06 12:02:45 -05:00
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
f0c7848e50
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
5b3a1e0c55
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
a802069313
Move joyaxis_fire default to right trigger
2018-12-06 05:55:56 -05:00
aaf5d2e1dc
Change 2p controller defaults
2018-12-06 05:26:28 -05:00
c599d84d6e
Actually, best of both:
...
Let Grow/Shrink revert itself when it changes to 0, as well as add a function for removing either. Means we don't have to modify every single > 0/< 0 check, and is overall cleaner.
2018-12-05 23:28:44 -05:00
9bafdaf492
> 2
...
Same here
2018-12-05 22:54:06 -05:00
0bd0240464
< -2
...
I doubt this hurts anything, but might as well I guess
2018-12-05 22:53:34 -05:00
c2dfc1155f
Set Shrink timer, don't add to it
2018-12-05 22:51:08 -05:00
101feb9498
Add Miku's author to credits.
2018-12-05 21:58:26 -05:00
261319b754
Merge branch 'force-spb' into 'master'
...
Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out.
See merge request KartKrew/Kart!119
2018-12-05 21:43:59 -05:00
97f2f858ad
Give lap animation V_SNAPTOTOP as intended
2018-12-05 21:39:34 -05:00
116b10c29d
Comment out M_DrawSaveLoadBorder
2018-12-05 21:27:51 -05:00
d0180ecb15
Cut this down slightly
2018-12-05 20:54:58 -05:00
d53e4af93a
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-05 20:46:48 -05:00
7ab098636b
Edited even more things to say "SRB2Kart"
2018-12-05 20:40:58 -05:00
df191639bd
Merge remote-tracking branch 'srb2public/master' into merge-next
2018-12-05 19:21:13 -05:00
b3b5b3f81d
Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out.
2018-12-05 19:09:05 -05:00
9055c9aeab
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
c5b349ddc4
More concise bitness check
2018-12-05 13:06:56 -05:00
1ea2fa447a
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
389c2d4ea1
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
6d9fb0d3fd
Merge remote-tracking branch 'public-gitlab/21-version' into versionflags
2018-12-05 12:49:21 -05:00
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
a6dcd5555e
Add various flags to version string
2018-12-05 11:43:33 -05:00
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
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
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
f2b0db5a1c
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
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
631f6ed406
Merge branch 'joystick-juggling' into 'master'
...
Joystick juggling
See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
0a00a0cebb
Revert "Add player taunt functions to Lua"
...
This reverts commit 09e9e2ba4d
2018-12-04 11:39:45 -05:00
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
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
60feae1014
Update OSX icon
2018-12-03 23:09:54 -05:00
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
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
09e9e2ba4d
Add player taunt functions to Lua
...
People have REALLY wanted these for their scripts
2018-12-03 20:28:07 -05:00
188c0164b6
Buff item hitbox size
...
I was gonna hold off for v2 to do this, but frankly... this is too good to have. Honestly I think this is a big buff for karma items... people unable to hit as bombs will have a LOT less trouble as item.
2018-12-03 17:30:27 -05:00
fbb2cde800
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
168647275c
One small change
2018-12-03 13:32:24 -05:00
6ca1130551
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
205e52f6d4
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -05:00
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
6730c6c765
Menu for joy first/third person vertical look
2018-12-03 13:10:49 -05:00
ed57d0d9f9
Add Joy2 for network abort
2018-12-03 13:10:47 -05:00
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
7e523a1e35
Reset vertical look when toggling joyaiming
2018-12-03 13:10:24 -05:00
0bb113130b
Add alwaysfreelook to joystick menu
2018-12-03 13:10:20 -05:00
59cabea8bd
Add joyaiming qualifier for joystick look up/down
2018-12-03 13:10:19 -05:00
3134d72c12
Preserve event ch for other responders
2018-12-03 13:10:18 -05:00
6bf31492b7
Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)
2018-12-03 13:10:16 -05:00
6dd44ca1de
Change PC axis defaults to 360-friendly values
2018-12-03 13:10:15 -05:00
78dde93f3e
Remap menu actions to better joy keys
2018-12-03 13:10:12 -05:00
06faf6ffe4
Unneeded input header in st_stuff
2018-12-03 12:36:42 -05:00
8851f39b84
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
6c78af3542
Missed (unused?) viewpoint strings
2018-12-03 12:20:19 -05:00
3d8bc85494
Forgot config strings for menu keys
2018-12-03 12:19:41 -05:00
5314c0e36b
Make F12 spectator string constant because of wrapping issues
2018-12-03 12:13:36 -05:00
60b16289e5
Change spectator string for "Press F12 to watch"
2018-12-03 12:11:03 -05:00
31f23fda8d
Add gc_viewpoint from Kart
2018-12-03 11:50:57 -05:00
2a87093ece
Add gc_screenshot and gc_recordgif from Kart
2018-12-03 11:31:48 -05:00
8e190932e7
Add gc_systemmenu from Kart
2018-12-03 11:21:25 -05:00
d8e70c32e0
Remove console messages for joynames
2018-12-03 05:39:10 -05:00
19d19543b7
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
919667ed39
Just do MapChange hook on G_InitNew
...
Everything that's supposed to call it also calls this...
2018-12-03 00:33:35 -05:00
aa16edec1d
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 00:31:23 -05:00
9659369ae1
Update the patch.kart hash. Again.
2018-12-03 00:21:11 -05:00
3ec0afc09d
AXISBRAKE, take out GameController stuff for now
2018-12-02 19:33:09 -06:00
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
13b0e9c3c5
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
10832db244
Merge branch 'next' into lua_mapchange
2018-12-02 20:54:32 +00:00
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
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
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
e12890c84e
s
2018-12-02 09:08:05 -06:00
2af04203ea
Fix a dumb mistake
2018-12-02 08:57:35 -06:00
d1a0df09a5
Merge remote-tracking branch 'remotes/origin/master' into unfuck-gamepads
2018-12-02 02:01:51 -06:00
aba7711c39
Potentially fix spectators floating when inputting right on the analog stick.
2018-12-02 02:01:06 -06:00
d9fa45d850
Back to numstarposts/2
2018-12-02 02:29:47 -05:00
Digiku