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

5581 commits

Author SHA1 Message Date
James R
103e67bbaa Fix differing signedness compare 2019-04-30 13:03:13 -07:00
wolfs
a0b1fce139 Merge branch 'md3-vanilla-kart' into 'next' 
MD2/MD3 support rewritten + optimizations [GCC port]

See merge request KartKrew/Kart-Public!19
 2019-04-30 15:22:30 -04:00
Steel Titanium
0128643043 Prettyify code. 2019-04-28 22:02:25 -04:00
Steel Titanium
72e402c1aa Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into port-param 2019-04-28 21:56:33 -04:00
Steel Titanium
1c21a4ed6f New -port param 2019-04-28 21:53:36 -04:00
toaster
031ffbf304 Completely untested -encore parameter for the map command; inverts cvar value. 2019-04-28 19:26:11 +01:00
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
Jaime Passos
6b6485159f Add "Software Perspective" toggle on the "GPU Options" menu 2019-04-14 19:44:56 -03:00
James R
36e678b292 Don't count down wait timer when executing a command 2019-04-14 15:17:47 -07:00
Jaime Passos
d1b1edcf39 More Softwarification 2019-04-14 19:08:59 -03:00
fickleheart
b1001d1808 Fix writing corrupt standings that break replay hut 2019-04-14 17:08:04 -05:00
Monster Iestyn
797ca99f42 Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a. 
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)
 2019-04-14 16:39:14 +01: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
Jaime Passos
a8165a2ce9 fix skyboxes AGAIN 2019-04-13 18:47:09 -03:00
Jaime Passos
5689fca892 fix includes 2019-04-13 18:14:55 -03: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
Jaime Passos
f5516a121c cleanup? 2019-04-12 16:35:28 -03: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
Jaime Passos
98f4e98b85 Remove dup_ variables 2019-04-07 14:27:52 -03:00
Jaime Passos
23a8fea598 fix fog 2019-04-07 01:25:55 -03:00
Steel Titanium
d59fb7f80c Expose cv_numlaps as global variable 2019-04-06 23:42:02 -04:00
Jaime Passos
4ea1dd3525 The player should be able to toggle shaders 2019-04-07 00:09:53 -03:00
Jaime Passos
fa7f627c88 stuff 2019-04-06 23:33:34 -03: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
b434eabf56 Alternate variant of ugly probably-bad hack 2019-03-30 23:15:11 -05:00
fickleheart
0911ec79d1 Try to fix hangs caused by PT_CLIENTJOIN with a non-zero ack 2019-03-30 22:48:55 -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
fickleheart
9bc3acd17a Fix compile issues 2019-03-26 08:26:41 -05:00
fickleheart
7090cf16b4 Unclose a node if it sends PT_CLIENTJOIN..? fuck it, why not 2019-03-26 01:36:12 -05:00
fickleheart
ca2979c1af Free nodes properly in cleanupnodes 
Hopefully the other changes herein have rendered
cleanupnodes obsolete, but I'm not too sure of
that.....
 2019-03-26 01:10:00 -05:00
fickleheart
6cf7cc0276 Is this useful in any way? 2019-03-26 00:09:23 -05:00
fickleheart
204a6d5c20 Let's try some sanity checks on the resync code... 2019-03-25 23:58:44 -05:00
fickleheart
29f460a21f pbbbbt fix compile error 2019-03-25 22:52:42 -05:00
fickleheart
0485b4cf5c Make sure clients never have local_resynchinprogress on when joining a game... 2019-03-25 22:49:37 -05:00
fickleheart
3455791054 More attempts that may fix things? 
I'm uncommenting a bunch of LJ code that was never
committed uncommented, so I might be breaking something
horribly here....
 2019-03-25 22:44:34 -05:00
fickleheart
a35e9d5abd Don't force-close connection when getting a join request! 
We need to send the ackret, first of all!
 2019-03-25 22:23:35 -05:00
fickleheart
8c56f1aa0b Wacky attempt at not reopening nodes for D/Ced ackreting clients 2019-03-25 22:22:25 -05: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
Jaime Passos
e1f1e63cc9 fix postprocessor 2019-03-21 18:33:03 -03:00
Jaime Passos
76967e46bb destroy hw_glide.h because no modern GPU supports such API 2019-03-21 18:23:40 -03: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
Jaime Passos
9451b10ac5 add SHADERS comment support 2019-03-19 18:52:41 -03:00
Jaime Passos
dd4e5ea373 fix shader loading on startup 2019-03-19 18:41:12 -03:00
Jaime Passos
da001a5b54 PK3 support 2019-03-19 18:25:55 -03:00
Jaime Passos
f714cba310 Improve custom shader support 2019-03-19 17:37:04 -03:00
Jaime Passos
9ffb093f44 change (void*) to (char*) 2019-03-19 14:41:48 -03:00
Jaime Passos
ae3ad1ea56 wups 2019-03-19 13:32:44 -03:00
Jaime Passos
75919422c6 custom shader support 2019-03-18 23:03:29 -03:00
Jaime Passos
1de35b9076 fix buildbot 2019-03-18 20:04:28 -03:00
Jaime Passos
5c399b0944 add vertex shaders 2019-03-18 19:17:47 -03: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
Jaime Passos
f210053735 md3-vanilla 2019-03-18 18:34:20 -03:00
Jaime Passos
9879734d52 I don't care about DirectDraw 
Neither SDL 1.2
 2019-03-18 15:54:29 -03:00
fickleheart
af17038cfb LAT 2019-03-17 21:44:11 -05:00
Jaime Passos
1cfdd07ee0 gl4 2019-03-17 22:27:50 -03: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
Jimita
6e4b42fc97
Merge branch 'next' into flashpals-on-screenshots 2019-03-15 16:38:33 -03: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
Alam Arias
5ca69ce234 Fix compiling with VS 2019-03-11 09:58:37 -04:00
wolfy852
2b66daf12d Remove P_CanRunOnWater 2019-03-11 00:28:30 -05:00
fickleheart
3de3f10ad3 Make sure Fairy is before Popcorn 2019-03-11 00:10:03 -05:00
fickleheart
66c9d9aa83 Move modified check on -file addons later in startup 2019-03-10 19:44:31 -05:00
wolfy852
fae8833ff4 Fix the game getting flagged as modified by default 
As a result, majormods trips for Lua and map replacements now, but modifiedgame isn't set for minor addons...
 2019-03-10 19:27:45 -05:00
Sryder
b9c3e56500 Move FORCECLOSE definition to be out of NONET ifdef 
Should this just be moved into d_net.h instead of defining it here and in d_net.c?
 2019-03-11 00:13:43 +00:00
wolfy852
b955f4f66d Attempt to fix replaced maps not marking the game as modified 
What this ACTUALLY does is mark the game as modified by default.
 2019-03-10 18:55:55 -05:00
Sryder
07ecfbc1d7 Fix compile warnings. 2019-03-10 23:51:52 +00:00
fickleheart
c65ff70faf Deduplicate character shifting code 2019-03-10 18:09:15 -05:00
fickleheart
c0ea785900 Remove unnecessary padding byte from stored challenge answers 2019-03-10 17:54:17 -05:00
fickleheart
0e58653727 Make sure we don't write kartspeed beyond SV_SPEEDMASK 2019-03-10 17:43:39 -05:00
fickleheart
048ce8496f Make noises on the password entry screen 2019-03-10 17:36:16 -05:00
fickleheart
4a8d682b43 Draw a padlock on-screen! 2019-03-10 17:25:55 -05:00
fickleheart
f70163cfb9 Show notice of a password-protected server on the join screen 2019-03-10 17:00:27 -05:00
fickleheart
693da54d94 Properly close the connection on the server's side... 2019-03-10 16:22:03 -05:00
fickleheart
0c6f3c58e6 Update packettypenames 2019-03-10 16:06:46 -05:00
fickleheart
a834ada9ce Merge remote-tracking branch 'remotes/upstream/next' into join-passwords 2019-03-10 15:54:06 -05:00
fickleheart
be79b4beec Fix dehacked color list being wrong 2019-03-10 15:48:55 -05:00
fickleheart
82f3d2cdb8 Skip password check if node is already in-game? idk 2019-03-10 15:48:11 -05:00
fickleheart
bafa4cee7b Improve stability when joining netgames maybe 2019-03-10 12:50:24 -05:00
fickleheart
426f4192be Merge remote-tracking branch 'remotes/upstream/next' into join-passwords 2019-03-10 12:35:07 -05:00
colette
ef0130f951 Merge branch 'dontskipframes' into 'master' 
Don't skip frames in software mode

See merge request KartKrew/Kart-Public!103
 2019-03-10 13:29:10 -04:00
colette
8bed922a52 Merge branch 'thunder-fixes' into 'next' 
Thunder shield-related changes

See merge request KartKrew/Kart-Public!110
 2019-03-10 03:51:33 -04:00
fickleheart
ce81504410 Try a partial disconnect instead 2019-03-09 23:56:13 -06:00
fickleheart
386360ff43 Properly close and reopen the client connection for password challenges 2019-03-09 23:36:11 -06:00
wolfy852
499dcc6bdb Kill all skin flags but SF_HIRES 2019-03-09 23:18:55 -06:00
fickleheart
3e1570c59d Revert "Move HandleConnect to the same place as other packets" 
This reverts commit 6bba2f16c0.
 2019-03-09 22:17:16 -06:00
colette
eec76cf4ec Merge branch 'remove-pinvin' into 'next' 
Kill invincibility item caps

See merge request KartKrew/Kart-Public!108
 2019-03-09 22:16:25 -05:00
fickleheart
416b723567 Fix improperly-resolved merge conflict 2019-03-09 21:08:29 -06:00
Alam Arias
d58cb1aae3 Merge branch 'next' into ping-stuff-take2 2019-03-09 22:02:11 -05:00
Alam Arias
50d0bf54e0 Merge branch 'master' into next 2019-03-09 22:00:25 -05:00
Alam Arias
cbe785d854 Please do not go past the doomdata_t space 2019-03-09 21:57:59 -05:00
fickleheart
766d4eec27 bah 2019-03-09 20:23:49 -06:00
Alam Arias
4bccc7a69f Merge branch 'master' into ping-stuff-take2 2019-03-09 20:40:50 -05:00
Alam Ed Arias
08784ce58d Merge branch 'master' into next 2019-03-09 20:37:17 -05:00
Alam Arias
6fb950002c Merge remote-tracking branch 'upstream/master' 2019-03-09 20:13:41 -05:00
Alam Ed Arias
60ca6ae06b TravisCI: add option for GCC 8.1 2019-03-09 19:41:56 -05:00
fickleheart
814c48805c Disable stacking thunder shields 2019-03-09 17:28:05 -06:00
fickleheart
84631b1393 Make P_NukeEnemies (including K_DoThunderShield) scale by mapscale 2019-03-09 17:24:20 -06:00
Alam Arias
1410c515cb Merge branch 'next' into join-passwords 2019-03-09 18:19:44 -05:00
Alam Arias
035ad5822c c is only for chat_in 2019-03-09 18:18:14 -05:00
Alam Arias
5500e4c2df fix VCHELP 2019-03-09 18:09:38 -05:00
fickleheart
d804dc3a34 Fix password auto-hiding if you type into it 2019-03-09 17:06:44 -06:00
Alam Arias
b1ec0442da Merge branch 'master' into ping-stuff-take2 2019-03-09 18:05:30 -05:00
fickleheart
3bb014ea42 Make password toggle only affect password fields 2019-03-09 17:03:52 -06:00
fickleheart
ad3a32f500 Handle capslock in just one place...? 2019-03-09 16:55:18 -06:00
fickleheart
7c7034a229 More... 2019-03-09 16:49:23 -06:00
fickleheart
5f0c4271d7 Use consts in place of some 16s 2019-03-09 16:46:55 -06:00
fickleheart
e4d99605eb Nudge lock over a tad 2019-03-09 15:27:23 -06:00
fickleheart
870a800d89 Toggle showing password with tab 2019-03-09 15:14:08 -06:00
Latapostrophe
b17c4e562e Change default showping from Warning to Always 2019-03-09 22:01:52 +01:00
fickleheart
1b6035e322 Add join password to server host menu 2019-03-09 15:00:48 -06:00
fickleheart
d5691b9289 Show kartspeed and password status on server browser 2019-03-09 14:30:04 -06:00
fickleheart
2954b68e12 Check password and etc before downloading files 2019-03-09 13:30:22 -06:00
fickleheart
6bba2f16c0 Move HandleConnect to the same place as other packets 2019-03-09 12:01:47 -06:00
Latapostrophe
b621723d23 Fix boost / rocket sneakers for antigrav 2019-03-09 17:25:42 +01:00
TehRealSalt
4faaa932ec Fix macro expansion warning Sryder got 2019-03-08 19:06:27 -05:00
Steel Titanium
77649ef6d1 Always return false instead. 2019-03-08 18:51:55 -05:00
TehRealSalt
87e91ebb2c Kill invincibility item caps 
It's a holdover from another era, our item changes have stacked up enough that we don't really need this cap anymore
 2019-03-08 18:36:25 -05:00
Sal
4f8665c785 Merge branch 'colors-roundtwo' into 'next' 
16 more colors

See merge request KartKrew/Kart-Public!101
 2019-03-07 21:25:03 -05:00
Sal
fd92612382 Merge branch 'minor-item-tweaks' into 'next' 
Assorted item tweaks

See merge request KartKrew/Kart-Public!85
 2019-03-07 21:24:51 -05:00
Steel Titanium
0e2cefe251 Properly comment out the function 2019-03-07 18:52:27 -05:00
Steel Titanium
7731fe8c24 Fix unused function error 2019-03-07 18:20:57 -05:00
Steel Titanium
3acf674b8a Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart-Public into dontskipframes 2019-03-07 18:13:16 -05:00
wolfy852
4e0518a85a Merge branch 'master' into next 2019-03-07 00:23:17 -06:00
fickleheart
18dba65f17 Don't shoot asterisks off-screen on the join password screen 2019-03-06 23:34:30 -06:00
fickleheart
ddf2db8a36 Fix freeze when trying to host with a join password already set 2019-03-06 23:32:47 -06:00
fickleheart
0ed74b3066 Missed an include 2019-03-06 22:45:02 -06:00
fickleheart
219b240bcf Recycle oldest challenges first if all are taken 2019-03-06 22:36:13 -06:00
wolfy852
a181cd24cd Fix my fuckups 
Not fond of what I did in P_CanRunOnWater but it at least carries the desired effect...
 2019-03-06 22:28:06 -06:00
fickleheart
bc46c3540f Show message on incorrect password 2019-03-06 22:11:35 -06:00
fickleheart
52b743a18f Fix join password not recognizing shifted characters 2019-03-06 22:07:28 -06:00
wolfy852
87d60eef86 Kill SF_RUNONWATER 2019-03-06 22:02:56 -06:00
fickleheart
b5c4866706 Add -remove option to joinpassword 2019-03-06 21:30:39 -06:00
wolfy852
75661f44d7 Clean up the skin_t struct 2019-03-06 21:18:01 -06:00
wolfy852
3873635629 Merge remote-tracking branch 'remotes/pub/next' into maxskins-bump 2019-03-06 20:13:30 -06:00
James R
a858967762 Check that G_FindView actually found a view 2019-03-06 18:06:16 -08:00
Sally Cochenour
c18935fbdd Reorder colors, ensure colored names are set properly 2019-03-06 03:15:07 -05:00
Sally Cochenour
f5fe073627 Fix floating lob items 2019-03-06 01:53:52 -05:00
fickleheart
264454ca70 hblurgle spburgle this code sucks 2019-03-05 22:27:25 -06:00
Steel Titanium
dc1786203d Merge branch 'master' into dontskipframes 2019-03-05 22:11:00 -05:00
Steel Titanium
0f51f3b7e3 Don't skip frames in software mode 2019-03-05 22:07:53 -05:00
Sally Cochenour
f230e0d644 Put eggbox sniping behind an #if 
On second thought, the old method is "sneakier"
 2019-03-05 22:06:47 -05:00
Sally Cochenour
171ca1670e Add banana snipe sound effect to eggboxes & sinks 2019-03-05 22:02:41 -05:00
Sally Cochenour
a3e00bdb0e uncommited change... 
💢
 2019-03-05 21:25:37 -05:00
Sally Cochenour
4e570739fe Make smoke opaque to reduce lag 2019-03-05 20:56:02 -05:00
Sally Cochenour
36a7e88e63 Mine updates 
- Increase gravity of super-forward throws
- Revert explosion radius change
- Nerf generic explosion stun (SPB explosion stun is identical)
 2019-03-05 20:49:11 -05:00
Sally Cochenour
5760e106e5 SPB updates 
- SPB Rush odds are not affected by player count.
- Thunder Shield cannot be rolled with SPB out.
- Reticule is displayed on minimap while SPB is out.
 2019-03-05 19:45:20 -05:00
Steel Titanium
ab4669978a Allow names to be used with forceskin 2019-03-05 19:04:15 -05:00
Sally Cochenour
ae14d967ea Misc changes 
- Start cooldown deactivates exactly 30 sec, instead of after 30 seconds. Barely affects gameplay but it looks slightly less of a magic number looking at the code.
- Prevent multiple Thunder Shields being out via normal means.
- Slightly loosened up the invincibility item limits -- gives more invincibility items sooner for odd player counts but doesn't affect the numbers for the game's balancing points (4P, 8P)
- Update comments
 2019-03-05 17:50:43 -05:00
Sally Cochenour
ea40a1b153 Merge branch 'next' into minor-item-tweaks 2019-03-05 17:18:27 -05:00
Alam Arias
b9abd8b9bc fix EOL in k_kart.c 2019-03-05 11:29:00 -05:00
James R
af19a2c29d Do not record replays when dedicated 2019-03-04 22:26:05 -08:00
James R
f57335deef Check that lumps are okay 2019-03-04 22:13:22 -08:00
James R
62820bb4bf Merge remote-tracking branch 'origin/next' into longdouble 2019-03-04 18:51:11 -08:00
Alam Ed Arias
0bf3834174 Merge branch 'netreplays-errors' into 'new_netreplays' 
Try to fix compiler errors

See merge request KartKrew/Kart-Public!90
 2019-03-04 20:46:26 -05:00
Alam Arias
6b5f00eade more unsigned mess 2019-03-04 20:35:13 -05:00
Alam Arias
71d0dfb046 the READ/WRITE marcos do not need ; 2019-03-04 20:27:01 -05:00
Alam Arias
dff82fffff Fixed comparing unsigned/signed mess 2019-03-04 20:26:44 -05:00
Alam Arias
489ca12bd3 Avoid ‘ncs’ being used uninitialized 2019-03-04 20:09:20 -05:00
Alam Arias
3a4ed07e02 do not overshadow demorecording 2019-03-04 19:16:46 -05:00
Alam Arias
1bdd1506d9 Fixup max() mess 2019-03-04 19:10:43 -05:00
Alam Arias
db3d8eee50 Fixup unsigned mess 2019-03-04 19:07:34 -05:00
Alam Arias
618f8b1267 Merge branch 'master' into new_netreplays 2019-03-04 18:50:58 -05:00
Alam Arias
515fb9adad Merge branch 'master' into next 2019-03-04 17:17:13 -05:00
Alam Arias
5537c62271 Merge remote-tracking branch 'upstream/master' 2019-03-04 17:16:37 -05:00
Alam Ed Arias
747995ae6a Merge branch 'master' into next 2019-03-04 17:15:04 -05:00
Alam Ed Arias
67e246cd53 No more errors for VC6 support 2019-03-04 16:46:14 -05:00
Alam Ed Arias
145ccfd405 no more floating constants warnings, and disable bad array bounds warnings 2019-03-04 16:46:14 -05:00
Alam Arias
56e8f09ae8 fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
James R
d93b9b5eba Remove always true expression 2019-03-03 20:08:28 -08:00
James R
89ea7f548e Use correct signedness in comparison 2019-03-03 20:02:49 -08:00
Steel Titanium
9542a47f7f New -noxinput and -nohidapi command line parameters. 2019-03-03 22:57:09 -05:00
James R
705ee9980f Merge remote-tracking branch 'origin/new_netreplays' into netreplays-errors 2019-03-03 19:53:25 -08:00
Steel Titanium
15323328c5 Check using memcmp() 2019-03-03 22:43:21 -05:00
fickleheart
353ea7d671 Merge remote-tracking branch 'remotes/netreplays/docs' into new_netreplays 2019-03-03 21:06:53 -06:00
fickleheart
61893c613c Maintain compat for record attack replays 2019-03-03 20:41:20 -06:00
fickleheart
272ba600e2 Fix missing argument in G_AdjustView call 2019-03-03 20:33:59 -06:00
fickleheart
4b2938a540 Merge remote-tracking branch 'remotes/netreplays/double-cmp-fix' into new_netreplays 2019-03-03 20:29:52 -06:00
fickleheart
38d672620d Merge remote-tracking branch 'remotes/netreplays/view-by-raceplace' into new_netreplays 2019-03-03 20:29:46 -06:00
fickleheart
56269cb62b Merge remote-tracking branch 'remotes/netreplays/setviews-command' into new_netreplays 2019-03-03 20:29:40 -06:00
fickleheart
f83e02e3db Merge remote-tracking branch 'remotes/netreplays/jitter-fix' into new_netreplays 2019-03-03 20:29:35 -06:00
fickleheart
ebd688f32f Cleanup :3c 2019-03-03 20:25:22 -06:00
fickleheart
c6f6783f3e Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-03 20:24:39 -06:00
fickleheart
d560fef930 Assign a server player in replays for Lua purposes 
Unfortunately this doesn't seem to help sync much. It
at least prevents constant Lua errors I guess....
 2019-03-03 20:24:35 -06:00
Steel Titanium
3d5d02fc15 Error if the lump is a PNG lump 2019-03-03 19:58:01 -05:00
James R
f0a0666223 Use long double suffix 2019-03-02 15:56:44 -08:00
Alam Arias
233033f213 Merge branch 'master' into next 2019-03-02 18:41:58 -05:00
Alam Arias
0d584a3145 Do not error about array bounds, some GCC versions's reporting is broken 2019-03-02 18:39:53 -05:00
Alam Arias
b9eb5c399b Just do not warn about unsuffixed float constants 2019-03-02 18:39:10 -05:00
Sally Cochenour
b95d0ac279 16 more colors 
- Renamed Crimson to Maroon.
- Renamed Scarlet back to Crimson.
- Renamed Nova to Scarlet.
- Added Brick, Flame, Sunset, Popcorn, Camouflage, Caribbean, Plague, Platinum, Rust, Nova, Ultraviolet, Moonslam, Bubblegum, Mauve, Royal, and Fairy
- Updated Maroon, Robo-Hood, and Ketchup
- Shifted positioning of Aqua Super
 2019-03-02 15:39:52 -05:00
Alam Arias
d4f05e5be9 fixup merged mess for NO-LUA mess 2019-03-02 13:32:47 -05:00
Alam Arias
c56cae4d28 Merge remote-tracking branch 'origin/master' into upstream-merge 2019-03-02 13:27:10 -05:00
Alam Arias
24ae6107cf Exported SDL_icon.xpm as srb2icon.png 2019-03-02 13:26:17 -05:00
Alam Arias
2657eb998e fixed compiling without blua support 2019-03-01 17:46:19 -05:00
Alam Arias
ae368a3e0f Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 17:33:32 -05:00
Alam Ed Arias
c2618fd987 Merge branch 'master' into next 2019-03-01 17:32:17 -05:00
Alam Ed Arias
f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Monster Iestyn
008b0bf560 Merge branch 'master' into next 2019-03-01 16:23:51 +00:00
Monster Iestyn
67e721e983 Merge branch 'need-more-time' into 'master' 
Stop Linux servers from hanging every 34 hours

See merge request STJr/SRB2!465
 2019-03-01 11:22:32 -05:00
Alam Arias
3d8e25e440 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 11:10:57 -05:00
Monster Iestyn
4459ecdd90 Merge branch 'master' into next 2019-03-01 16:05:49 +00:00
Sal
9210ab8497 Merge branch 'higher-maxnetnodes' into 'next' 
Upped MAXNETNODES

See merge request KartKrew/Kart-Public!94
 2019-03-01 06:29:52 -05:00
wolfy852
8e51cb18ba Merge branch 'master' into next 2019-03-01 00:13:47 -06:00
wolfy852
97de2ae4f6 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -06:00
wolfy852
cbb3145236 Stop Linux servers from hanging every 34 hours 
This drastically increases the amount of time Linux servers can stay up for before hanging.
 2019-02-28 18:51:57 -06:00
Alam Ed Arias
7cd60a544a Merge branch 'apng-oh-shit-fixes' into 'master' 
Compiling errors for apng fixed

See merge request KartKrew/Kart-Public!69
 2019-02-28 12:00:58 -08:00
wolfs
5620d0188e Merge branch 'apng' into 'master' 
Support aPNG in new versions of libpng

See merge request KartKrew/Kart-Public!63
 2019-02-28 12:00:58 -08:00
Sal
c41bc51e83 Merge branch 'color-fixes' into 'next' 
Color fixes

See merge request KartKrew/Kart-Public!93
 2019-02-27 16:24:03 -05:00
Steel Titanium
fa990e8603 Remove double define 2019-02-27 16:05:43 -05:00
Steel Titanium
e71977fe6a Merge branch 'next' into banip-command 2019-02-27 16:03:01 -05:00
Steel Titanium
15b27bb7d7 Upped MAXNETNODES 2019-02-27 15:59:50 -05:00
Steel Titanium
5975d3fb30 Add some parentheses 2019-02-27 15:55:39 -05:00
Steel Titanium
3b9c4fff52 Upped MAXNETNODES 2019-02-27 15:43:29 -05:00
Monster Iestyn
0340eb0b99 Merge branch 'master' into next 2019-02-27 20:35:07 +00:00
Monster Iestyn
d76e946b3e Merge branch 'sdl-new-windowicon' into 'master' 
SDL:Update XPM icon

See merge request STJr/SRB2!441
 2019-02-27 13:34:24 -05:00
Sally Cochenour
135190616a Merge branch 'next' into minor-item-tweaks 2019-02-27 01:32:52 -05:00