incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22185 commits 1 branch 0 tags 204 MiB
Commit graph

1326 commits

Author SHA1 Message Date
toaster
8c3fad058d * Fix the Z_Free double-free issue (in two different ways, one ifdef'd out) that can sometimes occur on the vote screen. 
* Fix a technically invalid read in D_SetupVote.
* If the third map on the voting screen has a different gametype, don't interact with the buffer.
* Fix the inttime 0 setting, since I was in y_inter.c and testing quick map changes.
 2022-01-23 20:33:27 +00:00
James R
223ef50acb Enable percentage speedometer by default; do not save 2022-01-20 20:07:52 -08:00
AJ Martinez
24b05451f6 my workflow is beyond your understanding 2022-01-20 03:39:00 -06:00
AJ Martinez
1e4bc482d0 very small tiny fixes 2022-01-20 02:07:48 -06:00
James R
7e709cd018 Fix compiler warning 2022-01-16 17:35:47 -08:00
toaster
4cff27797c Guard IsPlayerAdmin in testers/hosttesters 2022-01-17 01:22:10 +00:00
toaster
6980975f11 Revert "Disable player admins" 
This reverts commit 4d2793918c.
 2022-01-17 01:19:13 +00:00
Sally Coolatta
c606e1e96b Force shrink can be toggled individually online 
In preparation for a "make yourself small by default" cheat on the char select like SMK.
 2022-01-09 04:08:26 -05:00
toaster
60f08f2380 Defines per Sal request 2022-01-04 23:02:09 +00:00
toaster
316cd61d9f * Fix follower colour being limited to UINT8. 
* Fix follower colour not being set in offline mode (based on Steel's fix but no UINT8).
 2022-01-04 22:41:35 +00:00
James R
4d2793918c Disable player admins 2022-01-02 21:58:18 -08:00
James R
72f9121f5d Disable wad loading in TESTERS build 2022-01-02 21:50:23 -08:00
toaster
4108d5acb0 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into namefix 2021-12-10 00:04:37 +00:00
toaster
b716e142a8 Some fixes for bad player info on joining servers. 
* Don't overwrite the first player's name when joining with multiple local splitscreen players. (resolves #151)
* The defaults for unprovided names are now consistently "Player A/B/C/D" as opposed to some being letter-based and some being number-based.
* Send local player info once per local splitscreen player, rather than n^2 times (where n is the number of local splitscreen players).
* Since the packet *requires* four names to be sent every time you join a server, send dummy names for local splitscreen players who aren't connecting, instead of your actual cvars (no data leakage you didn't ask for!)
 2021-11-30 21:24:00 +00:00
SinnamonLat
f96f7c6ba3 Fix follower colours 'Match' and 'Opposite' not working 2021-09-02 13:34:17 +02:00
SinnamonLat
2df8aa69b7 missing follower check in SendNameAndColor 2021-09-02 08:33:49 +02:00
toaster
00972a83d2 remove the prefix since everything seems to function 2021-04-17 11:30:08 +01:00
toaster
b3d006b093 structs gunched 2021-04-17 00:27:13 +01:00
toaster
b19372944c * Add a new feature - "-nodoubles", which shows only double-defined entries without needing to specify a range (but you still can, afterwards). 
* Resolve Sryder's comment about confusing unlabeled iteration variables.
* Fix an issue with out-of-range printing for the end of the range failing.
 2021-04-06 17:08:34 +01:00
toaster
15c2d75199 listmapthings 
Introduces a new command that lists all mapthings by their doomednum and MT_ constant string.
* Can distinguish between hardcode and freeslots.
* Can detect double definition.
* With single argument, returns messages relating to that single doomednum.
* With two arguments, returns messages for that doomednum range inclusive (can swap if wrong way around).

The below image does not include what happens when it is called without any arguments, as that is long enough to only be legible in the logfile.
https://cdn.discordapp.com/attachments/369137273700089867/829007068333342720/unknown.png
 2021-04-06 16:08:54 +01:00
Sally Coolatta
8bb1fa57d4 Merge branch 'master' into 22-merge-again 2021-04-05 01:11:26 -04:00
toaster
c5d842d05e Remove a duplicate call to LUAh_MapChange (which should only fire once, in G_InitNew). 2021-04-03 19:49:07 +01:00
Sally Coolatta
7f912e1558 Remove unused cv_freedemocamera 
Not relevant to kart
 2021-02-28 21:28:18 -05:00
Sally Coolatta
20e2c78331 Delete seenames code 
We had SEENAMES disabled before, and vanilla removed the define, so I went ahead and removed it. Repurposed the old seenames console variable for our nametags.
 2021-02-28 21:27:23 -05:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next 
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
 2021-02-27 05:18:36 -05:00
Sally Coolatta
4b158c44cd Add debug command to show the bot's prediction 2021-02-26 02:41:41 -05:00
toaster
879c821d18 Demo-sync weaponpref data, which just includes kickstartaccel right now. 2021-02-22 12:58:03 +00:00
toaster
08d087c6b5 Acceleration Kickstart, my little hobby project. 
It's no secret that holding down a button a lot can fuck with your wrists and fingers. It's too late for me to be damageless, but I can at least create an option to reduce further harm.

This accessibility feature, when enabled (kickstartaccel and kickstartaccel2/3/4 in the console) behaves with the following properties:
* Hold accelerate for 1 second to lock it down.
* Press again to release.
* Short holds/presses do nothing (good for POSITION).
* Continue holding it during the releasing press to re-lock it.
* A small triangular UI element is added next to the speedometer sticker, which displays the current state of the acceleration kickstart for visual feedback. (NO SPLITS SUPPORT YET)

In addition:
* Add PF_ACCELDOWN and PF_BRAKEDOWN, and BT_REALACCELERATE (which ACCELDOWN tracks). Even if this feature never gets merged, BT_REALACCELERATE is required because sneakers and boosters force it on too (extending this is how I implemented it).
* Fix the dehacked playerflag list being out of shape.
* I replaced some existing flags during development of this branch, so their old uses have been whittled away.
 2021-02-20 23:10:18 +00:00
toaster
2ec943a214 Several changes to respawning and race start. 
* Becoming a spectator is now instant, and leaves no bumpable corpse behind.
* Players will now FAULT if they:
    * change from a spectator into a player after the initial camera turnaround but before the end of POSITION.
    * touch an instant kill FOF or get crushed during POSITION.
    * become a spectator during POSITION. (I might change this later, seems overkill)
* If you respawn during POSITION, the jingle will not restart from the beginning.
* Change the FAULT animation to match spinout/currents.
* Clean up some of the spawning code to not place spectators on the ground.
 2021-02-17 21:48:09 +00:00
James R
f0b6045245 DEVELOP: everyone is an admin 2021-01-24 22:51:09 -08:00
Latapostrophe
3cd4c87df5 Weaker tumble, some effects + tumble on spring panel fail 2021-01-09 21:58:35 +01:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
James R
55bc602dbd Merge branch 'apng-downscale' into 'next' 
Add aPNG downscaling

See merge request STJr/SRB2!1197
 2020-12-12 17:39:56 -05:00
James R
956fd338f0 Merge branch 'oldguards' into 'next' 
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
 2020-12-12 17:34:04 -05:00
James R
20e0d99ea0 Remove trailing whitespace 2020-12-12 02:40:46 -08:00
James R
41f1b3b97c Kill SEENAMES 2020-12-12 02:11:23 -08:00
James R
477ae9d1af Merge branch 'gamequit-argument' into 'next' 
Send a `quitting` argument to the GameQuit Lua hook.

See merge request STJr/SRB2!1276
 2020-12-10 15:25:52 -05:00
James R
71553a8ad0 Merge branch 'battle-rethink' into 'master' 
Battle rethink

See merge request KartKrew/Kart!335
 2020-11-29 19:13:38 -05:00
GoldenTails
d8ab3a75ed Remove the rest of the Playing() checks for GameQuit hook 2020-11-29 16:53:29 -06:00
GoldenTails
ded87cb54c Send a quitting argument to the GameQuit Lua hook 2020-11-29 08:30:50 -06:00
James R
d5688f53a0 Don't print W_VerifyFile errors more than once 2020-11-28 20:51:21 -08:00
toaster
f72108c4fa A whole bunch of cleanup to get most record attack/replay stuff reasonably functional. 
* Fix the screen being stuck black at the very start of start record attack.
* Bump up the demoversion to 7, because I want all previous v2 demos to be guaranteed kaput (it was previously 4, but 7 is a nice number).
* Fix a ton MORE shitcausing misalignments in the replay system, this time specifically focused on getting ghosts functional.
* Plug a few holes in the "best lap" record implementation that allowed for stupidly easy records due to the way v2's finish lines work.
* Make a few follower-related things sane, to prevent spurious console prints that were getting in the way of my test prints.
 2020-11-27 20:30:28 +00:00
James R
e3142663aa Merge branch 'replay-camera-update' into 'next' 
Make the replay camera follow the player

See merge request STJr/SRB2!1243
 2020-11-22 17:23:38 -05:00
GoldenTails
676f758d39 Add aPNG downscaling, and its associated consvar. 2020-11-19 13:45:04 -06:00
Jaime Ita Passos
be274a4fa9 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
Sally Coolatta
931bcb3c2a Fix laps counter after finishing 2020-11-18 17:10:48 -05:00
Sally Coolatta
e16c7d722f Cherry-pick e1b265df2 2020-11-16 19:55:28 -05:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Sally Coolatta
fc934b38e1 Merge public next 2020-11-10 15:32:48 -05:00
Riku Salminen
0cefac70d3 Declared the cvar in netcmd to get rid of warnings 2020-11-10 13:53:31 +02:00
Riku Salminen
16a4ab37d3 Try to add cvars for old camera 2020-11-10 13:21:34 +02:00
Sally Coolatta
4a9a438270 Dummy out wanted system 
- Remove WANTED hud item
- Person in 1st place is the bonus points giver
- Sort players by Emeralds > Bumpers > Points
 2020-11-02 03:51:16 -05:00
Sally Coolatta
2509d5a29c Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-24 21:39:32 -04:00
Sally Coolatta
afbbfc9b1f Fix cvars 
My wrist burns...
 2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -04:00
Sally Coolatta
81a3a1c108 Steal bumpers from other players on any hit 2020-10-24 09:18:28 -04:00
Sally Coolatta
7430df5f4f Fix time limit, make overtime kill you instantly and close in faster, remove minimum radius 
Radius SHOULD be doubled to 8192 to be reasonable... but something gets severely messed up, makes me MAD
 2020-10-22 05:36:36 -04:00
James R
f34a761d48 Merge branch 'perfstats' into 'next' 
Performance stats

See merge request STJr/SRB2!1186
 2020-10-18 15:33:20 -04:00
James R
4c7400b27e Merge branch 'save-netvars' into 'next' 
Save netvars

See merge request STJr/SRB2!1179
 2020-10-12 19:03:01 -04:00
James R
975e042d66 Merge branch 'addfile-vararg' into 'next' 
Give the addfile command variable argument support.

See merge request STJr/SRB2!1176
 2020-10-12 18:32:20 -04:00
GoldenTails
33d026ed5a Futureproof against strict buildbots. 2020-10-12 17:14:32 -05:00
Jaime Passos
b4b4738c94 Changes to sprite rendering: 
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
 2020-10-12 00:13:22 -03:00
Hannu Hanhi
24ff748c58 Performance stats 2020-10-10 22:12:34 +03:00
James R
b088aad169 Add CV_NETVAR to server affecting cvars 
showjoinaddress
maxplayers
joindelay
rejointimeout
resynchattempts
blamecfail
maxsend
noticedownload
downloadspeed
jointimeout
maxping
pingtimeout
servername
 2020-10-09 15:23:16 -07:00
James R
e9d8166e3b Add CV_SAVE to netvars 
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime

tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
 2020-10-09 15:06:09 -07:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
GoldenTails
3514ecdec8 Update help message to mention supported file extensions, and change the description to "Load add-ons" 2020-10-06 03:37:23 -05:00
GoldenTails
f289999ce3 Add warning when files are skipped due to being previously processed. 2020-10-04 21:03:29 -05:00
GoldenTails
79861c1a98 Give the addfile command variable argument support. 2020-10-04 21:02:20 -05:00
James R
e42eb9aba8 Revert "Warn when going to OpenGL from the menu" 
This reverts commit 3883d44bb5.

And one line from 5c1b3baf18.
 2020-10-02 15:37:23 -07:00
James R
f7a4667bc3 Use STUN instead of curl to fetch the public IP address for Discord 
RFC 5389 is a standard protocol that can be used for this instead of ip4.me.

I may have gone overboard on the CSPRNG... It was fun though.
 2020-09-30 03:57:50 -07:00
Sally Coolatta
2f6962c103 Correct player angle when respawning from crushing 2020-09-26 03:12:22 -04:00
Sally Coolatta
285ec3e08c Player death uses damage types 
- Fixed last place elimination not working (again)
- Replaces squishing from level geometry with good old fashioned crush death
 2020-09-25 16:31:10 -04:00
Sally Coolatta
b5fcd74ef9 Merge master 
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
 2020-09-25 12:00:50 -04:00
James R
c9e3281b99 Merge remote-tracking branch 'origin/master' into tinnitus 2020-09-25 01:57:08 -07:00
James R
c0abb2ca09 Don't let players change their name more than five times per minute 
(ported 2948885660 and 4e9d006c37)
 2020-09-22 12:04:28 -07:00
toaster
5da7722255 Fix the issue where skincolor and character (and inadvertedly, name changes and followers) would not be sent to the server, leading to the 0,0 Ashura bug. 2020-09-22 19:55:22 +01:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
James R
2948885660 Don't let players change their name more than five times per minute 2020-08-31 20:08:22 -07:00
Sally Coolatta
f11481fbe2 Move to D_RegisterServerCommands 2020-08-30 23:35:41 -04:00
Sally Coolatta
40b0a2479e Wrong file 2020-08-30 23:26:00 -04:00
Sally Coolatta
2d7c835c4d Dedicated servers can change discordinvites without needing RPC support 2020-08-30 23:20:06 -04:00
Sally Coolatta
376a41162b Minor fixes 2020-08-23 14:08:54 -04:00
James R
7194aa9ad6 Skip XD_DISCORD payload in non Discord builds 2020-08-22 16:26:15 -07:00
Sally Coolatta
8c79d62b22 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-22 07:28:21 -04:00
Sally Coolatta
38ec458903 Always have XD_DISCORD defined, so that people compiling without Discord support can connect to servers that do. 2020-08-22 05:03:08 -04:00
Sally Coolatta
b761349076 Add some options, maxplayer/allownewplayer dont need to be netvars anymore 2020-08-22 01:53:27 -04:00
James R
cedb09bd92 Fix pointers on LUA_Archive and LUA_UnArchive 
(servers joinable again)
 2020-08-21 19:47:53 -07:00
Sally Coolatta
3e446a167c Restructure how damage works in kart COMPLETELY 
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
 2020-08-19 00:55:36 -04:00
Sally Coolatta
7419cbde03 Fix Got_NameAndColor 2020-08-18 04:23:08 -04:00
Sally Coolatta
59ebf07dd5 Guard discord.h, add cvar to disable rich presence 2020-08-17 02:25:05 -04:00
Sally Coolatta
632df264a3 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-16 20:57:31 -04:00
Sally Coolatta
8fd64ca607 Fix ring usage & gravity 2020-08-16 02:12:17 -04:00
Sally Coolatta
a251c3909b Lots of little fixes 
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
 2020-08-16 00:29:04 -04:00
Sally Coolatta
a2caa2dc16 Character select can open without crashing 2020-08-15 22:40:49 -04:00
Sally Coolatta
30144d5d06 Things to get it to run 
Build is still MASSIVELY broken, you can't even get into a level, still investigating
 2020-08-15 20:09:36 -04:00
Sally Coolatta
631f698432 Cleanup 
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.

I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
 2020-08-15 08:32:56 -04:00
Sally Coolatta
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -04:00
Sally Coolatta
dfd733eb80 Up to screen.o 
Lots of renderer files I didn't need to touch at all here :)
 2020-08-15 00:55:30 -04:00
Sally Coolatta
c665393bd0 actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V 2020-08-14 21:21:17 -04:00
Sally Coolatta
2f2e813e52 m_anigif, m_cheat, m_cond, m_fixed 
Up to m_menu, and it's screaming, so I'm going to take a break :V
 2020-08-14 01:31:37 -04:00
Sally Coolatta
5319ef434e Compiling reaches g_demo.c again after the merge 2020-08-12 22:40:15 -04:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up 
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
 2020-08-11 16:13:17 -04:00
Sally Coolatta
a50a9a1843 Lots of splitscreen fixes 
LOTS of stuff I changed to use arrays instead of constantly duplicated code
 2020-08-10 23:38:32 -04:00
Sally Coolatta
c96bd5f64a Many removals 
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
 2020-08-10 21:45:51 -04:00
Sally Coolatta
a442b6a4f6 Fix up D_SRB2Main 2020-08-10 21:11:46 -04:00
Sally Coolatta
76241bb26b D_AddFile fixes 2020-08-10 20:35:17 -04:00
Sally Coolatta
7ac6723e46 gamecontrol has another index for player num, instead of being duplicated for players 2-4 2020-08-10 20:08:32 -04:00
Sally Coolatta
c3ca513445 Merge d_netcmd.c 2020-08-10 12:04:24 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Steel Titanium
913c07959e Kill CD support 2020-08-07 17:06:19 -04:00
James R
9077a4ff03 Kill MIDI 2020-08-07 12:39:08 -07:00
Sally Coolatta
178087289e Merge d_netcmd.c/h 2020-08-02 15:38:53 -04:00
James R
ed2d40b98e Unused parameter :) 2020-07-31 22:17:22 -07:00
Sal
21dfe49bf8 Merge branch 'antigrav-respawn' into 'master' 
Antigravity fixes, round 2

See merge request KartKrew/Kart!305
 2020-07-31 21:55:38 -04:00
Latapostrophe
b62ef5a51d Kill flipcam again but nothing else associated with it. 2020-07-26 21:15:32 +02:00
Latapostrophe
90cde7379c Revert "Push flipcam down the nearest staircase" 
This reverts commit 06d70c1f8e.
 2020-07-26 20:27:22 +02:00
Sally Coolatta
ba6d5e95ba Add Sneaker x2 to pad out the item table a bit better 
Jeck mentioned it, we agreed it might be a fun item because stacking sneakers is possible now
 2020-07-24 19:11:52 -04:00
Latapostrophe
06d70c1f8e Push flipcam down the nearest staircase 2020-07-24 16:17:07 +02:00
Steel Titanium
058b41a834 Port netticbuffer from Kart 2020-07-19 15:24:27 -04:00
James R
71189da020 Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master' 
Adds the branch name into the version command printout when outside of DEVELOP mode.

See merge request STJr/SRB2!981
 2020-07-11 01:48:38 -04:00
James R
f1648fbf5c Followers compiler warnings 2020-07-09 16:39:47 -07:00
Ashnal
8cfc3520e5 Connection screen no longer freezes up while 
searching for addons on disk
Game will run one tic after every file status is updated
 2020-07-01 23:48:14 -04:00
GoldenTails
0fbcd7a5d2 Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with 2020-06-27 10:56:15 -05:00
Zachary McAlpin
fbe3c1a122 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-25 10:31:55 -05:00
James R
34eeb98cc4 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
Zachary McAlpin
1b831c0bbe Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
Latapostrophe
cab9c2a139 Merge branch 'v2-master' into followme-internal 2020-06-07 23:56:32 +02:00
Sally Coolatta
136bb1d252 Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player 2020-06-06 19:45:13 -04:00
GoldenTails
663fcf5e61 Adds the branch name into the version command printout when outside of DEVELOP mode. 
Really just so I don't accidentally join netgames or record replays for vanilla SRB2 in the `next` branch...
 2020-06-06 04:12:27 -05:00
Latapostrophe
f33e4d62a0 Sort conflicts, fix misordered follower bubble states in dehacked 2020-06-05 02:33:39 +02:00
Sally Coolatta
f4c0011a76 Merge branch 'master' into grand-pricks 2020-06-04 14:41:56 -04:00
Latapostrophe
5412358fcf Fixed setting follower on title screen + mixed declarations 2020-06-03 01:23:32 +02:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
Sally Coolatta
086ea73c2f Merge branch 'master' into respawn-updates 2020-06-01 15:49:30 -04:00
LJ Sonic
05e8d12427 Merge branch 'next' into 'better-download' 
# Conflicts:
#   src/sdl/i_system.c
#   src/win32/win_sys.c
 2020-06-01 08:16:53 -04:00
Zachary McAlpin
8826eeeeb9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-29 15:32:59 -05:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Sally Coolatta
d062a35a3a Huge respawn overhaul 
- Moved respawn code to its own file
- Reorganized a lot of the code related to respawning
- As a result of the massive reorganization, I squashed several bugs. Most notably: mid-game joiners having weird spawns, being able to skip laps by respawning.
- Respawn lightsnake no longer takes you straight to your nextwaypoint -- it now has a minimum distance forward that it tries to put you at when you respawn.
 2020-05-29 01:04:51 -04:00
Sally Coolatta
20b2dabae9 Merge branch 'pet-robo' into grand-pricks 2020-05-25 12:44:59 -04:00
Sally Coolatta
4916516e2e Prevent duplicate skins, fix bots not being able to be disabled, change default to "off" 2020-05-24 17:12:58 -04:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Louis-Antoine
15d6a254e1 Add a command to list current file transfers 2020-05-20 00:24:53 +02:00
Sally Coolatta
0282615c38 Merge branch 'master' into pet-robo 2020-05-18 15:18:37 -04:00
Sally Coolatta
e51bceb567 Items respawn in GP 2020-05-13 03:04:33 -04:00
Sally Coolatta
fa5fccffc5 Implement lives system 
Lose a life & restart the current race if you place below the top half. Lose all of your lives, and you get kicked to the title screen.
 2020-05-13 02:14:39 -04:00
Sally Coolatta
249fff87ad Merge branch 'new-cars-movie' into colorize-tweak 2020-05-12 22:46:46 -04:00
Sally Coolatta
63797b35f7 Merge branch 'pet-robo' into grand-pricks 2020-05-12 22:40:02 -04:00
Sally Coolatta
1788d29263 Merge branch 'master' into pet-robo 2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f5d931cc Skincolor code cleanup 
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
 2020-05-11 02:28:25 -04:00
Sally Coolatta
4ae81ff236 Add menu for selecting cup & other options 2020-05-09 20:03:14 -04:00
Jaime Passos
a4d6addbca Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
Latapostrophe
3f43107eea Add Opposite option for followercolor 2020-05-09 12:12:29 +02:00
Zachary McAlpin
81f651a81e Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-09 00:05:05 -05:00
Sally Coolatta
d2172fc54b Bot amount & difficulty is now controlled by cvars 2020-05-07 02:37:06 -04:00
Latapostrophe
766f7f035f Let followers change colour separatly from players 2020-05-04 18:08:41 +02:00
Latapostrophe
59452ae026 Merge branch 'v2-master' into followme-internal 2020-05-04 12:52:47 +02:00
Sally Coolatta
ecb01ef83b Merge branch 'master' into pet-robo 2020-05-03 21:33:30 -04:00
Sally Coolatta
b9ff3403a9 Add missing netxcmdnames from james stuff 2020-05-03 21:32:12 -04:00
Sally Coolatta
cb12d1ebf8 Merge branch 'master' into pet-robo 2020-05-03 21:30:40 -04:00
Sal
5a56271392 Merge branch 'more-debug' into 'master' 
More item debug

See merge request KartKrew/Kart!185
 2020-05-03 21:16:58 -04:00
Latapostrophe
63485c3dbe Merge branch 'v2-master' into followme-internal 2020-05-03 22:37:26 +02:00
James R
a1502046cf Merge remote-tracking branch 'origin/master' into resume 2020-04-30 09:32:40 -07:00
James R
6613b19220 Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked 2020-04-26 01:16:27 -07:00
Louis-Antoine
ccf4bbe194 Add a minimum delay between connections 2020-04-24 14:05:15 +02:00
ThatAwesomeGuy173
3e37730545 Use "addons" instead of "add-ons" for consistency 2020-04-22 01:24:59 -06:00
James R
8490919257 Bye death fades 2020-04-19 22:06:22 -07:00
wolfs
4a264ffba9 Merge branch 'http-downloads' into 'awful-mix' 
Support for http downloads

See merge request SinnamonLat/Kart-Public!1
 2020-04-12 21:38:33 -04:00
Steel Titanium
4bfb583e91 Remove some of these superfluous ifdef checks. 
Allows compatibility with non-curl enabled builds.
 2020-04-12 15:07:39 -04:00
Zachary McAlpin
b6a2c21db7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-04-09 20:12:11 -05:00
James R
71f4433b98 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
Steel Titanium
5e0eca9fe9 Support for http downloads 2020-04-07 18:22:29 -04:00
James R
2e963a46f5 For fun, let the bots vote 2020-04-02 14:16:29 -07:00
James R
9bdebe51bf Fix a dumb warning 2020-03-31 16:54:20 -07:00
James R
6975de85b4 Call the substitution macro FOREACH 2020-03-31 16:45:36 -07:00
James R
1243d0940a Merge remote-tracking branch 'origin/master' into more-debug 2020-03-31 16:44:04 -07:00
Sally Cochenour
9e2c119b56 Merge branch 'master' into pet-robo 2020-03-29 20:44:13 -04:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
James R
61be09e6bf Merge remote-tracking branch 'origin/master' into gifs-port 2020-03-28 21:00:39 -07:00
Sal
eb9144338a Merge branch 'logs-port' into 'master' 
2.2 directory structure and log files port

See merge request KartKrew/Kart!224
 2020-03-28 22:16:50 -04:00
Sally Cochenour
ff621d3e46 Skins, rudimentary ticcmd building for bots 2020-03-28 12:39:27 -04:00
Sally Cochenour
e5ae9d1513 Merge branch 'master' into pet-robo 2020-03-28 08:43:40 -04:00
Sally Cochenour
657a15fae2 Merge branch 'master' into new-items 2020-03-28 00:23:39 -04:00
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
Zachary McAlpin
61447c20be Screw merge conflicts 2020-03-24 20:38:46 -05:00
Steel Titanium
e9110b660c Better directory structure 
(cherry picked from commit 8ee0a9309b289a1a3d1a7260a44a43c776180686)

# Conflicts:
#	src/m_menu.c
#	src/m_menu.h
#	src/m_misc.h
 2020-03-24 15:36:44 -07:00
Jaime Passos
d64dc5b2a8 Local Color Table for GIF movie mode 
(cherry picked from commit 5a330803ec5bea2ca7b6b30bf7972b11753b571d)
 2020-03-23 17:47:08 -07:00
toasterbabe
7a14bbba82 Disable colour profile influence on screenshots and gifs if you want. 
(cherry picked from commit 8b46ee76ff)

# Conflicts:
#	src/m_menu.c
 2020-03-23 16:35:38 -07:00
toasterbabe
fcc80b12ad Colour Cube Calibration Menu! (called "Advanced Color Settings" because No Fun Allowed...) 
https://cdn.discordapp.com/attachments/237798387070664724/304343382073933824/aa.png

Also, a "Reset all" button for the Monitor toggle menu, a ton of new cvars to match up with the colour cube calibration, and a bunch of variable renames related to colour cube operations.

(cherry picked from commit c3840ba01d)

# Conflicts:
#	src/m_menu.c
#	src/v_video.c
 2020-03-23 16:34:34 -07:00
toasterbabe
f5ecb1b9c9 Introducing the Colour Cube! https://cdn.discordapp.com/attachments/293238104096112641/304015171385294850/aa.png 
Basically in preperation of supporting colourblindness modes I implemented the following link when loading palettes.
http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter24.html

This basically means I can do whatever the hell I want to the colour profile of incoming paletties, and nobody can stop me. Muahahahaha etc.

Also, I added a saturation feature to show off its full potential, converted gamma from a table to a factor of the calculation, tweaked some menus and made the default value of cvars show up on sliders. Because that's how I roll.

(cherry picked from commit 83e16da83b)

# Conflicts:
#	src/m_menu.c
 2020-03-23 16:27:14 -07:00
James R
572bf314e5 Merge remote-tracking branch 'origin/master' into resume 2020-03-22 19:01:05 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -04:00
James R
0ee7456708 Fix shit 2020-03-22 14:45:21 -07:00
James R
cbd4693de7 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 14:34:29 -07:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
James R
7e0aa16e70 Reset Invincibility (and Grow) music to the start if stacked 
Toggleable via the resetspecialmusic cvar.
 2020-03-21 22:28:55 -07:00
James R
7023ccc239 Death fades music 
Cvars are respawnfademusicout and respawnfademusicback. Both measure
milliseconds.
 2020-03-21 22:28:55 -07:00
James R
911dd57334 Restore level music to where it left off 
Toggleable via the resume cvar.
 2020-03-21 22:28:55 -07:00
James R
8524c3749d Fade level music back in after Invincibility and Grow 
Cvars are invincibilitymusicfade and growmusicfade. Both measure milliseconds.
 2020-03-21 22:28:54 -07:00
Sryder
da2f1fc972 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/k_kart.c
 2020-03-21 23:27:55 +00:00
James R
c3b967468a Revert "Remove kartdebugitem" 
This reverts commit 803884c55a.
 2020-03-21 15:56:40 -07:00
James R
4a973e2906 Revert "...Also remove kartdebugamount" 
This reverts commit 22cb7451e9.
 2020-03-21 15:56:38 -07:00
James R
8a28d3cfe5 Replace some instances of int with fixed width types 2020-03-21 13:12:50 -07:00
James R
29ebf7ee60 Attempt to fix Sal's compiler warnings 2020-03-21 13:07:22 -07:00
James R
fd1cb69a87 Merge remote-tracking branch 'origin/master' into parties 2020-03-21 12:45:23 -07:00
Sal
68bec970a3 Merge branch 'viewpoint-text-toggle' into 'master' 
Option to hide/show viewpoint text

See merge request KartKrew/Kart!209
 2020-03-20 22:07:30 -04:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
SteelT
2e25a5b56d Merge branch 'viewpointswitch-fix' into 'next' 
Fix incorrect newdisplayplayer in forced ViewpointSwitch

See merge request STJr/SRB2!814
 2020-03-18 15:34:18 -04:00
Sally Cochenour
040865b589 Merge branch 'master' into new-items 2020-03-17 19:31:47 -04:00
Sally Cochenour
fa34e4eee4 Merge branch 'master' into sal-waypoints 2020-03-15 20:21:17 -04:00
Monster Iestyn
f3bfa2b1db Merge branch 'master' into next 2020-03-15 20:32:43 +00:00
LJ Sonic
21cb05b1f7 Merge branch 'fix-playernode-crash' into 'next' 
Fix buffer overrun with players with no associated node

See merge request STJr/SRB2!810
 2020-03-15 15:36:45 -04:00
Zachary McAlpin
564ecf4f0f Check if you are playing a game then execute `LUAh_GameQuit` if you are in Command_quit_f and Command_ExitGame_f 2020-03-15 10:34:43 -05:00
Zachary McAlpin
9ca79b4d8b Since exitgame shuts down the server if you are running a dedicated server I may as well allow the hook to run for the dedicated server as well 2020-03-15 00:54:06 -05:00
Zachary McAlpin
38d7ad3e6a Let's just call LUAh_GameQuit in Command_ExitGame_f during its execution if you are in game and are not a dedicated server 2020-03-15 00:28:41 -05:00
Zachary McAlpin
586c05389d Revert "Call LUAh_GameQuit in Command_ExitGame_f" 
This reverts commit 57dc2df60a.
 2020-03-12 22:31:48 -05:00
Zachary McAlpin
8b440bdafb Revert "Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game" 
This reverts commit 39934f1844.
 2020-03-12 22:31:39 -05:00
Zachary McAlpin
39934f1844 Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game 2020-03-12 20:51:16 -05:00
Zachary McAlpin
57dc2df60a Call LUAh_GameQuit in Command_ExitGame_f 2020-03-12 20:15:21 -05:00
Latapostrophe
403d30dc15 Merge branch 'no-cheese' into v1.2-frankeinstein 2020-03-10 20:34:38 +01:00
Latapostrophe
4dfb47dff6 Merge branch 'record-attack-changes' into v1.2-frankeinstein 2020-03-10 20:27:00 +01:00
Monster Iestyn
f186def0bf Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff 
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
 2020-03-09 13:54:56 +00:00
James R
70d46ebb0a Merge branch 'parties-only' into parties 2020-03-03 20:05:30 -08:00
James R
dd29a44ecc cancelinvite command to rescind a party invitation 2020-03-03 19:17:27 -08:00
Sally Cochenour
3633dc341a Merge branch 'master' into targets 2020-03-01 15:42:49 -05:00
LJ Sonic
e0f3a5b8f5 Merge branch 'lua-io' into 'next' 
Support for Lua's I/O library

See merge request STJr/SRB2!727
 2020-03-01 11:12:45 -05:00
Jaime Passos
ea756fd557 Make exitmove friendly, don't start empty intermission screens 2020-02-29 01:51:45 -03:00
Jaime Passos
9d0e3465f9 G_CoopGametype, for all the GT_COOP cases 2020-02-29 00:57:22 -03:00
Jaime Passos
d5f6e5fcc6 Race is Competition without the lives 2020-02-28 23:47:38 -03:00
James R
f9b5f71171 Merge branch 'gentlemen' into parties 2020-02-23 23:22:37 -08:00
James R
7fe61a99df More plurals 2020-02-23 23:21:20 -08:00
James R
dfe6d62d76 bruh 2020-02-23 23:21:20 -08:00
James R
fc1e4b5cc5 Just say "joined" so to not worry about plurals 2020-02-23 23:21:20 -08:00
James R
4f40edaf01 Maybe localdisplayplayers is a bad idea 2020-02-23 23:21:20 -08:00
James R
e235267f1d Improve feedback on party invitations 2020-02-23 23:20:20 -08:00
James R
110871c3b6 Void the party invitation once its accepted 2020-02-23 23:20:20 -08:00
James R
02757eac82 Fix and fully implement leaving parties 2020-02-23 23:20:20 -08:00
James R
46ac563eaf Implement big bad parties (splitscreen with network players) 
Use the 'invite' command to invite another player to your party.

If that player accepts, via the 'acceptinvite' command, they and any
splitscreen players on their machine will be added after the players
in your party. They may also use the 'rejectinvite' command.

Use the 'leaveparty' command to leave a party. You and any splitscreen players
on your machine will be removed from the party. Players after you will be
shifted to take your place on the splitscreen.
 2020-02-23 23:20:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
James R
352d576979 Don't turn off lagless at map start; draw LAGLESS in intermission 2020-02-23 23:07:57 -08:00
James R
56f6b058d0 Make host lag optional with "lagless", lag by default (lagless off) 2020-02-23 23:07:57 -08:00
Jaime Passos
48a9ea8d0e Turn players IT if they join the game after the hide time in tag gametypes 
Except in gametypes with hide time stasis, because they can't change team.
 2020-02-23 17:02:50 -03:00
Jaime Passos
1b9a6fed3e Same here 2020-02-23 16:46:45 -03:00
Jaime Passos
990df8e8c0 Consider Co-Op here as any campaign gametype 2020-02-23 16:45:01 -03:00
Jaime Passos
1d5f9ed292 Always allow skin switching in friendly gametypes 2020-02-23 16:40:52 -03:00
SwitchKaze
99a1840101 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
Jaime Passos
745a6bb0f0 Fix incorrect newdisplayplayer in forced ViewpointSwitch 2020-02-23 12:14:52 -03:00
James Hale
51137837c4 Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
Louis-Antoine
c785fc2132 Cleanup code a little 2020-02-22 02:21:27 +01:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine
a09d46a092 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io 2020-02-19 22:40:54 +01:00
Tatsuru
7f190f35f2 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
 2020-02-19 17:46:18 -03:00
Tatsuru
1463d8ba20 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
James R
ba9f866acf Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
James R
256c9a20db Merge branch 'local-color-table' into 'master' 
Local Color Table for GIF movie mode

See merge request STJr/SRB2!742
 2020-02-16 23:58:11 -05:00
James R
4415fb4c75 Merge remote-tracking branch 'origin/master' into next 2020-02-04 14:31:21 -08:00
James R
937f18dee7 Remove Player 0 2020-02-01 18:22:03 -08:00
James R
9192e1eade Clean player name before joining!!! 2020-02-01 18:20:35 -08:00
James R
a65e8ab500 Add missing conditions to CleanupPlayerName 2020-02-01 18:11:41 -08:00
Latapostrophe
9d848db7c1 How can you look at yourself in the mirror? 2020-01-29 22:33:00 +01:00
Jaime Passos
5f7cf83da8 Local Color Table for GIF movie mode 2020-01-29 13:47:55 -03:00
Louis-Antoine
6d42930c8e Update Lua I/O support to 2.2 2020-01-22 23:08:57 +01:00
Louis-Antoine
a997683d1c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2020-01-22 03:57:22 +01:00
Louis-Antoine
c2682ac1b6 Let clients rejoin the server without losing their status 
This is accomplished by simply preserving
the player's body after disconnecting.

Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.

Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.

From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.

Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.
 2020-01-22 03:05:08 +01:00
Tatsuru
38ca47891a Turn cv_exitmove on by default 2020-01-19 21:56:53 -03:00
Tatsuru
065b8adf42 In-map visual indicator 2020-01-19 19:02:03 -03:00
Alam Ed Arias
43a78e6821 Merge branch 'master' into next 2020-01-17 11:12:10 -05:00
James R
73852fc767 Update buffer for SendNameAndColor 2020-01-14 21:40:58 -08:00
James R
7daf24fcb8 Merge remote-tracking branch 'origin/master' into next 2020-01-12 14:17:52 -08:00
LJ Sonic
fd18f1cb7f Merge branch 'fix-node-player-mixups' into 'master' 
Fix node player mixups

See merge request STJr/SRB2!684
 2020-01-12 15:57:20 -05:00
Louis-Antoine
82876c2eff Replace all instances of XD_KICK with a SendKick function 2020-01-12 19:43:04 +01:00
Tatsuru
445269ce14 Expose colorization to mappers and SOC 2020-01-11 20:40:57 -03:00
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart
ce0c42a767 Merge branch 'newcontrols' into next-newcontrols 2020-01-04 09:56:24 -06:00
fickleheart
992ead1c85 Merge remote-tracking branch 'origin/master' into newcontrols 2020-01-04 09:35:12 -06:00
Alam Ed Arias
caa7f52f7f Merge branch 'master' into next 2020-01-03 14:56:37 -05:00
LJ Sonic
3ae44063f1 Merge branch 'ungrab-mouse-in-menus' into 'master' 
Let the mouse move freely when a menu is open or game is paused

See merge request STJr/SRB2!617
 2020-01-02 18:48:38 -05:00
Louis-Antoine
61a681ed02 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
James R
b342301373 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:39:05 -08:00
James R
6ea83c74c3 Merge branch 'nohw-renderswitch' into 'master' 
NOHW V.S. Renderer Switching

See merge request STJr/SRB2!609
 2020-01-01 17:52:35 -05:00
James R
b8f465408b Merge branch 'warp-by-name' into 'master' 
Properly fix the issue that !528 tried to; let the -warp parameter work with map name

See merge request STJr/SRB2!596
 2020-01-01 17:51:21 -05:00
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2019-12-31 12:58:36 -06:00
James R
ec72c69614 Make the menu option for renderer switching transparent under NOHW 2019-12-30 21:45:19 -08:00
Jaime Passos
585db9fe2d Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 18:39:31 -03:00
fickleheart
4a2492e8e1 Fix camera reset button 2019-12-30 15:34:43 -06:00
James R
67ca512120 Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
fickleheart
758bb8f3ae Update playstyle menu handling to use analog/directionchar combo 2019-12-30 15:15:37 -06:00
fickleheart
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
fickleheart
be9384ddd9 Merge branch 'master' into newcontrols 
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/g_game.h
#	src/m_menu.c
 2019-12-30 10:47:09 -06:00
James R
3883d44bb5 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08:00
James R
08016fbdca Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08:00
Jaime Passos
142875cf3d Fix CoopLives_OnChange. 2019-12-27 17:15:23 -03:00