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
d125f7cc2d
Wrong color for UFO fireworks
2018-12-01 23:08:42 -05:00
15b05f6e75
Fireworks carry momentum, UFOs spawn fireworks
2018-12-01 20:48:19 -05:00
0f11116e7b
Fix up controller menu support
2018-12-01 20:13:14 -05:00
ac64290cc7
Forgotten include
2018-11-30 17:07:30 -05:00
11cb163435
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
6d7689c1a7
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
54cae84849
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
e0a1c43813
Free lump names *before* either lumpinfo or the WAD itself!
2018-11-30 14:19:47 +00:00
5d8a63da64
Add TC_ to dehacked
2018-11-30 03:43:16 -05:00
d3ecdeb364
Do 800 instead
2018-11-30 03:36:44 -05:00
9598995150
Un-nerf Mines on activation tic
2018-11-30 03:09:49 -05:00
b7ff6d56d2
Colormap crash fix
2018-11-30 03:09:01 -05:00
f2a87356d0
Update GPL notice
2018-11-30 00:15:14 -05:00
aa9b36ac04
Fix this memory freeing
2018-11-29 22:31:20 -05:00
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
c5e8e0badb
Merge branch 'master' into tiny-makefile-fix
2018-11-29 21:57:47 +00:00
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
4cfaf746bb
Reimplement png warning
2018-11-29 11:16:40 -05:00
d9654bcc1a
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 10:26:38 -05:00
6bdbc45ffe
Enable pk3 in addons menu
2018-11-29 10:07:53 -05:00
46571fbda2
Fixes to merge process
2018-11-29 10:07:35 -05:00
936bd43266
Merge branch 'master' into merge-next
2018-11-29 09:46:46 -05:00
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
f2072b973b
Rename "giveadmin" and "removeadmin" to "promote" and "demote"
2018-11-29 07:58:26 -06:00
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
c517862f7e
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
d294be2054
Fix a quick merge mistake.
2018-11-29 07:15:54 -06:00
c70cf5908d
IsPlayerAdmin support, since admin was removed
...
# Conflicts:
# src/lua_baselib.c
2018-11-29 07:12:15 -06:00
b59718d3ad
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
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
7ed6fb8483
Update patch.kart hash
2018-11-29 08:04:41 -05:00
a32b3bf07b
Remove in death pits
2018-11-29 07:50:58 -05:00
be4fb2bcfb
Set indirectitemcooldown for SPB/Shrink drops
2018-11-29 07:49:34 -05:00
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
e88dbedbc4
Merge branch 'mobjdamage-hook' into 'master'
...
Lua "damage" hooks
See merge request KartKrew/Kart!115
2018-11-29 07:16:22 -05:00
5f3abae81b
Merge branch 'possibly-better-turn'
2018-11-29 07:13:24 -05:00
1a4648b6e9
Update credits for bonuschars
2018-11-29 06:54:36 -05:00
97f0dc3875
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-29 05:36:45 -05:00
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
576617ec71
MT_FIREDITEM crash fix
2018-11-29 05:34:57 -05:00
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
5660e3fccd
Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s
2018-11-28 19:41:01 +01:00
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
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
2c8855cd5f
Upper-bound restrict the setting of numlaps for sectionrace levels mid-game
2018-11-28 16:45:45 +00:00
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
79359a3672
Multiply turn values by realtics
2018-11-28 03:10:36 -05:00
ecba6a0cb4
Nerf activation range of Mines, keep explosion radius
2018-11-28 02:31:16 -05:00
7b475d0f91
Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua
2018-11-28 00:45:33 -05:00
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
3206ce716f
I like working on Kart...
2018-11-27 19:00:48 -05:00
e158206e55
backport string len tweaks I made to LUA_LoadLump in internal
2018-11-27 23:06:31 +00:00
cb53bc8afe
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
2018-11-27 23:05:33 +00:00
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
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
ed4477705d
Separated the damage hooks into multiple more precise hooks for players.
2018-11-27 18:27:43 +01:00
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
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
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
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
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
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
3e6388c183
use UINT8 * instead of void or Bytef *
2018-11-27 15:49:41 +00:00
6e839d30a2
Merge branch 'master' into next
2018-11-27 15:31:28 +00:00
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
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
92225748e5
Fix order so the new sound can actually play
2018-11-26 23:34:43 -05:00
b7f7c2ecf7
PK3: fixup support for newer version of zlib
2018-11-26 20:08:26 -05:00
9a042cd5e2
Merge branch 'master' into next
2018-11-26 19:49:19 -05:00
78a1931bdf
Makefile: disable implicit-fallthroug warnings
2018-11-26 19:38:14 -05:00
5a3f469593
Makefile: skip implicit-fallthroug warnings
2018-11-26 19:28:55 -05:00
ac2ec6c982
Makefile: disable some warnings for GCC 8.x
2018-11-26 19:01:40 -05:00
4e332b3848
Fix MSVC build
2018-11-26 18:27:07 -05:00
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
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
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
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
ec279da272
classic lat forgot whitespaces meme
2018-11-26 21:24:57 +01:00
0175e5b6a5
Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players.
2018-11-26 21:23:41 +01:00
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
732e0447a5
Merge branch 'master' into 102-gameplay
2018-11-26 10:14:41 -05:00
38ebc4d838
Update version to v1.0.2
2018-11-26 09:34:15 -05:00
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
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
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
1c907667fc
Slow down animation
2018-11-26 07:43:05 -05:00
4ad32b23d9
Find bestrank for 7 sec limit enforcement
2018-11-26 07:18:21 -05:00
5dbd747237
Flush map buffer early, again
...
Now it's directly in G_AddMapToBuffer
2018-11-26 06:09:26 -05:00
4bd6ae3f04
Calculate buffer size manually
...
(Yes, I checked; this always outputs "3" for its current usage.)
2018-11-26 05:09:56 -05:00
494fa55390
Accidental removal
2018-11-26 04:42:14 -05:00
e59a675eb3
Mistakes
2018-11-26 04:28:39 -05:00
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
62b9754407
This sound doesn't exist yet, but I'm defining it anyway
2018-11-26 03:19:31 -05:00
2a573c2072
Merge branch 'master' into 102-gameplay
2018-11-26 03:13:17 -05:00
ba28f1c65f
Add confirmation to reset controls
2018-11-26 03:12:22 -05:00
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
ba111d42ca
Last minute changes.
2018-11-26 00:24:11 -05:00
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
930835f1a2
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
b68a58d5b2
Make sure spbplace is set better during SEEKING
2018-11-25 20:24:47 -05:00
e82c7cb230
Make the WAIT phase work better with SPB rush
2018-11-25 20:23:09 -05:00
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
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
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
7d4c9dda91
Add newline to end of file
2018-11-25 14:24:50 -05:00
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
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
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
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
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
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
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
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
e5fef95d94
Sound volume distance indication now scales with mapheader scale.
2018-11-25 13:30:43 +00:00
e4d7ba39a9
Whitespace
2018-11-25 08:17:57 -05:00
83531469d7
Print GPL license notice and SEGA disclaimer in console on start
2018-11-25 08:12:19 -05:00
40dfe89273
Merge branch '21-source-copyright' into 'master'
...
Update source copyrights to 2018
See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
bd4743007e
Update source copyrights to 2018, outdated targets
2018-11-25 07:35:53 -05:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
62443c9090
Merge branch '21-credits-update' into 'master'
...
Extra credits update .21
See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
680f95bb57
Merge branch 'master' into 102-gameplay
2018-11-25 07:12:36 -05:00
92d5a6b8fb
Quick patch-over to dedicated server husk bug
...
Whenever a 16th player would join, it would wrap around and overwrite the dedicated server ghost host player. This is possibly a bug in vanilla as well, but it'd only occur at 32 players so it's no wonder no one figured that out. :V
As a quick patch, I just capped cv_maxplayers to MAXPLAYERS-1 in dedicated servers only. To fix this for real, we'd need to give dedicated servers their own player & node instead of clumping in into the start of the normal ones.
2018-11-25 07:10:45 -05:00
e35e00f94e
Mess with display offset for some Battle objects
2018-11-25 05:43:17 -05:00
d7b3cf9314
Forgot the alignment for compact structs.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:35:19 +01:00
b48c1d1ce6
Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext
...
# Conflicts:
# src/w_wad.c
2018-11-25 11:18:28 +01:00
32a9e40baa
Progress?
...
Get all IO outputs used for possible errors.
Attempt to fix errors from travis-ci.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:11:50 +01:00
7c44054aa3
Take out the ifdef?
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 09:48:52 +01:00
01f5787e51
Unlock all secrets for dedicated
...
If wanted we can just add dedicated checks to Encore & Hard Mode, but I figured this would be quicker and more future-proof.
2018-11-25 02:30:08 -05:00
c67e7f1709
Game saves when you use the cheat
...
Because of other G_SaveGameData instances added in the last patch, this cheat can get saved anyway. Since this is just supposed to be convenience for server hosts, we might as well make it work like other console Kart racers and just make it save anyway!
2018-11-25 02:24:33 -05:00
f3ea628fea
Update server name instantly on change
2018-11-24 21:24:05 -05:00
7608055679
More in-depth countdown calculation
...
Hooooopefully this makes sure time over doesn't happen prematurely at random
2018-11-24 20:59:22 -05:00
7dcc55951b
Make absolute sure spbplace is set in the right places
2018-11-24 20:48:21 -05:00
d467399480
Keep track of the place SPB is following
...
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-24 20:41:17 -05:00
fccdfc1bfd
Weaken slightly
2018-11-24 19:49:18 -05:00
f47c78832a
colorize arrow roulette
2018-11-24 18:00:27 -05:00
1113849f5c
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 18:00:14 -05:00
a1f2b8f3f0
Merge branch 'master' into 102-gameplay
2018-11-24 17:44:20 -05:00
ec67c4cbd6
Fix uninitialized pointer.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 23:39:31 +01:00
1bcfe16933
Do not remove newlines from the end of files
2018-11-24 17:30:49 -05:00
14d178ed4b
Infinite wall bump fix(?)
...
Couldn't replicate it at all after this change, but I also have trouble replicating it before it :v
2018-11-24 17:28:53 -05:00
31aa96ecdc
Wrong var here
2018-11-24 17:27:48 -05:00
4ac481bcc6
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 17:22:11 -05:00
3f69e7c9b4
Merge branch 'next' into PK3-BackportNext
2018-11-24 23:08:52 +01:00
a1fb333e9b
Revamped the lumpinfo_t array generation code.
...
-The resource type is 'adequately*' detected first.
-The type-specific behaviors are now contained in their own functions, which are called accordingly for each.
-The PKZip lumpinfo_t generation has been almost entirely rewritten.
-If the functions return null pointer, the resource addition is considered invalid and pops an error.
2018-11-24 22:58:35 +01:00
f80691eb6e
Revert "Adjust mouse scaling calculation for SDL in windowed mode"
...
This reverts commit 3b298b7c42
2018-11-24 15:36:50 -05:00
c1d4ef3296
Merge branch 'next' into PK3-BackportNext
2018-11-24 14:54:42 -05:00
148d8ec9e0
Merge branch 'PK3-Backport' into PK3-BackportNext
2018-11-24 14:54:07 -05:00
17528a6aa9
LFS fixup for PK3 support
2018-11-24 14:48:56 -05:00
2b91e42410
Fix a bug where zoomtubes could cause ridiculous acceleration (ie, because PF_SPINNING was applied, causing ridiculously low friction, and then no mechanism was able to remove it)
2018-11-24 18:22:01 +00:00
6f5e3d42ff
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
d3a737f8c1
More SPB tweaks
...
- SPB can switch off if its target if that person lost the lead for 7 seconds
- Make sure lastlook gets reset when going back to SEEKING
2018-11-24 03:42:25 -05:00
cb0c31fa9a
Final touches
...
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 09:26:52 +01:00
4fdaf448f2
Change how SPB rush works
...
Instead of enabling Frantic for the person in 2nd, it doubles the gap between them. Now it's 2nd's job to catch up and ruin 1st's day.
2018-11-24 02:56:39 -05:00
cf8b4a6cb1
Additional 2.1 credits update
2018-11-23 21:57:07 -05:00
3b298b7c42
Adjust mouse scaling calculation for SDL in windowed mode
2018-11-23 21:43:50 -05:00
b60c10dc9b
Change default mouse sensitivity
2018-11-23 20:51:57 -05:00
e265d910d3
Item roulette fun-times
...
- Colorize items, Combi-Catcher style, while the roulette is still going. Nice Chaotix reference, and tells you when the game's just lagged.
- Items blink when you first get them! They blink white when you wait out the whole roulette, red when you mash, or rainbow for enhanced items! Blinking prevents items from being stolen too, so items can't be literally stolen before you even have a chance to see what it was.
- New item roulette sound for mashing
- Fix TC_ limits in Lua
2018-11-23 19:15:14 -05:00
794d27b49e
Kill CheckMissileImpact, it has been useless for probably a decade and a half
2018-11-23 23:14:49 +00:00
0a0336a674
Merge branch 'master' into fof-slope-skew-backport
...
# Conflicts:
# src/r_segs.c
2018-11-23 22:40:28 +00:00
4e616f54ad
Merge branch 'master' into next
2018-11-23 21:01:03 +00:00
9e09dd7563
Don't show "Attack or Protect" for spectators
2018-11-23 16:00:21 -05:00
d228e35fcb
Merge branch 'responsefile-fix' into 'master'
...
Fix M_FindResponseFile returning garbage data
See merge request STJr/SRB2!254
2018-11-23 15:59:40 -05:00
9c444b64a9
Fix divide by 0 bug
2018-11-23 15:45:46 -05:00
97dd291f3f
Merge branch 'master' into responsefile-fix
2018-11-23 15:29:52 -05:00
30b9cef043
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
...
Render the skies correctly on splitscreen in OpenGL mode
2018-11-23 14:48:05 -05:00
b1587cb0a3
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen
...
Render the startup screen on OpenGL mode
2018-11-23 14:47:56 -05:00
3d0fd7ff2e
Merge pull request #258 from light2yellow/master
...
m_fixed: asm: cc is not a register
2018-11-23 14:47:36 -05:00
08af33c51f
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
2018-11-23 19:12:48 +00:00
0487558a98
Add missing tweaks
...
Also remove a test printf.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 17:58:45 +01:00
c548aaa347
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
9a3d2d0ee5
Merge branch '21-credits-update' into 'master'
...
2.1.21 credits update
See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00
3c95a63fc2
Merge branch 'public-darker-credits' into 'master'
...
Make the credits pics darker
See merge request STJr/SRB2!336
2018-11-23 07:35:44 -05:00
2f7f472ca2
Update credits for 2.1.21
2018-11-23 07:34:23 -05:00
36e020c366
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
e51ed406ac
Swap out SDL_INIT_JOYSTICK for SDL_INIT_GAMECONTROLLER
...
First step in improving controller support.
2018-11-23 00:01:20 -06:00
3f35ffd7c6
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
fe43deacec
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
933c1311cd
Make the error less confusing
2018-11-22 22:59:46 -05:00
c4335a5524
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-22 22:56:33 -05:00
00fc67ba36
Reset to defaults option in controls
2018-11-22 22:50:40 -05:00
6020abab94
Fix the not found errors on DLLs
2018-11-22 22:44:47 -05:00
c2c799c885
Change defaults of these
...
nettimeout being 10 seconds is INSANITY, and maxping of 500 is when it starts being unplayable (I could also be bargained to raise it to 750 or 1000 though). Not sure if jointimeout causes any freezing, if it does then I'd also like to lower that
2018-11-22 20:54:28 -05:00
fe6832f559
Merge branch 'medal_unlocks' into 'master'
...
Immediate Time Medal Unlock Fix
See merge request KartKrew/Kart!104
2018-11-22 20:52:30 -05:00
0d4cd35e13
Make the credits pics darker
2018-11-22 20:08:02 -05:00
edd98842d5
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
17ff7e69a0
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
8f48f082d1
Merge branch 'master' into next
2018-11-22 20:12:59 +00:00
f7eea7ade3
Fix compiler errors
2018-11-22 20:08:57 +00:00
a8e01ee69b
Smarter pause/break rejection for setcontrol
2018-11-22 14:47:01 -05:00
7075cdbfa8
Don't accept KEY_PAUSE for control console command
2018-11-22 14:37:28 -05:00
f926774ee1
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
4b5246d5b7
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -05:00
37c0e646e4
Merge branch 'ms-update-alert-fix' into 'master'
...
Master Server Update alert fix
See merge request STJr/SRB2!333
2018-11-22 13:34:43 -05:00
de02c0bca9
Turns out your unlocks are delayed a little bit! The medals are saved, but the unlocks due to the medals aren't immediate... which is a problem for Hell Attack, since there's no indication you need to play another level for it all to work!!!
2018-11-22 18:28:27 +00:00
c6268253eb
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it).
...
Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out.
In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
2a5ae054f9
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
3832ffcc42
Make SPB slightly fairer on conveyors
...
It is possible to outrun SPB on gramet now
2018-11-21 22:26:33 -05:00
8f2210fb2f
Allow turning while respawning
...
This makes rubber-burn turning even more useless, but I don't think there's a way to fix the rubber-burn turn without breaking demo playback, so let's just do the part that is needed for now. I kinda want to redo how that mechanic works anyway.
2018-11-21 20:29:21 -05:00
ff9c41ca5f
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
1cb602aec6
Fix squishing on mobj scale maps
2018-11-21 19:40:56 -05:00
a30563da22
Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately
2018-11-21 19:30:00 -05:00
f65a8796df
SPB retargets the same person after death
2018-11-21 19:22:28 -05:00
e07e89055d
Remove drift & pogo spring on hit and a few other places
2018-11-21 19:00:14 -05:00
3acc312923
Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop.
2018-11-21 20:45:03 +00:00
66900c70ee
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
948466658f
Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
...
FOF wall rendering fixes and cleanup
See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
b03d87c80a
Be more consistent with how we lock kartspeed/kartweight
...
- The skin values are now locked between 1 and 9.
- kartspeed & kartweight are no longer locked on skin-switch. Combined with the above, this results in no gameplay change, other than the character select showing the proper value.
- Values used for the engine sounds are locked. No longer can overflow into character voices or freeslotted sounds.
- Removed the overzealous weight locking when in offroad.
If we want to ACTUALLY lock speed/weight for Lua too then we should do that in the Lua stuff.
2018-11-20 02:59:10 -05:00
5c67e22c22
Random map buffer only gets added to when
...
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 00:13:08 -05:00
9a4ebb916a
Allow yeah in splitscreen
2018-11-20 00:10:54 -05:00
9b1c2b8dc0
Make Map Hell a 1% chance
2018-11-19 23:41:15 -05:00
9b7eea408d
Change "player" to "user" to make it easier to read
2018-11-19 23:13:09 -05:00
0a3183aa82
Don't shrink spectators
...
Another typo here
2018-11-19 23:07:53 -05:00
c6053c8265
Don't do wipeout dust for spectators
2018-11-19 23:06:31 -05:00
555deddb6a
Offroad effect fixes
...
- Make dust retain some of your speed so it's more visible
- Only play effect when moving and on the ground
2018-11-19 22:45:12 -05:00
4590d5c5cf
Fix SKINCOLOR_ prefix not registering in Lua
2018-11-19 22:38:54 -05:00
39e644a7f5
Move countdown setting to P_CheckRacers
...
This fixes two bugs:
- Makes it so that the countdown happens when all the winners are ACTUALLY in instead of the first loser, because exiting timer wasn't set for the last winner in the place this was down before
- Means that the countdown timer can be set on disconnect
2018-11-19 22:37:24 -05:00
2d1f927a17
Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...
...that was a mouthful
2018-11-19 22:12:26 +00:00
418943acdc
change return type of M_CheckMODVersion to boolean
2018-11-19 17:47:23 +00:00
797f9d180e
Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages
2018-11-19 17:46:38 +00:00
20ac8ed126
Mistake
2018-11-18 23:31:36 -05:00
a290c4727b
Merge branch 'master' into Travis_CI-gcc8
2018-11-18 21:23:27 -05:00
42afd3532d
Merge branch 'master' into next
2018-11-18 20:22:40 -05:00
0b5069f36c
We need to include the NUL char
2018-11-18 20:21:32 -05:00
5a09d44fd2
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
2018-11-18 19:59:21 -05:00
ab39534ef6
Merge branch 'mingw-64bit' into 'master'
...
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
2018-11-18 19:49:18 -05:00
b58cbd2c08
Move Shrink out of P_DamageMobj
2018-11-18 17:51:49 -05:00
a3211df748
Apply banana drag effect to offroad
2018-11-18 17:01:43 -05:00
22b3a29d12
Merge branch 'countdown-on-all-win' into 'master'
...
Finish countdown only starts when all winners are declared
See merge request KartKrew/Kart!99
2018-11-18 16:09:09 -05:00
ddff42d9e0
Merge branch 'avoid_fixing_manual' into 'master'
...
Avoid Modifying Default Controller Layout Manual Page
See merge request KartKrew/Kart!102
2018-11-18 16:07:33 -05:00
b47d10645a
Merge branch 'show16playersinrankings' into 'master'
...
Fix the player in 16th not being visible in rankings
See merge request KartKrew/Kart!103
2018-11-18 16:02:32 -05:00
0aa251b18a
Merge branch 'nextmerge_again' into 'master'
...
Nextmerge again
See merge request KartKrew/Kart!101
2018-11-18 16:01:09 -05:00
ffcb6eb6ab
Merge branch 'fix-memory-leak' into 'master'
...
Fix the Memory Leak
See merge request KartKrew/Kart!100
2018-11-18 15:11:49 -05:00
a6d48f0ef4
Fix the player in 16th not being visible in rankings
2018-11-18 20:05:17 +00:00
cdeeac6ba1
Swap gc_lookback and gc_brake's default binded keys on controllers. (see the first issue in http://mb.srb2.org/showpost.php?p=802758&postcount=30 )
2018-11-18 19:31:07 +00:00
c5a6460e18
Update ASSET_HASH_PATCH_KART for the latest patch.kart
2018-11-18 18:28:46 +00:00
aa607ecf4c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
...
# Conflicts:
# src/d_clisrv.c
# src/m_misc.c
2018-11-18 18:26:50 +00:00
8c71cd0b90
Merge branch 'master' into next
2018-11-18 17:11:57 +00:00
4ee48194c4
Fix the Memory Leak
...
The Kart Minimap heads I believe should use GTC_CACHE as they're shown in level, only(?) Not using it causes the memory to keep creeping up as more colourmaps are loaded but not freed, while OpenGL by extention endlessly keeps making new textures for the "new" colourmaps.
2018-11-18 14:43:31 +00:00
0720264bc2
Negate `(netgame || multiplayer)` condition for countdown to use `defaultvalue` instead of `value` per the specifics of the previous implementation
2018-11-18 09:10:26 -05:00
a400bb9ef6
Merge branch 'camera-subsector-crash-fix' into 'master'
...
Camera subsector crash fix
See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
24a551238d
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git
2018-11-18 12:33:27 +00:00
dac8a4ab93
Move the player 3 and 4 CMD defines to the correct place.
2018-11-18 12:32:59 +00:00
9acd0ffe8b
Fix for waiting player screen animation
2018-11-18 06:34:29 -05:00
12ee59bdfa
Finish countdown only starts when all winners are declared
...
Still removing/changing crusty vanilla holdovers, one at a time. :shitsfree:
2018-11-18 06:17:42 -05:00
9ffcc79288
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git
2018-11-18 11:05:20 +00:00
5a96a0d0a4
Fix potential warning from string truncation
...
Also the MS seems to just throw the entire char array into the website and ignore null terminators, so I'm memsetting maptitle all to 0 before we do anything with it.
2018-11-18 11:05:05 +00:00
7b142dbad1
Updated the one important modified game print that most people see to be more descriptive
...
(I could've SWORN there were more...)
2018-11-18 05:48:10 -05:00
fb3d0da38f
v1.0.1 prep
...
Enable patch.kart, up version number
2018-11-18 04:00:05 -05:00
0e3b225011
Remove duplicate/removed objects
...
As well as other compile errors
2018-11-18 03:43:33 -05:00
b20d76719b
Merge branch 'fix-opengl-screentexture-hack' into 'master'
...
Fix textures in GL being wacky with the screen.
See merge request KartKrew/Kart!91
2018-11-17 20:58:52 -05:00
516cda90ec
Default gr_md2 to on
2018-11-17 20:55:12 -05:00
bd3f398a04
Fix cvar bugs
...
- karteliminatelast uses CV_YesNo instead of CV_OnOff
- chatbacktint defaults to on
- soniccd defaults to off
2018-11-17 20:47:11 -05:00
c419d973a3
Merge branch 'chat-changes' into 'master'
...
Fix capslock wonkyness
See merge request KartKrew/Kart!98
2018-11-17 16:54:56 -05:00
52e0379398
Merge branch 'introfadefix' into 'master'
...
Make level white fade use timeinmap instead of leveltime
See merge request KartKrew/Kart!93
2018-11-17 16:54:19 -05:00
b27a44e79b
Merge branch 'serverinfo_fix' into 'master'
...
Serverinfo Fixes
Closes #33 and #31
See merge request KartKrew/Kart!92
2018-11-17 16:54:08 -05:00
37596d445c
Merge branch 'savedata_fixes' into 'master'
...
Gamedata fixes
Closes #35
See merge request KartKrew/Kart!97
2018-11-17 16:53:56 -05:00
f17f5d08f5
Merge branch 'fix-splitscreen-join' into 'master'
...
Prevent more local players than the server maxplayers limit joining
Closes #30
See merge request KartKrew/Kart!90
2018-11-17 16:29:11 -05:00
8981093c85
Merge branch 'dedicated-battle-fix' into 'master'
...
Fix Battle Causing the game to crash in dedicated servers
Closes #36
See merge request KartKrew/Kart!88
2018-11-17 16:27:15 -05:00
e4cb1bc430
Merge branch 'shrinkegg_fix' into 'master'
...
Fix Eggman shrink bug
Closes #38
See merge request KartKrew/Kart!89
2018-11-17 16:24:40 -05:00
477400020d
forgot whitespaces....
2018-11-17 22:23:23 +01:00
e9767df4ff
Fix capslock not working outside of chat/console and shifting non letter characters
2018-11-17 22:21:10 +01:00
4abb03a231
Two tweaks to gamedata saving:
...
* Save gamedata in Y_UpdateRecordReplays(), so that you never unfairly lose out on your spoils by setting modifiedgame before the game ends.
* Always save your matchesplayed/totalplaytime increase at the successful completion of a level.
2018-11-17 20:16:27 +00:00
176dc6e5ca
Fix the first digit of all exiting players in positions 10 or worse flashing the first-place rainbow.
2018-11-17 18:02:04 +00:00
69228715fe
Make level white fade use timeinmap instead of leveltime
2018-11-17 16:54:56 +00:00
56ed67397d
* Fix the in-game MS browser thinking gametypes are unknown.
...
* Fix the website MS browser mapname output being incomplete.
* Hide hell maps on the website MS browser mapname output.
* (unrelated) tweak Command_Showmap_f's logic for a more accurate name.
2018-11-17 15:48:10 +00:00
c46efa7c41
Set the screen textures to use max higher texture IDs
...
This should hopefully alleviate the issue where textures overwrite the screen, or the screen overwrites the texture for now.
THIS IS NOT A FULL SOLUTION TO THE PROBLEM, but I highly doubt we'll ever be loading 4 billion textures at once, ever.
2018-11-17 15:23:12 +00:00
5d991b6f2a
Prevent more local players than the server maxplayers limit joining
2018-11-17 15:00:15 +00:00
8735dcd24b
Fix Eggman shrink bug.
...
Specifically: removed K_StripOther calls from touching fakes: No, none of these things need to be stripped! Also, poke K_StripOther just in case it eventually becomes relevant to have it.
2018-11-17 14:41:08 +00:00
8845043d31
Fix Battle Causing the game to crash in dedicated servers
...
Check that the displayplayer mo exists before trying to use it for scaling on Player Arrow
2018-11-16 23:07:27 +00:00
e85e621d2c
Minor credits issues
2018-11-16 12:05:57 -05:00
0de2d52bfd
add TOL_TV to dehacked
2018-11-16 12:04:24 -05:00
cb8bbf8e4c
Ensure MS packets are sent correctly
2018-11-16 12:01:57 -05:00
692ea23a42
Final credits
2018-11-15 22:55:01 -05:00
879267a709
Don't allow kart files to be downloaded
2018-11-15 19:18:04 -05:00
6b772aab59
Add Kart files to Makefile
2018-11-15 19:17:49 -05:00
82f353be61
Remove music.dta from loading
...
We've replaced/changed out all vanilla songs, so we no longer need it.
2018-11-15 19:17:06 -05:00
5d6e15f8af
More cinematic title demos (hide most HUD elements, show a title logo in the bottom right hand corner).
2018-11-15 14:30:11 +00:00
02c08a3e10
Some small changes
2018-11-14 21:01:54 -05:00
f02105732e
Fix up compiling on DD version
2018-11-14 18:00:10 -05:00
c5a97dcfe6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
b8477b4067
Squash various warnings
...
Shadowed declarations
Unsuffixed float constants
There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.
2018-11-14 21:53:57 +00:00
4695841b8d
fix format-truncation: need bigger string buffers
2018-11-14 16:50:52 -05:00
09f9572a8f
Merge branch 'master' into next
2018-11-14 21:49:11 +00:00
3e6fcf1b8b
Merge branch 'opengl-hud-scale-fix' into 'master'
...
OpenGL HUD scaling fix
See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
fb08950c19
Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length
2018-11-14 16:32:57 -05:00
4e9fc881a2
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
2018-11-14 16:26:46 -05:00
1b79b9527c
Properly check if cmake is running on wwindows
...
Thanks Monster Iestyn for informing me this is the correct way.
2018-11-14 15:58:45 -05:00
d4cb81cb28
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
ad79b4b83b
Add S_StopSoundByID to Lua
...
It was brought up to me in another server that character creators might want to have unique engine sounds. While I don't want to support that ourselves, as we have consistent engines for gameplay reasons, this gives people the ability to script around it if they so choose.
Plus, it's just generally useful and I'm surprised vanilla hasn't added it, even though they have the function to stop ALL sounds on an object.
2018-11-14 15:35:16 -05:00
514cd0794b
This effect assumed that it was spawned at base scale anyway...
2018-11-14 14:48:16 -05:00
2d5551ca5b
Double spectator movement speed to keep up with action better, scale it with map size
2018-11-14 14:41:28 -05:00
1201acce4b
Slightly less duplication
2018-11-14 14:39:37 -05:00
772c072064
Merge branch 'master' into analog-flipcam-synch-fix
2018-11-14 19:36:39 +00:00
887f4150c1
Hide unlockables with ???s
2018-11-14 14:15:24 -05:00
97fd69951a
Merge branch 'master' into next
2018-11-14 11:07:12 -05:00
de5b626520
Fix misleading indentation
2018-11-14 11:06:45 -05:00
f81d01edca
Merge branch 'vc-xpm-fix' into 'master'
...
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
d14f87b8c6
Cleanup whitespace
2018-11-14 10:54:33 -05:00
938bf1605c
Merge branch 'master' into next
2018-11-14 10:52:49 -05:00
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
Digiku