vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5258 commits 50 branches 7 tags 75 MiB
Commit graph

4415 commits

Author SHA1 Message Date
MPC 9d93f54b67 bland 2018-12-20 18:52:51 -03:00
mazmazz 0519d8c52d Update CMake paths for Windows DLLs 2018-12-20 16:46:40 -05:00
mazmazz fe5001a38a Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu 2018-12-20 16:40:59 -05:00
mazmazz b57204fc12 Fix 2p control menu graying out 2018-12-20 16:38:58 -05:00
mazmazz 6f8b126586 Add G_FilterKeyByVersion() to setcontrol 2018-12-20 16:30:37 -05:00
MPC fcb65951b8 change implementation of square root 2018-12-20 17:37:06 -03:00
Jimita 5b285a60a2
Update r_segs.c 2018-12-20 16:15:19 -03:00
Jimita ffd5061531
Merge branch 'next' into sw_largeroomfix 2018-12-20 16:56:05 -02:00
Monster Iestyn 76fe78571e fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic 2018-12-20 16:47:17 +00:00
Monster Iestyn dfbbab35f4 Merge branch 'master' into next 2018-12-20 16:41:21 +00:00
mazmazz e2b8ff26db Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua 2018-12-20 10:56:36 -05:00
Digiku 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
mazmazz 71da6836c0 Reset default controls for LOADCONFIG command 2018-12-20 10:13:43 -05:00
mazmazz 04916edc07 Update EXECVERSION to MODVERSION 27 2018-12-20 04:03:35 -05:00
mazmazz 9d212b340b Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
Digiku 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
mazmazz 7f8d16d3cd Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
mazmazz 60bcf92525 Adjust execversion retrieval in CV_FilterVarByVersion 2018-12-20 02:18:59 -05:00
mazmazz 969960a1eb Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro 2018-12-20 02:18:11 -05:00
mazmazz ed7178bca4 Assign joy button defaults for 1 and 2 player 2018-12-20 01:47:35 -05:00
Digiku 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
mazmazz 78501dcd0c Comment out stray PK3 blockmap message 2018-12-20 01:11:07 -05:00
Digiku 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
wolfy852 2a0e6937a0 Extend joystick hotplugging to players 3 and 4 2018-12-19 18:08:38 -06:00
wolfy852 fc3578c592 Revert GameController stuff 2018-12-19 13:11:30 -06:00
Alam Ed Arias e5e978f8bd Merge branch 'master' into next 2018-12-19 13:20:54 -05:00
Digiku 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
Digiku 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
Digiku 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
Latapostrophe 387173ea89 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-19 16:50:49 +01:00
Latapostrophe a31b85e124 Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
mazmazz 96cad09db6 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus 67cd6dcdd2 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
toaster bab444e42c woops, kicks are player-based, aren't they 2018-12-18 20:13:11 +00:00
TehRealSalt 42a9e66883 Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication. 2018-12-18 15:03:54 -05:00
TehRealSalt 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
toaster 0aabcd2503 lj dm'd me so here's a second, more sensible crack at it 2018-12-18 19:40:38 +00:00
Alam Arias b62e6ee909
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 14:11:43 -05:00
Alam Ed Arias d5c7ca1d23 Merge branch 'master' into next 2018-12-18 14:05:07 -05:00
Alam Arias 056cfe71a4
Merge pull request #373 from monster-psychic-cat/sw_planefixes 
Software plane fixes
 2018-12-18 14:02:21 -05:00
Alam Arias afecb2fc85
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 13:57:48 -05:00
toaster 99e50250cf Move some sidemove/forwardmove checks to playsim code rather than have them happen in ticcmd generation. 
pGetPlayerControlDirection has to die since it was the only other usage of sidemove, and wasn't even relevant anymore anyways.
 2018-12-18 18:05:11 +00:00
TehRealSalt 03a4bd8f53 Revert default changes 
Digiku said they'd handle the new button defaults so \m/
 2018-12-18 12:55:05 -05:00
Latapostrophe 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
mazmazz 1fcf607b41 Fix strncpy nodenum length overflow 2018-12-17 21:31:00 -05:00
mazmazz 876ddd48f1 Change int to INT32 2018-12-17 19:09:05 -05:00
mazmazz bf21b7c483 Mixed D&C fixes for HU_DrawTeamTabRankings 2018-12-17 19:03:09 -05:00
mazmazz 7a92c9d3d0 Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
mazmazz 245a125551 Fix compile errors 2018-12-17 18:55:21 -05:00
Monster Iestyn 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
MPC ca4329bcb6 fix the fucking warning 2018-12-17 18:09:29 -03:00
MPC 82601e881b fix my fucking code 2018-12-17 17:57:53 -03:00
Latapostrophe 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
Latapostrophe ff957baae3 Don't overlap ringslinger HUD 2018-12-17 21:31:31 +01:00
Jimita 1d40676f3a
Merge branch 'master' into automap_fix 2018-12-17 17:46:29 -02:00
Jimita 3329c10b60
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-17 17:46:17 -02:00
Jimita f3956ffb4c
Merge branch 'master' into sw_planefixes 2018-12-17 17:45:36 -02:00
Latapostrophe 45aba493c7 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
mazmazz b64dd82034 Attempt to fix cv_execversion being accessible by console 2018-12-17 13:39:24 -05:00
mazmazz 657e7321f6 Decouple execversion from MODVERSION; add scheme for MINORMODVERSION 2018-12-17 13:38:23 -05:00
Jimita 362fb491f7
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-17 15:40:20 -02:00
Monster Iestyn e9be5e895e Merge branch 'master' into next 2018-12-17 17:34:41 +00:00
mazmazz b958f00f17 Better rewrite for addons draw adjustment 2018-12-17 10:59:27 -05:00
TehRealSalt bef3bb23f8 Undo dc92bb49 2018-12-16 21:36:54 -05:00
TehRealSalt 97639848e1 Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport 2018-12-16 21:22:06 -05:00
TehRealSalt 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
mazmazz 6dbe930997 Use labs for long value 2018-12-16 19:47:02 -05:00
mazmazz 2d2bd59099 Remove FIXUPO0 GCC pragma 2018-12-16 19:39:16 -05:00
mazmazz 296b678d7e Wstrict-overflow adjustment 2018-12-16 19:38:46 -05:00
TehRealSalt ec53e12294 Foolish 2018-12-16 18:19:53 -05:00
TehRealSalt 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
Alam Ed Arias 14e98df69b Revert "Merge branch 'kart-luatextures-backport' into 'next'" 
This reverts merge request !387
 2018-12-16 22:57:39 +00:00
TehRealSalt 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
Monster Iestyn 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
mazmazz 1b7a9aaa01 2.1 Score/Time/Rings lump name 2018-12-16 16:53:13 -05:00
mazmazz 899120e475 Revert NMUSlist to original 2.1 2018-12-16 16:42:57 -05:00
mazmazz d7321fd8c4 Pull expanded NMUSlist from 2.2 2018-12-16 16:40:40 -05:00
mazmazz 046d36a657 Remove Kart entries from NMUSlist 2018-12-16 16:08:31 -05:00
mazmazz 6d94568f4b Hide kart-specific addons behavior behind USE_KART 2018-12-16 16:07:47 -05:00
TehRealSalt cc22ef3f05 Add deprecation warning to admin 2018-12-16 16:05:18 -05:00
TehRealSalt 4ba23e1028 Expose R_TextureNumForName 
Backport from SRB2Kart
 2018-12-16 15:58:47 -05:00
mazmazz c3ff0b6d16 Uncomment Secrets menu toggle when exiting Addons 2018-12-16 15:52:01 -05:00
Alam Ed Arias 6e79722437 Fix float-equal warning in Win32 interface 2018-12-16 14:01:28 -05:00
Alam Ed Arias 11aef0b3f1 Merge branch 'master' into float_equal 2018-12-16 13:52:45 -05:00
Latapostrophe 25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
mazmazz 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
mazmazz 37950341ec Merge remote-tracking branch 'public-gitlab/next' into addons-backport 2018-12-15 20:52:46 -05:00
mazmazz 0a3b3736bf Handle Kart-specific changes; add PK3 to exttable 2018-12-15 20:50:33 -05:00
mazmazz b32f50648d Merge branch 'addons_menu' into 'master' 
Addons menu

See merge request KartKrew/Kart!8
 2018-12-15 20:46:42 -05:00
Alam Ed Arias 15d0673685 fix compiling for clang 2018-12-14 21:31:37 -05:00
Alam Ed Arias 78634679f1 fix compiling for MSVC 2018-12-14 20:42:37 -05:00
Alam Ed Arias 6fd66bdb49 Clear float equal warnings 2018-12-14 20:34:06 -05:00
Monster Iestyn f4ce770c1c try out using offsetof for these three macros in d_clisrv.h 2018-12-14 23:56:11 +00:00
Monster Iestyn e0079ea1a2 remove NearVertice (which was unused anyway), clean up maz's changes 2018-12-14 23:28:07 +00:00
mazmazz de96fe8e7b Revert "compiler SSE tweak for 32-bit" 
This reverts commit 09d9a555c6.
 2018-12-14 16:47:38 -05:00
mazmazz abae63a64b SameVertice floating point match; fixes 64-bit OGL holes 2018-12-14 16:47:24 -05:00
mazmazz 66efc7ea7f Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup 2018-12-14 16:23:42 -05:00
Monster Iestyn c1e0041a0b copy doom legacy's replacement for the den == 0.0 calc in fracdivline 2018-12-14 21:22:13 +00:00
mazmazz 09d9a555c6 compiler SSE tweak for 32-bit 2018-12-14 16:21:07 -05:00
Monster Iestyn 623d1574ce minor cleanup 2018-12-14 21:00:53 +00:00
MPC 9c04a066d9 Update r_plane.h 2018-12-14 15:49:32 -03:00
wolfy852 f876a59ad2 I_NumGameControllers, print GameController mapping, and store joystick GUID in JoyInfo 2018-12-14 12:49:07 -06:00
Monster Iestyn b42c306ef3 remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway 2018-12-14 18:14:08 +00:00
Monster Iestyn 52fd3dcbed split loading status code into a separate function 2018-12-14 18:11:30 +00:00
Monster Iestyn 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
Monster Iestyn 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
wolfy852 ca2475ac3e Print GameController info when detected, use proper 360 controller defaults for triggers 2018-12-14 11:50:53 -06:00
Monster Iestyn 3a125dbbd5 compare with actual doubles, not ints 2018-12-14 17:14:03 +00:00
Jimita cf792ef4f3
Merge branch 'master' into the_second_remote_view_camera_fix 2018-12-14 15:09:24 -02:00
MPC 9c2197db17 Software plane fixes 2018-12-14 14:08:25 -03:00
Jimita d70dbada1c
Merge branch 'master' into automap_fix 2018-12-14 15:07:53 -02:00
mazmazz c49a5ed8d2 Better I_InitJoystick log message 2018-12-14 06:14:21 -05:00
mazmazz d094a70ec3 Allow use_joystick/2 to be saved once again 2018-12-14 06:07:20 -05:00
mazmazz fa63ddda86 Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick 2018-12-14 06:05:31 -05:00
mazmazz 70d6845d6c Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously 2018-12-14 05:57:10 -05:00
mazmazz b2c02838c4 Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys() 2018-12-14 05:31:47 -05:00
mazmazz e548f6f139 Don't override an already-active controller 
* Menu improvements to tell the user that they can't set a controller if it's already active
 2018-12-14 05:02:41 -05:00
mazmazz 3b6de810e1 Lots of changes to better support hotplugging and unstable device indexes 
* Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run
* Properly set cv_usejoystick/2 for menu toggling
* Force-disable a player's joystick if setting another player's joystick to the same device
* Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
 2018-12-14 03:58:07 -05:00
mazmazz 6b9fe87b60 Properly handle unstable device indexes for hotplug 2018-12-14 01:45:18 -05:00
mazmazz 44d6a1d236 Attempt to handle unstable device IDs 2018-12-14 00:22:25 -05:00
mazmazz 216e710b87 Improve hotplug edge case with changing device indexes; return proper joy_open output on error 2018-12-13 23:52:04 -05:00
mazmazz 14cde2d227 Change joystick log messages to DBG_GAMELOGIC 2018-12-13 23:26:07 -05:00
mazmazz e81f05c496 Handle unstable device index when hotplugging controller 2018-12-13 23:09:05 -05:00
mazmazz bcd747c1cd Adjust SDL_JOYDEVICEREMOVED handler by checking the player's joy device explicitly 2018-12-13 22:26:13 -05:00
mazmazz a3063ce89f Merge tag 'SRB2_release_2.1.21' into vanilla-hotplug 2018-12-13 22:16:48 -05:00
Monster Iestyn ef6533fb83 Merge branch 'master' into next 2018-12-13 22:21:31 +00:00
Monster Iestyn 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
mazmazz dc7992a815 R_Char2Frame special case for backslash: accept plus as substitute 2018-12-13 14:59:12 -05:00
mazmazz d18b2cda59 Apply srb2home to saveconfig ONLY if srb2home isn't already there 2018-12-13 13:32:38 -05:00
mazmazz 93f7f0a8df Apply srb2home to debugfile 2018-12-13 13:23:09 -05:00
mazmazz b1641aa8e9 Apply srb2home to SAVECONFIG 2018-12-13 13:17:56 -05:00
mazmazz 93eda4e7c9 EXEC: Search for CFG by file path 2018-12-13 13:11:25 -05:00
mazmazz b84470ec51 Fix savegamename being improperly built due to missing null char after copying timeattackfolder 2018-12-13 12:01:07 -05:00
SeventhSentinel 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
SeventhSentinel 6d19be6412 Make SPB follow the same rules too 2018-12-13 09:34:27 -05:00
SeventhSentinel 2422501ab9 Add a mapobjectscale global 
Should be no different than it was before, now it's just less tedious to type :V
 2018-12-12 21:55:59 -05:00
SeventhSentinel 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
Jimita e628d98f20
Update am_map.c 2018-12-12 19:59:21 -02:00
Jimita a5874019cb
Update am_map.c 2018-12-12 19:57:52 -02:00
MPC 649b6c9ca1 Remove MINIAUTOMAP code 2018-12-12 18:53:13 -03:00
MPC 6b22dc183b Fix the automap 2018-12-12 18:01:52 -03:00
Jimita 966afb6017
Update p_user.c 2018-12-12 13:09:47 -02:00
MPC c68875ad93 Fix remote viewpoint cameras for real 
I'm so sorry
 2018-12-11 20:48:45 -03:00
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
wolfy852 2927812ec4 Restore a change lost in the merge madness, do some SDL_GameController prep 2018-12-10 09:00:15 -06:00
MPC 348ed1e43f Large room fix 2018-12-09 19:34:17 -03: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
wolfy852 5fe81afeaa Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug' into unfuck-gamepads 
# Conflicts:
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/doomdef.h
#	src/g_game.c
#	src/hu_stuff.c
#	src/lua_baselib.c
#	src/m_menu.c
#	src/sdl/i_system.c
#	src/sdl/sdlmain.h
 2018-12-06 13:07:39 -06:00
mazmazz 60afce5771 Disable XINPUT before initing the joy subsystem 2018-12-06 14:03:46 -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 6694b7d679 Controller hotplugging by always keeping joy subsystem on (thanks WOLFS) 
(with log messages)
 2018-12-06 10:54:58 -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
TehRealSalt 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
TehRealSalt 9bafdaf492 > 2 
Same here
 2018-12-05 22:54:06 -05:00
TehRealSalt 0bd0240464 < -2 
I doubt this hurts anything, but might as well I guess
 2018-12-05 22:53:34 -05:00
TehRealSalt c2dfc1155f Set Shrink timer, don't add to it 2018-12-05 22:51:08 -05:00
TehRealSalt 101feb9498 Add Miku's author to credits. 2018-12-05 21:58:26 -05:00
Sal 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
TehRealSalt 97f2f858ad Give lap animation V_SNAPTOTOP as intended 2018-12-05 21:39:34 -05:00
TehRealSalt 116b10c29d Comment out M_DrawSaveLoadBorder 2018-12-05 21:27:51 -05:00
TehRealSalt d0180ecb15 Cut this down slightly 2018-12-05 20:54:58 -05:00
TehRealSalt d53e4af93a Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-05 20:46:48 -05:00
TehRealSalt 7ab098636b Edited even more things to say "SRB2Kart" 2018-12-05 20:40:58 -05:00
TehRealSalt df191639bd Merge remote-tracking branch 'srb2public/master' into merge-next 2018-12-05 19:21:13 -05:00
TehRealSalt b3b5b3f81d Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out. 2018-12-05 19:09:05 -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
TehRealSalt 0a00a0cebb Revert "Add player taunt functions to Lua" 
This reverts commit 09e9e2ba4d.
 2018-12-04 11:39:45 -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
TehRealSalt 09e9e2ba4d Add player taunt functions to Lua 
People have REALLY wanted these for their scripts
 2018-12-03 20:28:07 -05:00
TehRealSalt 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
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
TehRealSalt 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
TehRealSalt aa16edec1d Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-03 00:31:23 -05:00
TehRealSalt 9659369ae1 Update the patch.kart hash. Again. 2018-12-03 00:21:11 -05:00
wolfy852 3ec0afc09d AXISBRAKE, take out GameController stuff for now 2018-12-02 19:33:09 -06: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
wolfy852 d1a0df09a5 Merge remote-tracking branch 'remotes/origin/master' into unfuck-gamepads 2018-12-02 02:01:51 -06:00
wolfy852 aba7711c39 Potentially fix spectators floating when inputting right on the analog stick. 2018-12-02 02:01:06 -06:00
TehRealSalt d9fa45d850 Back to numstarposts/2 2018-12-02 02:29:47 -05:00
TehRealSalt d125f7cc2d Wrong color for UFO fireworks 2018-12-01 23:08:42 -05:00
TehRealSalt 15b05f6e75 Fireworks carry momentum, UFOs spawn fireworks 2018-12-01 20:48:19 -05:00
Steel Titanium 0f11116e7b Fix up controller menu support 2018-12-01 20:13:14 -05:00
TehRealSalt ac64290cc7 Forgotten include 2018-11-30 17:07:30 -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
TehRealSalt 5d8a63da64 Add TC_ to dehacked 2018-11-30 03:43:16 -05:00
TehRealSalt d3ecdeb364 Do 800 instead 2018-11-30 03:36:44 -05:00
TehRealSalt 9598995150 Un-nerf Mines on activation tic 2018-11-30 03:09:49 -05:00
TehRealSalt b7ff6d56d2 Colormap crash fix 2018-11-30 03:09:01 -05:00
TehRealSalt f2a87356d0 Update GPL notice 2018-11-30 00:15:14 -05:00
TehRealSalt aa9b36ac04 Fix this memory freeing 2018-11-29 22:31:20 -05: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
Sal ce14755156 Merge branch 'rename-cmds' into 'master' 
Rename "giveadmin" and "removeadmin" to "promote" and "demote"

See merge request KartKrew/Kart!117
 2018-11-29 11:18:57 -05:00
TehRealSalt 4cfaf746bb Reimplement png warning 2018-11-29 11:16:40 -05:00
TehRealSalt d9654bcc1a Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 10:26:38 -05:00
TehRealSalt 6bdbc45ffe Enable pk3 in addons menu 2018-11-29 10:07:53 -05:00
TehRealSalt 46571fbda2 Fixes to merge process 2018-11-29 10:07:35 -05:00
TehRealSalt 936bd43266 Merge branch 'master' into merge-next 2018-11-29 09:46:46 -05: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 f2072b973b Rename "giveadmin" and "removeadmin" to "promote" and "demote" 2018-11-29 07:58:26 -06:00
TehRealSalt 5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05: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
Sal aa56911b2e Merge branch 'version-prep' into 'master' 
Update version to v1.0.2

See merge request KartKrew/Kart!111
 2018-11-29 08:05:24 -05:00
TehRealSalt 7ed6fb8483 Update patch.kart hash 2018-11-29 08:04:41 -05:00
TehRealSalt a32b3bf07b Remove in death pits 2018-11-29 07:50:58 -05:00
TehRealSalt be4fb2bcfb Set indirectitemcooldown for SPB/Shrink drops 2018-11-29 07:49:34 -05:00
Wolfy b8ce51bff2 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06:00
Sal e88dbedbc4 Merge branch 'mobjdamage-hook' into 'master' 
Lua "damage" hooks

See merge request KartKrew/Kart!115
 2018-11-29 07:16:22 -05:00
TehRealSalt 5f3abae81b Merge branch 'possibly-better-turn' 2018-11-29 07:13:24 -05:00
TehRealSalt 1a4648b6e9 Update credits for bonuschars 2018-11-29 06:54:36 -05:00
TehRealSalt 97f0dc3875 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-29 05:36:45 -05:00
TehRealSalt 2789e76683 ...Welp, I mixed up my commit names :V 
THIS commit's the MT_FIREDITEM fix, the LAST commit was me making sure the size of translationtablecache was correct.
 2018-11-29 05:36:40 -05:00
TehRealSalt 576617ec71 MT_FIREDITEM crash fix 2018-11-29 05:34:57 -05:00
Latapostrophe 54a7e65ff6 Moved (void)inflictor;s below and put scoremultiply at the top of all the damage funcs 2018-11-28 19:50:30 +01:00
Latapostrophe 5660e3fccd Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s 2018-11-28 19:41:01 +01:00
Sal 8cfa05471f Merge branch 'sectionspawn' into 'master' 
Respawn on intermediate finish line + cap numlaps cvar in sectionraces

See merge request KartKrew/Kart!113
 2018-11-28 13:16:37 -05:00
toaster 0133bf275a Definitively fix the MS thinking that Battle servers are playing on Tag, and KEEP it that way even when we exceed 2.1's version number eventually... 2018-11-28 17:37:36 +00:00
toaster 2c8855cd5f Upper-bound restrict the setting of numlaps for sectionrace levels mid-game 2018-11-28 16:45:45 +00:00
toaster d8955f1f87 LF_SECTIONRACE now has a secondary function! 
* Sets the player respawn coords on the finish line, so dying in the short interval between crossing an intermediate finish line and hitting a checkpoint doesn't send you all the way back to the beginning.
 2018-11-28 16:33:52 +00:00
TehRealSalt 79359a3672 Multiply turn values by realtics 2018-11-28 03:10:36 -05:00
TehRealSalt ecba6a0cb4 Nerf activation range of Mines, keep explosion radius 2018-11-28 02:31:16 -05:00
TehRealSalt 7b475d0f91 Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua 2018-11-28 00:45:33 -05:00
Sal 29410bb93d Merge branch 'stricter-checkpoints' into 'master' 
Require 3/5ths of checkpoints instead of 1/2 for a lap

See merge request KartKrew/Kart!112
 2018-11-27 19:18:43 -05:00
TehRealSalt 3206ce716f I like working on Kart... 2018-11-27 19:00:48 -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
TehRealSalt e2a9aeb34c Require 3/5ths of checkpoints instead of 1/2 
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
 2018-11-27 14:28:11 -05:00
Sal 28488cc0dc Merge branch 'netcode-vars-strict' into 'master' 
Make netcode var defaults stricter, add Advanced Server Options

See merge request KartKrew/Kart!110
 2018-11-27 12:27:47 -05:00
Latapostrophe ed4477705d Separated the damage hooks into multiple more precise hooks for players. 2018-11-27 18:27:43 +01:00
Sal a2ab230bfa Merge branch '102-gameplay' into 'master' 
v1.0.2 gameplay

See merge request KartKrew/Kart!107
 2018-11-27 12:25:37 -05:00
Sal cc8af2acdb Merge branch 'better-buffering' into 'master' 
Better vote level buffering

See merge request KartKrew/Kart!109
 2018-11-27 12:25:02 -05:00
Sal 59f59c8042 Merge branch 'rotate-the-md2' into 'master' 
Rotate the MD2

See merge request KartKrew/Kart!108
 2018-11-27 12:23:48 -05:00
TehRealSalt f0b042a4b6 Advanced Server Options menu 
More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
 2018-11-27 12:10:46 -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
TehRealSalt 969801ef09 SEVERELY nerf jointimeout & resynchattempts, too 
All of these previous defaults are "this is an insane time to reach, by that point you might as well disconnect"
 2018-11-27 11:23:28 -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
TehRealSalt 92225748e5 Fix order so the new sound can actually play 2018-11-26 23:34:43 -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 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
Sryder ab5dc3226b Revert change to P_SlopeLaunch 
Don't call slopelaunch just from object z difference if the slope has no physics.
 2018-11-26 23:10:24 +00: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
Latapostrophe ec279da272 classic lat forgot whitespaces meme 2018-11-26 21:24:57 +01:00
Latapostrophe 0175e5b6a5 Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players. 2018-11-26 21:23:41 +01:00
MonsterIestyn b53cd70201
Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00:00
TehRealSalt 732e0447a5 Merge branch 'master' into 102-gameplay 2018-11-26 10:14:41 -05:00
TehRealSalt 38ebc4d838 Update version to v1.0.2 2018-11-26 09:34:15 -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
Sal fcba636616 Merge branch 'deadtweaks' into 'master' 
Update HUD anim counters when dead.

Closes #49

See merge request KartKrew/Kart!106
 2018-11-26 08:03:17 -05:00
Sal 159d8040b8 Merge branch 'sounddistfix' into 'master' 
Sound volume distance indication now scales with mapheader scale.

See merge request KartKrew/Kart!105
 2018-11-26 08:02:26 -05:00
TehRealSalt 1c907667fc Slow down animation 2018-11-26 07:43:05 -05:00
TehRealSalt 4ad32b23d9 Find bestrank for 7 sec limit enforcement 2018-11-26 07:18:21 -05:00
TehRealSalt 5dbd747237 Flush map buffer early, again 
Now it's directly in G_AddMapToBuffer
 2018-11-26 06:09:26 -05:00
TehRealSalt 4bd6ae3f04 Calculate buffer size manually 
(Yes, I checked; this always outputs "3" for its current usage.)
 2018-11-26 05:09:56 -05:00
TehRealSalt 494fa55390 Accidental removal 2018-11-26 04:42:14 -05:00
TehRealSalt e59a675eb3 Mistakes 2018-11-26 04:28:39 -05:00
TehRealSalt 478f895ea0 Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap 
I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V

(Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
 2018-11-26 04:27:31 -05:00
TehRealSalt 62b9754407 This sound doesn't exist yet, but I'm defining it anyway 2018-11-26 03:19:31 -05:00
TehRealSalt 2a573c2072 Merge branch 'master' into 102-gameplay 2018-11-26 03:13:17 -05:00
TehRealSalt ba28f1c65f Add confirmation to reset controls 2018-11-26 03:12:22 -05:00
TehRealSalt b5bf8e09c3 Karma fireworks 
Additionally:
- FZ boom no longer has that weird smoke bit before it spawns the smoke column
- Item blinking color is brighter
 2018-11-26 02:17:14 -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
TehRealSalt b68a58d5b2 Make sure spbplace is set better during SEEKING 2018-11-25 20:24:47 -05:00
TehRealSalt e82c7cb230 Make the WAIT phase work better with SPB rush 2018-11-25 20:23:09 -05:00
TehRealSalt 0f1206af6f Shrink no longer causes old-style wipeout, getting squished reduces the timer on it. 
Maybe this might help some of the desyncing, too! Mainly done for gameplay reasons, though :p
 2018-11-25 20:14:01 -05:00
Sryder 683ebec120 Rotate All MD2s to match their standing slopes 
Needs to be tested in gravity flip
Also flips the normal on linedef based slopes so that it's facing the correct direction
Also makes it so slopelaunch doesn't always remove the standingslope (going down some slopes would cause it to be constantly unset and reset)
 2018-11-26 00:17:34 +00:00
Monster Iestyn 1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
Steel Titanium 7d4c9dda91 Add newline to end of file 2018-11-25 14:24:50 -05:00
Steel Titanium 981a1192fb Save sound toggles to config 2018-11-25 14:22:52 -05:00
Monster Iestyn aaabf062b8 Merge branch 'ms-cvars-fix' into 'master' 
Update server name insantly

See merge request STJr/SRB2!344
 2018-11-25 14:04:12 -05:00
Monster Iestyn 5069acb110 Merge branch 'mpc-software-yslope-fix' into 'master' 
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)

See merge request STJr/SRB2!282
 2018-11-25 11:51:54 -05:00
Monster Iestyn 028236006b Merge branch '21-copyright-followup' into 'master' 
Print copyright notice in stdout console on program start

See merge request STJr/SRB2!347
 2018-11-25 11:07:34 -05:00
Monster Iestyn 8b4a64ac05 Merge branch 'last-min-cleanup' into 'master' 
Last min cleanup

See merge request STJr/SRB2!342
 2018-11-25 10:14:34 -05:00
Monster Iestyn 11cb2e05ba Merge branch 'cmake-use-internal-libs' into 'master' 
CMake: Use internal libs.

See merge request STJr/SRB2!325
 2018-11-25 09:33:50 -05:00
Monster Iestyn 85305791d8 Merge branch 'objectplace-skybox-fix' into 'next' 
Objectplace skybox fix.

See merge request STJr/SRB2!319
 2018-11-25 09:30:16 -05:00
toaster 3c480277aa Update HUD anim counters when dead. 
* Split out the HUD-related counters from K_KartPlayerThink() into their own function.
* Called this function in P_DeathThink().
 2018-11-25 13:48:46 +00:00