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

5260 commits

Author SHA1 Message Date
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
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