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

5319 commits

Author SHA1 Message Date
Steel Titanium
5461f860f9 Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into expose-numlaps 2019-04-27 22:34:53 -04:00
James R
848bb10c36 Move some cvars out of D_ClientServerInit and save them 2019-04-27 17:30:39 -07:00
TehRealSalt
9629fb3216 Modify the first shade of Byzantium 2019-04-26 22:32:31 -04:00
wolfy852
db2935d45a Fix boost -> drift -> release sliptides not showing the effect when turning right 2019-04-26 19:26:22 -05:00
wolfy852
50b00d37e0 Merge remote-tracking branch 'remotes/pub/next' into v1 2019-04-26 18:27:41 -05:00
wolfs
38770282d4 Merge branch 'intermission-think' into 'next' 
New intermission Hook for Y_Ticker

See merge request KartKrew/Kart-Public!131
 2019-04-26 19:25:18 -04:00
TehRealSalt
183e75ff53 Final v1 colors 
- 11 new colors: Skunk, Artichoke, Pigeon, Walnut, Cinnamon, Lemonade, Quarry, Crocodile, Azure, Thunder, & Wristwatch
- Updated Dawn, Sunset, Cream, Gold, Olive, Vomit, Lime, Plague, & Caribbean
- Updated opposite colors for Bubblegum & Camouflage in response to the new colors
 2019-04-26 18:18:53 -04:00
James R
fc8ebe83fc Force of habit 2019-04-26 13:08:35 -07:00
James R
aa4ce2b2d1 Check error on select 2019-04-26 13:06:26 -07:00
James R
4d739fe7a5 Unfuck MS connecting and error reporting 
Reconnect if the socket is closed.
Report the proper error from SO_ERROR and report an error from getsockopt.
 2019-04-26 12:59:21 -07:00
wolfy852
096bed6a4d Merge remote-tracking branch 'remotes/pub/next' into v1 2019-04-26 05:53:26 -05:00
wolfs
235426153f Merge branch 'forceskin-by-name' into 'next' 
Allow names to be used with forceskin

See merge request KartKrew/Kart-Public!102
 2019-04-26 06:42:09 -04:00
wolfs
8d0b185d96 Merge branch 'add-value-command' into 'next' 
Add a command to increment cvars

See merge request KartKrew/Kart-Public!128
 2019-04-26 06:41:52 -04:00
wolfy852
690a495d9b Merge remote-tracking branch 'remotes/pub/master' into next 2019-04-26 05:42:27 -05:00
wolfs
f2ec722b12 Merge branch 'room-list-first' into 'master' 
Show room list instead of server list if you haven't selected a room yet

See merge request KartKrew/Kart-Public!127
 2019-04-26 06:39:31 -04:00
wolfs
4dff8b4a11 Merge branch 'no-audio-option' into 'master' 
`-noaudio` option to cover `-nomusic` and `-nosound`

See merge request KartKrew/Kart-Public!129
 2019-04-26 06:37:02 -04:00
wolfs
e6ba65bac9 Merge branch 'save-showjoinaddress' into 'master' 
Save showjoinaddress to config

See merge request KartKrew/Kart-Public!132
 2019-04-25 23:17:07 -04:00
Steel Titanium
21e8a2c537 Save showjoinaddress to config 2019-04-25 23:13:09 -04:00
Latapostrophe
2350405ad3 Terminology changes 2019-04-23 23:49:46 +02:00
Sal
35c954ecc4 Merge branch 'spb-stuff' into 'v1' 
Fix SPB being way too fast in current sections where the player has no control

See merge request KartKrew/Kart!141
 2019-04-22 22:00:06 -04:00
Latapostrophe
5619e63e39 Fix SPB being way too fast in current sections where the player has no control 2019-04-22 20:40:17 -05:00
wolfy852
85a15847e5 Don't cut off flashing tics when using sneakers, don't allow stealing bumpers while intangible 2019-04-22 20:18:15 -05:00
Steel Titanium
e62fcc8148 Fix mangled comment 2019-04-22 19:27:42 -04:00
Latapostrophe
0f43546ada Add option to turn off the PLAY default md2 2019-04-22 11:29:44 +02:00
Steel Titanium
445bb0b99b New IntermissionThinker hook 2019-04-22 00:29:47 -04:00
wolfy852
d987c8ba07 Flashing tics on respawn 2019-04-21 07:52:01 -05:00
Sal
e76d33f9ba Merge branch 'under_the_weather' into 'master' 
Under the weather

See merge request KartKrew/Kart-Public!125
 2019-04-19 16:40:25 -04:00
James R
387a701db5 Add a "-noaudio" parm to cover "-nomusic" and "-nosound" 2019-04-18 23:50:29 -07:00
James R
3db1244849 Add a command to increment cvars 2019-04-18 23:42:28 -07:00
James R
4b05199b9f Show rooms list in server browser initially 
If you haven't selected a room yet, you're
shown the room list instead of server list.
 2019-04-18 22:41:50 -07:00
TehRealSalt
a187656a8f Fix up more stuff 
Now in a mergable state
 2019-04-18 12:20:13 -04:00
TehRealSalt
1f61397545 Huge splitscreen refactor 
Did not get to finish all refactoring or even compile this, I'll continue later
 2019-04-18 03:08:11 -04:00
fickleheart
ac53d4bbb3 Show when we're waiting for the full wadlist 2019-04-18 00:39:54 -05:00
fickleheart
014f916040 Read the file list properly 2019-04-18 00:37:08 -05:00
fickleheart
b59645e1b1 Send the rest of the file list 2019-04-18 00:30:28 -05:00
fickleheart
0e2bef3f1a Wait, we don't need pages, just first file index... 2019-04-17 23:51:15 -05:00
fickleheart
a36700e176 Some stuff toward reading those files 2019-04-17 23:42:49 -05:00
fickleheart
6c5ac8e942 Paginate PutFileNeeded 2019-04-17 23:29:27 -05:00
fickleheart
430831423c Strip out things that limit wad files added by filename 2019-04-17 23:09:10 -05:00
Steel Titanium
26fdee8217 Don't enable UPnP support if NONET is defined. 2019-04-16 15:05:09 -04:00
fickleheart
c67c598df0 Show player names on the bottom in 4p 
Also adjust margins to better match other HUD stuff
 2019-04-14 23:52:03 -05:00
fickleheart
9e3ee274fb Keep playback menu bar on the top in non-green reses 2019-04-14 23:22:24 -05:00
fickleheart
ad52f80627 Add scroll bar to replay hut 2019-04-14 23:17:12 -05:00
James R
d7e964bd54 Support splitscreen PLAYERINFO and don't expose clients' IP addresses 2019-04-14 21:14:01 -07:00
James R
36e678b292 Don't count down wait timer when executing a command 2019-04-14 15:17:47 -07:00
fickleheart
b1001d1808 Fix writing corrupt standings that break replay hut 2019-04-14 17:08:04 -05:00
toaster
972e6e9cf5 Precipitation being drawn at infinite distance when set to zero is incorrect behaviour. This is likely the consequence of a bad merge, but I don't care enough to check for certain. 2019-04-14 14:41:39 +01:00
fickleheart
5ec6517a54 Temporarily disable Extra Options menu 2019-04-13 15:23:31 -05:00
fickleheart
295b53801d Change color of active playback items 2019-04-13 15:23:23 -05:00
fickleheart
10d70f5447 Playback menu improvements 2019-04-13 14:42:15 -05:00
fickleheart
eb9c9885a9 Fix being able to carry rewind state where it shouldn't be 2019-04-13 14:22:48 -05:00
fickleheart
451ff30a7a Preserve quote and etc in aliases 2019-04-13 10:25:56 -05:00
fickleheart
3286d9ac93 Use strchr? 2019-04-13 10:16:54 -05:00
fickleheart
fe7220bb20 Allow argument substitution in aliases 2019-04-12 00:48:37 -05:00
wolfy852
052104999f Generic model terminology 2019-04-12 00:35:35 -05:00
Steel Titanium
588d3a8c6e Merge branch 'next' into forceskin-by-name 2019-04-11 21:01:14 -04:00
Sal
db18492836 Merge branch 'clear-all-controls' into 'master' 
Clear P3 and P4 controls too when clearing all controls

See merge request KartKrew/Kart-Public!117
 2019-04-11 12:20:48 -04:00
Sal
b128f44986 Merge branch 'fix-function-typo' into 'next' 
Lua: fix K_PlayPowerGloatSound mistype

See merge request KartKrew/Kart-Public!122
 2019-04-11 12:06:33 -04:00
Sal
ecdfb1ddcc Merge branch 'patch-1' into 'next' 
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()

See merge request KartKrew/Kart-Public!119
 2019-04-11 12:05:59 -04:00
fickleheart
5fcafb643b Proposal: VHS effect over the replay hut background? 2019-04-10 09:10:09 -05:00
Lachlan Wright
4f1a329ef2 Update k_kart.c 2019-04-10 03:16:46 -04:00
fickleheart
40d065a024 Fix thrown items desyncing during frame advance 2019-04-09 23:55:25 -05:00
fickleheart
d6e77fc12e Merge remote-tracking branch 'remotes/internal/INTERNAL_netreplays' into INTERNAL_netreplays 2019-04-09 23:00:42 -05:00
fickleheart
15bb586c57 Only calculate vfx every other row to try to improve performance 2019-04-09 23:00:39 -05:00
Sryder
824381d281 Z_Free not free. 2019-04-09 20:15:35 +01:00
Sryder
d579ee36bf Turn the INT8's into SINT8's 2019-04-09 19:34:34 +01:00
fickleheart
fe3cd967d1 Unused var 2019-04-09 01:18:10 -05:00
fickleheart
56c1f05217 Potentially apply VHS distortion semi-transparently? 
Pros: fuckin SMOOTH effect especially for 256-color sw
Cons: might lose the intended color distortion, maybe
not a great idea for FPS
Conclusion: put it behind an ifdef for now
 2019-04-09 01:09:13 -05:00
fickleheart
ae473585b7 Add VHS pause/rewind effect 2019-04-08 23:21:11 -05:00
James R
e746e54075 Replace ping command with a condensed and sorted version 2019-04-08 15:57:23 -07:00
James R
42d47a10f3 "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
fickleheart
9a049f5a0d Support RA time comparisons in new format 
I don't care enough about supporting old replays, and
they're old anyway. Force-overwrite them. :)
 2019-04-08 00:45:19 -05:00
fickleheart
c0af0fb59e Support new-format ghosts or some bullshit like that 
maybe future fickle will add support for multiple ghosts
from one replay for some sick memery but idgaf right now
 2019-04-08 00:30:04 -05:00
fickleheart
45390f2c35 Fix record attack not recording + staff names load for all replay types 2019-04-07 18:51:42 -05:00
fickleheart
ac3b1516cd Record demos consistently and also other stuff 2019-04-07 17:59:32 -05:00
Steel Titanium
d59fb7f80c Expose cv_numlaps as global variable 2019-04-06 23:42:02 -04:00
Steel Titanium
f8fec8e625 Lua: fix K_PlayPowerGloatSound mistype 2019-04-06 21:59:58 -04:00
fickleheart
f38d56d4a6 Support playback menu for record attack replays too 2019-04-06 18:59:11 -05:00
fickleheart
1eff7bfbe8 Fix title menu not working if you leave a replay early 2019-04-06 18:17:56 -05:00
fickleheart
aaa6418981 Various fixes and tweaks to rewinds 2019-04-06 18:06:02 -05:00
fickleheart
1f2adee119 Allow backwards frame advance while paused 2019-04-06 15:36:53 -05:00
fickleheart
6267986c72 Add demo rewinding 
Preview is fairly basic, and only shows players
rewinding. Full state is restored via reloading
the replay and jumping to the timestamp once
the rewind is done.
 2019-04-06 14:51:00 -05:00
fickleheart
d9bcb43d0b Support non-green resolutions in the replay hut 2019-04-06 11:16:19 -05:00
fickleheart
16091bcae9 Reference graphics for menu and other stuff 2019-04-06 02:17:30 -05:00
fickleheart
e948b8ba48 Begin work on playback menu 2019-04-05 02:38:48 -05:00
James R
ab17769f89 Let dedicated servers end vote time too! 2019-04-04 16:13:31 -07:00
Monster Iestyn
ab0fe6b164 Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
fickleheart
6a92335e1c something something character placeholders im tired 2019-04-01 23:34:53 -05:00
fickleheart
c1a3f17896 Draw placeholder when no standings are available 2019-04-01 20:30:24 -05:00
fickleheart
03653ef85e Fix encore stage rendering on replay hut 2019-04-01 20:17:36 -05:00
fickleheart
a01a3544f5 Fix old replays not loading 2019-04-01 17:14:45 -05:00
fickleheart
944838dc7d Read and write standings to replays 2019-04-01 15:07:27 -05:00
fickleheart
11586a1091 [FORMAT CHANGE] Add space for extrainfo pointer 2019-04-01 13:10:35 -05:00
fickleheart
b3ef039d87 Show non-default lap count on replay screen too 2019-04-01 12:56:23 -05:00
fickleheart
4b9562f72f Fix normal speed replays showing as easy speed 2019-04-01 12:28:01 -05:00
fickleheart
2fcb087d50 Draw icons for directories 2019-04-01 12:25:12 -05:00
fickleheart
b177673195 Don't draw options menu entry above replay infobox 2019-03-31 19:29:05 -05:00
fickleheart
266a590a14 Return to replay hut after watching a replay 2019-03-31 19:26:53 -05:00
fickleheart
704ce59761 Add subscreen to confirm replay watching 
This will have other goodies on it later!
 2019-03-31 17:29:41 -05:00
fickleheart
a8023adfdf Don't pause while the menu's up during replays 2019-03-31 16:28:29 -05:00
fickleheart
f54f08e6b5 Support directory navigation properly 2019-03-31 16:28:18 -05:00
James R
42d25f67ca Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes 2019-03-31 12:29:55 -07:00
fickleheart
940d2b9803 Add replay options screen 2019-03-31 13:50:29 -05:00
fickleheart
ac0ad5f32b Enable exiting and playing demos from replay hut properly 2019-03-31 13:50:20 -05:00
fickleheart
2fbb0ca5f4 Show music credit for credits 2019-03-31 13:09:49 -05:00
fickleheart
cbcb288296 Display infobox for the currently-selected replay 2019-03-31 02:54:09 -05:00
fickleheart
48dcfab7f6 List demos by title in the replay hut 2019-03-31 01:22:41 -05:00
fickleheart
1602b0e3d9 Start on the replay hut menu! 2019-03-30 20:57:53 -05:00
fickleheart
6cc875bb50 Move menu options around 
1 Player now goes directly to Time Attack, and Extras
is now a submenu with Unlockables, Statistics, and a
currently-dummied option for Replay Hut.
 2019-03-30 17:25:54 -05:00
James R
ff15a9896c Grab mouse on window focus 
Window focus does not necessarily imply mouse movement.
 2019-03-29 22:00:47 -07:00
Steel Titanium
ae74b5cb9d
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-27 19:18:51 -04:00
Lachlan Wright
a4722aded8 Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite() 2019-03-27 03:23:32 -04:00
James R
917edf720d Don't close console when starting title screen 2019-03-26 13:05:19 -07:00
James R
9a350eb879 Don't close console when changing map 2019-03-26 13:04:11 -07:00
James R
69d7e98f34 Remove redundant CON_ClearHUD calls 2019-03-26 12:59:13 -07:00
James R
e8071e66e4 Resize console upon resolution change 
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
 2019-03-26 12:30:02 -07:00
jameds
b9b36a44a8 Keep color across wrapped lines 
And this works by inserting the same color code on each wrapped line.
 2019-03-26 12:07:11 -07:00
jameds
587586f4bb Scroll console immediately upon pressing PageUp 2019-03-26 12:05:23 -07:00
Alam Arias
7d98adf6dc Merge commit 'upstream/master~1' 2019-03-26 09:48:13 -04:00
Monster Iestyn
a01a0a3dc3 Merge branch 'master' into next 2019-03-26 13:46:15 +00:00
Monster Iestyn
9ef98471a4 Merge branch 'buildbot' into 'master' 
Buildbot changes

See merge request STJr/SRB2!477
 2019-03-26 09:44:56 -04:00
Monster Iestyn
8e78369f83 Merge branch 'dedicated-server-credits-fix' into 'master' 
Dedicated server credits fix

See merge request STJr/SRB2!476
 2019-03-26 09:44:21 -04:00
Monster Iestyn
67874180b2 Merge branch 'gametype-strings-backport' into 'next' 
Gametype strings backport

See merge request STJr/SRB2!473
 2019-03-26 09:42:52 -04:00
Monster Iestyn
8c1c0875a2 Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way 2019-03-25 21:35:04 +00:00
Alam Ed Arias
fe22fdc5a3 P_SuperDamage() is too big for inlining 2019-03-25 15:30:25 -04:00
Monster Iestyn
147221cf6e R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them. 2019-03-25 18:54:47 +00:00
Monster Iestyn
7441dd7d9b Merge branch 'master' into next 2019-03-25 18:08:36 +00:00
fickleheart
2a9dd8e1f9 Allow entering a title for replays on save 2019-03-24 22:40:52 -05:00
fickleheart
b2cbe3ed6d Refactor replay saving handler for later use 2019-03-24 21:55:08 -05:00
fickleheart
4b7d2aea84 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
ccefc48af3 Use demo title as filename for multiplayer replays 2019-03-24 20:36:22 -05:00
fickleheart
0940be1633 Move save replay prompt into the upper-right corner 2019-03-24 19:57:11 -05:00
fickleheart
8906718fb8 Use skin with closest stats if the expected one wasn't found 
This allows people to watch replays without the characters loaded,
without making everyone be Sonic.
 2019-03-24 19:41:25 -05:00
fickleheart
402796b3c6 Add some checks against invalid replays 2019-03-24 19:19:57 -05:00
fickleheart
b135c46d60 Clean up demo header read/write code 2019-03-24 19:14:34 -05:00
fickleheart
c7109c0ae4 Add title to netreplays and do some format cleanup 2019-03-24 18:48:14 -05:00
fickleheart
7af0554aba Prepare for a demo format upgrade! 2019-03-24 17:47:24 -05:00
fickleheart
ca37b467e0 Clear P3 and P4 controls too when clearing all controls 2019-03-24 17:31:04 -05:00
fickleheart
d5f27c8339 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-24 17:23:49 -05:00
Alam Arias
32fd6dc834 Merge remote-tracking branch 'upstream/master' 2019-03-23 15:08:45 -04:00
Alam Arias
544f806f92 Merge commit 'upstream/master~1' 2019-03-22 10:18:10 -04:00
wolfy852
7911fa24d0 Fix Visual Studio compiling 2019-03-21 00:32:27 -05:00
James R
ed0f8fd967 Actually allow connecting to "localhost" 
Because IPv6 doesn't seem to work anyway.
 2019-03-20 20:37:00 -07:00
James R
f139ffd1dc Let localhost connections 2019-03-20 20:37:00 -07:00
wolfy852
6b743d383b Merge branch 'next' into md3-vanilla-kart 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
 2019-03-20 19:50:20 -05:00
Monster Iestyn
ecb6322a52 Merge branch 'sdl-noxinput-nohidapi' into 'master' 
-noxinput and -nohidapi command line parameters.

See merge request STJr/SRB2!468
 2019-03-20 17:33:04 -04:00
fickleheart
4f8d1383b0 Self-reminder... 2019-03-19 23:45:45 -05:00
fickleheart
3d36f531b9 Merge remote-tracking branch 'remotes/james/netreplays-dedicated-sigsegv-fix' into new_netreplays 2019-03-19 23:44:39 -05:00
fickleheart
f6797e285b Merge remote-tracking branch 'remotes/james/netreplays-resetview-sigsegv-fix' into new_netreplays 2019-03-19 23:44:22 -05:00
fickleheart
29c6dae776 Add command to lower netreplay sync frequency 
This makes for smaller replay files while keeping
sync checks in place!
 2019-03-19 23:39:04 -05:00
fickleheart
64ceb441e3 Fix MAXMOM being above the max value GZT_MOM* could store 
This caused a lot of """desyncs""" when players were moving
between 128-255 FU/T, which was exacerbated by this next commit...
 2019-03-19 23:38:26 -05:00
fickleheart
65ac9b7b0b Rename recordmultiplayerdemos to netdemo_record 
Begins the process of namespacing demo recording commands.
 2019-03-19 23:08:32 -05:00
fickleheart
d676dd5a1e Keep record attack replays base-game-compatible for now 2019-03-19 23:02:17 -05:00
fickleheart
438cabcd24 Don't resync position until off for two tics in a row 
This patches over a few trouble spots, like Misty Maze, causing
consistent resyncs and screwing up playback.
 2019-03-19 22:59:27 -05:00
fickleheart
7fc1f02b07 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
 2019-03-19 22:17:25 -05:00
Monster Iestyn
2fb569857a Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa 
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
 2019-03-18 22:00:23 +00:00
fickleheart
af17038cfb LAT 2019-03-17 21:44:11 -05:00
fickleheart
ca68042d95 Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep 2019-03-17 16:37:01 -05:00
fickleheart
f909a055d8 Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep 2019-03-17 16:36:52 -05:00
James R
70f40d54cb Resume sounds on unpausing after a window re-focus 2019-03-16 15:50:16 -07:00
James R
5057c37dfb Move change viewpoint control checking so it doesn't take precedence 
Notably over chat.
 2019-03-16 15:42:18 -07:00
fickleheart
4b71ac7b6b Merge branch 'netarchive-fix' into version-prep 2019-03-16 15:00:02 -05:00
fickleheart
b9ae148af6 Merge branch 'colormap-caching-workaround' into version-prep 2019-03-16 14:59:55 -05:00
fickleheart
50c0ed0f07 Fix bad merge in map data archiving code 2019-03-16 14:56:56 -05:00
fickleheart
875506e6cc Don't free this cached colormap! 2019-03-16 12:22:11 -05:00
fickleheart
f18d2a684b Merge branch 'lua-ticcmd-latency' into version-prep 2019-03-16 02:41:19 -05:00
fickleheart
d727492c87 Merge branch 'colormap-caching-workaround' into version-prep 2019-03-16 02:41:14 -05:00
fickleheart
0b1cc92f1a Allow reading ticcmd latency 2019-03-16 02:19:43 -05:00
fickleheart
ebe76f7a1b Remove dumb special case 2019-03-16 01:29:13 -05:00
fickleheart
cd4fc40b9e Cache colormaps everywhere to avoid memory leaks 2019-03-16 00:39:52 -05:00
fickleheart
abc479980c Update patch.kart hash again 2019-03-16 00:35:13 -05:00
fickleheart
fd12ff9163 Merge branch 'kartstuff-fix' into version-prep 2019-03-16 00:02:40 -05:00
Steel Titanium
6d751ff302 Remove the define. 2019-03-15 18:46:25 -04:00
Steel Titanium
5a170b9e4e Merge branch 'master' into errorifpng 2019-03-15 16:40:47 -04:00
Steel Titanium
67a80ba311 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command 2019-03-15 16:13:31 -04:00
mazmazz
6b93ca9221 Intermission: Don't fade out level music when using win32 midi volume hack 2019-03-15 01:26:13 -04:00
mazmazz
6cf05a4613 Implement MUSICINTERFADEOUT level header 2019-03-15 01:05:52 -04:00
mazmazz
bd9e42ce6e Merge branch 'public-gl-next' into public-musicplus-inter 2019-03-14 23:42:16 -04:00
mazmazz
fdde5f13c5 When resetting volume on same music, make it fade instead of a hard change 2019-03-13 23:55:30 -04:00
mazmazz
67e2857303 When changing to same music, reset the internal volume 2019-03-13 23:41:35 -04:00
mazmazz
c021e29835 Restore MUSIC_RELOADRESET if block in g_game 2019-03-13 21:18:23 -04:00
mazmazz
2c75d4da69 Fix custom fade source bug for Change Music linedef 2019-03-13 19:53:16 -04:00
mazmazz
aea18f36ba Remove MP3 warning 2019-03-13 19:51:45 -04:00
mazmazz
93626c2293 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04:00
fickleheart
bae86bbca4 Oh, this was already here... 2019-03-12 08:39:25 -05:00
fickleheart
ee3580098b Add missing deh entry for k_starpostflip 2019-03-12 07:34:47 -05:00
fickleheart
3aa1e78345 Update version and patch hash 2019-03-11 22:40:15 -05:00
fickleheart
9ff8b73936 Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD 
# Conflicts:
#	src/k_kart.c
#	src/p_mobj.c
 2019-03-11 21:59:45 -05:00
fickleheart
c30c3f7a3a Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
fickleheart
fcf072cbeb Merge remote-tracking branch 'remotes/upstream/master' into HEAD 2019-03-11 21:53:47 -05:00
fickleheart
1975a9b885 Prevent music changes from playing when unfocused 2019-03-11 21:48:29 -05:00
Steel Titanium
d6046088a0
Change array size from MAXSKINS+1 to MAXSKINS+2 
Also Set the values to 0/NULl, it will be overwritten later when a skin is assigned to the slot.
 2019-03-11 22:11:36 -04:00
Steel Titanium
b6572eceae
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-11 21:54:53 -04:00
wolfs
24b5079f20 Merge branch 'color-flip' into 'next' 
Fix color enums more

See merge request KartKrew/Kart-Public!112
 2019-03-11 19:28:24 -04:00
wolfs
af67c7abf5 Merge branch 'maxskins-bump' into 'next' 
Bump MAXSKINS to 128 + Clean up skin struct

See merge request KartKrew/Kart-Public!82
 2019-03-11 19:28:16 -04:00
wolfy852
8c40f2a10e Remove disableSpeedAdjust 2019-03-11 17:23:41 -05:00
James R
0f9648eac0 Miscellaneous window de-focus options 
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
 2019-03-11 14:57:11 -07:00
James R
bb187c1d27 Make "Focus lost" HUD overlay optional 2019-03-11 12:50:01 -07:00
Latapostrophe
0e6083cf02 Fix what was discussed, minus the rocksneaker math which is still shady, but let's not break what currently works 2019-03-11 18:53:23 +01:00
Alam Arias
e2a5e8a18d Merge branch 'master' into next 2019-03-11 10:01:57 -04:00