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
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
Jaime Passos
ff80c4ef4d Preparing for the inevitable gametype rule that will handle cooplives... 2019-12-27 17:08:20 -03:00
Jaime Passos
f55b4bf6ad Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
Jaime Passos
c832d26ee9 ViewpointSwitch improvements. 2019-12-23 20:22:57 -03:00
Jaime Passos
100144d4db Merge remote-tracking branch 'origin/master' into gametype-clownery 2019-12-23 18:21:13 -03:00
James R
74bd973616 Merge branch 'better-deadzone' into 'master' 
Better Deadzones

See merge request STJr/SRB2!541
 2019-12-20 17:33:29 -05:00
Jaime Passos
861fa5bb23 Remove this debugging command, as I don't need it anymore. 2019-12-19 00:15:19 -03:00
Jaime Passos
e47f171533 TeamSwitch hook for Lua 2019-12-18 23:40:58 -03:00
Jaime Passos
35f783ab24 GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes 2019-12-18 20:12:52 -03:00
Jaime Passos
97db6162e8 point limit/time limit 2019-12-18 19:43:12 -03:00
Jaime Passos
dcc8cdc143 Ringslinger tweaks 2019-12-18 19:26:45 -03:00
Jaime Passos
c408cef81b GTR_NOSPECTATORSPAWN 2019-12-18 14:47:39 -03:00
Jaime Passos
30be9e29e5 NUMGAMETYPES vs gametypecount 2019-12-18 12:30:01 -03:00
Jaime Passos
c11865e7e9 G_NewGametype 2019-12-18 12:23:42 -03:00
Jaime Passos
ecf9bdda4e There are only so many bits 2019-12-18 12:14:18 -03:00
Jaime Passos
448494e19b More gametype rules yay!! 2019-12-18 01:54:45 -03:00
Jaime Passos
d7cb14d38e Gametype rules draft, mind the debug command 2019-12-18 01:25:57 -03:00
Jaime Passos
1002c47407 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Sryder
b4e8f71acb Port the deadzone cvar stuff from kart. 
Add menu items for deadzone.
 2019-12-15 15:36:13 +00:00
fickleheart
17c3ef073e Add analog deadzone option separate from digital deadzones 2019-12-14 19:41:54 -06:00
fickleheart
603d52a723 Allow setting center view to a toggle 2019-12-14 19:17:41 -06:00
fickleheart
4cc0bb4746 Add boss target assist and finally organize camera options 2019-12-12 00:48:15 -06:00
James R
66524a1e3f Maybe I'm mistaken but this probably isn't needed 2019-12-11 16:14:06 -08:00
fickleheart
f886eb3a3c Add option to always turn with input while locked 
Uhhh also camera options scrolls now.
 2019-12-10 22:01:17 -06:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
fickleheart
8ce189dcba Give spindash turn a separate slider 2019-12-10 08:07:41 -06:00
fickleheart
26ab979bdb Port deadzone configuration from Kart 
I don't feel like getting out my gamepad, so I'll trust
that this works.
 2019-12-09 20:39:05 -06:00
fickleheart
eaef39c974 Shift camera sideways toward player angle 2019-12-08 15:54:16 -06:00
fickleheart
98b6fc3adf Automatically rotate camera to reflect player actions 2019-12-08 14:35:50 -06:00
fickleheart
4f71096ba5 Add cvar to use abilities in input direction 2019-12-08 14:17:48 -06:00
MascaraSnake
fffd385151 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright
dc011d2fd3 Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode 2019-12-05 12:36:25 +08:00
toaster
49de43afaf Change the default value of cv_coopstarposts (as per #321), and make it NOT a cheat to change since the other options are in effect more restrictive. (Leaving cv_cooplives at its current value for now, though.) 2019-11-26 12:37:57 +00:00
toaster
e0c6fe7326 Woops 2019-11-24 15:19:15 +00:00
toaster
3f40c7e4a7 * Resolve #345. 
* Prevent skincolours from being reset to the skin's prefcolour, but only for not-always-usable characters.
 2019-11-24 13:24:37 +00:00
MascaraSnake
62ae268a29 Merge branch 'menu-reordering' into 'master' 
Menu reordering (also renaming secrets to extras)

See merge request STJr/SRB2Internal!511
 2019-11-23 17:51:46 -05:00
sphere
da90ebcdfb fuck autocomplete 2019-11-22 04:12:38 +01:00
sphere
693d6b5ca5 Rename "secrets" to "extras". 2019-11-21 01:34:32 +01:00
James R
65ce4cab26 Warn if gametype number is out of range to map command 2019-11-19 12:32:02 -08:00
James R
edea7b2a10 Check for out of range gametype on map change 2019-11-19 12:25:50 -08:00
MascaraSnake
abdfc2d237 Merge branch 'exit-move-lj' into 'master' 
Post-exit movement

See merge request STJr/SRB2Internal!486
 2019-11-18 15:10:15 -05:00
Steel Titanium
b1f39e836d Better ping implementation. 2019-11-17 20:22:47 -05:00
Louis-Antoine
658fd6e052 Disable exitmove by default 2019-11-17 23:52:51 +01:00
James
94a00bb497 Option to hide/show viewpoint text 2019-11-16 16:28:48 -05:00
MascaraSnake
3b3441ca40 Merge branch 'clearer-nodes-command' into 'master' 
Make the "nodes" command clearer

See merge request STJr/SRB2Internal!477
 2019-11-16 12:53:31 -05:00
James R
d2cd9e7239 Remove defaultname, since players are probably sure on their name change 2019-11-15 17:32:43 -08:00
James R
1c2eb88163 Don't confuse node with player in commands 
(cherry picked from commit 17bdf39dc8372ed9c6c31fa8d00eba03396a55bf)
 2019-11-15 16:07:15 -08:00
Louis-Antoine
d3b113c84a Merge branch 'master' into exit-move-lj 2019-11-15 19:35:47 +01:00
Louis-Antoine
28b0b7c404 Let players move after completing the level 
This only takes effect in co-op,
and can be disabled with "exitmove off"
 2019-11-15 15:35:28 +01:00
MascaraSnake
0de24336ed Merge branch 'map-by-name' into 'master' 
LJ saved me from self destruction by bad code

See merge request STJr/SRB2Internal!463
 2019-11-14 18:06:52 -05:00
Louis-Antoine
7ca4184cb2 Allow item respawn in co-op again 
Why was it even disabled anyway.
 2019-11-14 16:37:09 +01:00
James R
9290fa7e20 Warn if the gametype is not valid at all! 2019-11-13 14:31:44 -08:00
James R
85b6b307e8 Optimizations from LJ and generic functions 2019-11-13 14:26:28 -08:00
MascaraSnake
302e122d64 Merge branch 'map-by-name' into 'master' 
New map command

See merge request STJr/SRB2Internal!424
 2019-11-13 13:45:36 -05:00
MascaraSnake
d648a2ad87 Merge branch 'radiomode' into 'master' 
Radio mode

See merge request STJr/SRB2Internal!443
 2019-11-13 04:16:38 -05:00
James R
6ee9c029e4 Warn if the first argument is an option 2019-11-12 18:29:42 -08:00
James R
83d31c782b Get map name from multiple arguments 
(This means you don't need quoting.)
 2019-11-12 17:42:54 -08:00
James R
f7e879da06 So you don't like macros? 2019-11-12 16:10:00 -08:00
Jaime Passos
845b82668b Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
toaster
f7c5774b7e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 
# Conflicts:
#	src/p_user.c
 2019-11-12 21:56:46 +00:00
MascaraSnake
fae4fb16e9 Merge branch 'internal-md3-vanilla-c' into 'master' 
Internal MD3 merge 2 good riddance glBegin

See merge request STJr/SRB2Internal!362
 2019-11-12 15:44:20 -05:00
toaster
a8169e3844 Sound test is cool now! 
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif

* Port MUSICDEFs from Kart.
    * Safe to modify without modifying game, so we can put it in music.dta eventually.
    * "Title", "AltTitle", "Authors" fields are self-evident.
    * "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
    * "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
    * Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
    * Now called "V_DrawStretchyFixedPatch".
    * "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
    * Available to Lua under v.drawStretched!
    * Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.

Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
 2019-11-05 16:23:46 +00:00
toaster
2a16cf539a Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c 
Merge seems fine, but won't compile for some reason.
 2019-11-02 18:34:12 +00:00
toaster
22b413e84c * Improve the Metal Sonic recording/playback system. 
* Make the skin to record with Metal rather than Flesh Sonic. (Allowed even if not unlocked!)
    * Make the object that plays back the recording actually use the Metal skin, rather than just a seperate spriteset. (The boss will still need the spriteset, though.)
    * Actively record the player's sprite2, frame, and followmobj, just like regular ghosts do.
    * Disable dashmode while recording, for a fairer race.
    * Fix a probably long-standing bug where, while recording, being "hurt" would get Metal stuck in pain frames until they physically left the area of hurt.
    * Always start Metal recording in wait frames for bonus taunting.

Other relevant changes:
* Increment DEMOVERSION *again*.
* Improve the Record Attack ghost followmobj recording to accomodate Metal's jet.
* Increase the datatype width of spritenum_t read/write for Record Attack ghosts because SUGOI 4: Back With A Revengance will probably also use more than 255 sprites alone.
* Return to standing frames (or prolong them if you're in them, rather than going to wait frames) if the player rotates on the spot with enough force.
    * This was specifically done *for* Metal recording, but I decided it looked good enough to enable all the time.
 2019-10-28 22:12:47 +00:00
James R
5b90586f0d :oh: 2019-10-27 14:29:13 -07:00
James R
ab57df909b Fix minor unnecessary call 2019-10-27 14:25:20 -07:00
James R
08ad257e17 Extend map name text matching code into a function 2019-10-27 14:23:03 -07:00
James R
658c1e82d0 Add support for custom keywords 
For now, 32 characters separated by spaces.

Also fixed a SIGSEGV from an empty level title.
 2019-10-27 14:10:26 -07:00
James R
b3f9bce439 Overhaul the map command 
Added support for map names, matched by substring and keywords too!
Added support for two digit MAP codes without the MAP part.
Added support for decimal map number. (But who cares.)

Gave a better description of command.
Supported abbreviated optional parameters.

And now REALLY detects incorrect parameters.
 2019-10-27 14:02:36 -07:00
toaster
4334384855 Fix bot showing up in NiGHTS stages with a two-pronged approach. 
* Sometimes, D_MapChange is passed a mapnum of -1, to complete an existing mapchange. Don't handle botingame checks when that happens.
* Disable charsel on secret level platter when selected map is a NiGHTS stage, since gameplay will be identical across characters (consistent with NiGHTS Attack).

Also:

* Replace IT_DYBIGSPACE hack in M_SetupChoosePlayer, and replace with a more direct workaround system for not being able to select characters before warping.
 2019-10-27 12:20:17 +00:00
TehRealSalt
90b4ce8e58 Merge branch 'master' into sal-waypoints 2019-10-25 23:36:02 -04:00
TehRealSalt
addb0d0a66 Fix time limit 2019-10-25 23:35:31 -04:00
MascaraSnake
a039814673 Merge branch 'set-name-on-join' into 'master' 
Set the player's name as soon as they enter the game

See merge request STJr/SRB2Internal!397
 2019-10-25 15:38:21 -04:00
MascaraSnake
2004577314 Merge branch 'james-kart' into 'master' 
My changes to Kart

See merge request STJr/SRB2Internal!406
 2019-10-25 15:36:40 -04:00
MascaraSnake
7c9c2553b2 Merge branch 'kartport_namedvalues' into 'master' 
Kart-port - Named cvar values + Improved "HELP" command (round 3)

See merge request STJr/SRB2Internal!388
 2019-10-25 15:32:56 -04:00
TehRealSalt
b69d105af3 Add respawn animation 
This commit also fixes MF_NOCLIP not working properly on players. Sink now spawns an SPB explosion on successful hit, since dying is no longer a harsh punishment.
 2019-10-24 16:35:39 -04:00
toaster
1305c1cde8 Disable tailsbot in NiGHTS maps, not just Special Stages. (Resolves #261) 2019-10-24 19:16:53 +01:00
TehRealSalt
674c0aec17 Merge branch 'master' into new-items 2019-10-24 10:08:37 -04:00
James R
96a12b6bed 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-10-22 21:15:20 -07:00
James R
4f5d32a73f "NEWPING" might as well be the only ping 2019-10-22 19:39:26 -07:00
TehRealSalt
4feed0decc Merge branch 'master' into sal-waypoints 2019-10-22 17:06:38 -04:00
Louis-Antoine
209a883821 Set the player's name as soon as they enter the game 2019-10-19 17:09:18 +02:00
TehRealSalt
c963a49542 Try fixing Auto causing desyncs 
- Move K_SetPowerLevelScrambles to G_DoCompleted
- Fix wrong gamespeed being displayed in strings
- Add defines for kartspeed values
- Disable Easy scrambles again
- Corrupt gamedata if pwrlv is in invalid range (gets corrected in-game, and doesn't really matter to anyone who knows what you're doing, but it'll stop at least the most basic script kiddie)

Replay menu will still display wrong speed name, but it's fine in the replay itself.
 2019-10-17 23:43:06 -04:00
toaster
ec20d04e6f Compile fix. 2019-10-16 17:39:38 +01:00
toaster
036c6aa829 Just revert the respawn, retry and suicide stuff cuz it's apparently contentious. Who knew? 2019-10-16 17:38:38 +01:00
toaster
3e3ee8717f Merge retry and respawn into one command, respawn. 2019-10-16 11:38:09 +01:00
TehRealSalt
e7d0fde5fd Merge branch 'master' into sal-waypoints 2019-10-15 21:34:41 -04:00
TehRealSalt
d1c20c2a5a Don't allow finish lines to be hit multiple times per tic 2019-10-15 21:30:23 -04:00
toaster
69d43435f5 Improved "HELP" command! 
Ported from Kart, original commit also by me (toaster).
 2019-10-15 13:36:04 +01:00
toaster
021f493664 Quick macro substitution to make sure MAXSCORE is consistent. 2019-10-15 11:55:40 +01:00
toaster
8bab035279 Added some examples of cvars that can use named values. 
* Pandora's box now has infinite lives show up as "Infinite" instead of "-1".
* `pointlimit None`
* `timelimit None`
* Ported `basenumlaps` (with "Map default" value) from Kart to replace `usemaplaps`, for if Circuit ever gets shown any love ever again.
* `respawndelay Off`
* `resynchattempts Don't`
 2019-10-15 11:49:37 +01:00
MascaraSnake
ea6b6be758 Merge branch 'bogus_requestskin' into 'master' 
Fix bogus "requested skin not found!" print

Closes #247

See merge request STJr/SRB2Internal!373
 2019-10-13 11:07:59 -04:00
toaster
176ee4499f Fix "requested skin not found!" print happening whenever you select an unlockable character. 
Also, since I'm less paranoid now - readd the skin number to its print.
 2019-10-13 15:10:19 +01:00
toaster
fd1a880805 On the recommendation of Sryder, revert everything relating to the cpusleep changes except for the new default value of 1. 2019-10-13 13:12:07 +01:00
toaster
6a045930fa Better cpusleep command. Sal said it better than I can, so in her words: 
* Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
* New minimum is 0, since -1 just did the exact same thing as 0 except slightly more optimized.
 2019-10-13 12:05:12 +01:00
James R
22cb7451e9 ...Also remove kartdebugamount 2019-10-07 13:35:07 -07:00
James R
803884c55a Remove kartdebugitem 2019-10-07 13:12:22 -07:00
James R
392aec38f8 Rename kartdebug_giveitem to kartallowgiveitem 2019-10-07 13:11:14 -07:00
James R
833c8e2bed Give item command 2019-10-07 12:42:08 -07:00
James R
15dc57c4ba Allow name in kartdebugitem 2019-10-07 12:41:49 -07:00
Jaime Passos
09c9714daf Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-10-06 17:40:41 -03:00
TehRealSalt
d10e4aebac Fix a few messups due to the merged cvars 2019-10-03 11:22:58 -04:00
TehRealSalt
3d5676d4d6 atoi 2019-10-03 10:16:10 -04:00
TehRealSalt
a5ea6a9799 Merge speed/encore scrambles into the normal cvars as an "auto" option 2019-10-03 01:48:16 -04:00
TehRealSalt
c6566ec31a Merge branch 'master' into versus-record 2019-10-03 01:32:59 -04:00
Jaime Passos
e95bd8add3 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Steel Titanium
cecbf95002 Various of changes 
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
 2019-09-23 22:46:44 -04:00
TehRealSalt
9072f233eb Remove a few more magic numbers 2019-09-23 08:31:36 -04:00
TehRealSalt
38bb44e732 Separate into k_pwrlv.c, add defines to reduce amount of magic numbers 2019-09-23 08:26:42 -04:00
TehRealSalt
9e587f4d0d Put prints behind CONS_Debug 2019-09-23 07:26:36 -04:00
TehRealSalt
77aeb4663b Merge branch 'master' into versus-record 2019-09-23 07:03:56 -04:00
toaster
931f872467 Merge branch 'betterdirs' into 'master' 
Better directory structure

See merge request STJr/SRB2Internal!321
 2019-09-20 11:36:56 -04:00
TehRealSalt
b8a752e40a Merge master 2019-09-18 21:47:11 -04:00
Nev3r
2b0a0dd90f Merge branch 'deathstuff' into 'master' 
Lots of death stuff

Closes #207

See merge request STJr/SRB2Internal!306
 2019-09-16 16:32:45 -04:00
toaster
ccc1144a27 Merge branch 'luabanks' into 'master' 
Lua save-banks!

See merge request STJr/SRB2Internal!295
 2019-09-16 07:56:49 -04:00
TehRealSalt
1ef09699d1 Functional gameplay 
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score

Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
 2019-09-15 20:19:48 -04:00
Jaime Passos
0d11dd516a Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-09-15 16:24:24 -03:00
toaster
41727318ff Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-09 15:25:48 +01:00
Jaime Passos
398b320aec initial stuff 2019-09-08 18:27:35 -03:00
Monster Iestyn
361fbf8f6a Merge branch 'mprelated-tweaks' into 'master' 
Various improvements and changes to multiplayer menu

See merge request STJr/SRB2Internal!300
 2019-09-08 16:45:14 -04:00
toaster
abcf4f82ad Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-08 18:00:25 +01:00
Steel Titanium
414bff33bf Better directory structure 2019-09-08 01:29:09 -04:00
Steel Titanium
16b17840d9 2D toggle command 2019-09-06 20:51:39 -04:00
Latapostrophe
1d66d8e213 replay freecam + enhancements 2019-09-05 23:24:23 +02:00
Jaime Passos
24d08edf05 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-09-02 20:27:50 -03:00
Latapostrophe
aeb89fbdf3 shorten RA intro & allow to restart with pause 2019-09-01 23:04:07 +02:00
toaster
0700ad229f Lots of death stuff. 
* Genesis-style love and attention to the death event.
	* Only visibly decrement lives/rings when you're respawning (or game over, see below).
	* Faster no-button-press respawn.
* Game Over specific love.
	* Animation of Level Title font coming in from the sides.
	* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
	* Change gameovertics to 10 seconds instead of 15.
	* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
	* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.

Also, two not-quite death things which nonetheless were relevant to change:

* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
 2019-09-01 15:55:23 +01:00
Steel Titanium
2fc5ee0ec3 Move some cvars out of D_ClientServerInit and save them 
Ported over from Kart
 2019-08-26 20:38:32 -04:00
toaster
8b045a8f15 Lua save-banks! 
* Array of 8 INT32's natively embedded into savedata (net and SP)!
* Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game.
* Requires reservation to avoid clobber-conflicts.
    * Access via `reserveLuabanks()` - returns a read-write userdata.
    * Assign userdata to local variable or global rawset to use later.

Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
 2019-08-24 18:25:27 +01:00
Monster Iestyn
ebfa40c004 Merge branch 'mi-cleanup-returns' into 'master' 
MI cleanup returns

See merge request STJr/SRB2Internal!292
 2019-08-20 09:35:36 -04:00
Monster Iestyn
0b6a463cff Merge branch 'public_next' 
# Conflicts:
#	src/config.h.in
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/doomdef.h
#	src/p_map.c
#	src/p_maputl.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
 2019-08-20 13:54:48 +01:00
Monster Iestyn
42eaa1ed39 Merge branch 'netcode-exploits' into 'next' 
Fix an exploit where players could steal the final hash of a login

See merge request STJr/SRB2!508
 2019-08-17 14:05:20 -04:00
James R
abf06098da Include md5.h 2019-08-17 10:34:19 -07:00
James R
f69983c010 Kart discrepancies 2019-08-17 10:33:14 -07:00
Monster Iestyn
79acd0ff10 Initialise player_names[] in D_RegisterClientCommands such that we don't need to have to manually update it if MAXPLAYERS ever changed 2019-08-12 15:18:36 +01:00
Sryder
0f7a704444 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/p_spec.c
 2019-08-10 11:41:49 +01:00
mazmazz
4ac4034eb9 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-08-04 21:33:13 -04:00
Latapostrophe
ec1272dd14 remove join passwords 2019-08-04 11:26:26 +02:00
James R
374af9a322 Merge remote-tracking branch 'pub/master' into public-master 2019-07-17 12:33:20 -07:00
James R
6fdfd3b90c Don't send login final hashes to everyone 
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.

P.S. The netcode is LOL XD by VincyTM -Telos
 2019-07-15 16:14:00 -07:00
Jonas Sauer
b7c783223a Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
 2019-07-13 01:42:03 +02:00
MascaraSnake
9f666e125e Merge branch 'master' into thinkerlists 
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
 2019-07-02 23:08:37 +02:00
mazmazz
14df513db6 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla 2019-06-29 17:51:30 -04:00
mazmazz
3a4b26a61c Merge branch 'md3-vanilla' into internal-md3-vanilla 2019-06-29 15:02:50 -04:00
mazmazz
11955ba838 Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-06-29 15:02:07 -04:00
Monster Iestyn
0368689e27 Merge branch 'public_next' 2019-06-22 22:44:42 +01:00
Monster Iestyn
1e29d627f0 Merge branch 'make-credits-great-again' into 'next' 
Prevent just anyone from skipping credits but allow admins

See merge request STJr/SRB2!478
 2019-06-22 16:13:04 -04:00
James R
8faff03f31 Index displayplayers correctly 2019-06-10 14:24:11 -07:00
Sryder
622c2eac07 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/k_kart.c
 2019-06-02 18:15:30 +01:00
TehRealSalt
31534fe96b Merge branch 'master' into versus-record 2019-05-29 22:23:17 -04:00
Sryder
43936013f7 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/d_netcmd.h
#	src/k_kart.c
#	src/p_setup.c
 2019-05-25 12:09:47 +01:00
TehRealSalt
480d56838f Add cvars to prevent issues 2019-05-20 00:50:44 -04:00
Latapostrophe
c54cc42e74 Add command to disable followers clientside 2019-05-13 19:53:17 +02:00
TehRealSalt
5c3cac52e6 Merge branch 'master' into rings 2019-05-12 15:28:15 -04:00
Latapostrophe
a0e27c22e7 make followers work with replays 2019-05-12 13:41:46 +02:00
Latapostrophe
c83127293b resolve conflict in m_menu 2019-05-12 10:48:54 +02:00
wolfy852
9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1 
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
 2019-05-12 03:40:02 -05:00
Latapostrophe
1a7af92d9f fix being unable to remove follower outside of netgames 2019-05-12 10:34:10 +02:00
wolfy852
54d61b188c Have "None" work as an alias for -1 2019-05-12 03:07:17 -05:00
wolfy852
e4af44956b Merge remote-tracking branch 'remotes/pub/next' into followme 
# Conflicts:
#	src/r_things.h
 2019-05-11 02:05:58 -05:00
wolfy852
1b7d7cabdf Correct a merge mistake 2019-05-07 02:06:59 -05:00
TehRealSalt
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -04:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
 2019-05-06 22:40:12 -05:00
TehRealSalt
d82fa7eb60 Merge branch 'v1' into no-limits 2019-05-06 21:55:33 -04:00
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
wolfy852
f808072937 Merge remote-tracking branch 'remotes/pub/next' into v1 
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/hw_main.h
#	src/m_menu.c
#	src/r_main.c
#	src/v_video.c
 2019-05-06 14:26:09 -05:00
wolfy852
4eb2a7d2eb Merge remote-tracking branch 'remotes/pub/master' into next 2019-05-06 14:17:02 -05:00
wolfs
741f48132a Merge branch 'newping' into 'master' 
New ping command

See merge request KartKrew/Kart-Public!123
 2019-05-06 15:12:56 -04:00
TehRealSalt
8f4d93995b Merge v1 2019-05-02 17:51:54 -04:00
mazmazz
f9354289ba Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-05-02 17:43:40 -04:00
Sal
7c0d0d4cb1 Merge branch 'save-d_clisrv-cvars' into 'master' 
Register showjoinaddress after the config loads and match some other cvars to its behavior

See merge request KartKrew/Kart-Public!135
 2019-05-02 10:04:45 -04:00
TehRealSalt
f1f664e9b1 Merge v1 2019-05-02 01:36:19 -04:00
TehRealSalt
3a707c093b Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5 2019-05-01 23:30:53 -04:00
toaster
9e24d4aba7 Completely untested -encore parameter for the map command; inverts cvar value. 2019-04-28 19:26:11 +01:00
James R
fd251ed29f Move some cvars out of D_ClientServerInit and save them 2019-04-27 17:30:39 -07:00
TehRealSalt
435862b29d finished scrambles 2019-04-26 13:34:30 -04:00
TehRealSalt
6f6bc3333f Put behind cvar 2019-04-23 01:10:16 -04:00
Nev3r
09ff071656 Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks 
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 16:39:57 +02:00
Nev3r
345984a396 Fix mobj list iteration oversights. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 12:58:22 +02:00
Nev3r
baeda5060c Basic multiple thinker list implementation 
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 22:39:22 +02:00
TehRealSalt
ea2bcb3b99 Update from master 2019-04-19 20:14:06 -04:00
TehRealSalt
089be795a2 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
7253f0e499 Strip out things that limit wad files added by filename 2019-04-17 23:09:10 -05:00
fickleheart
25f55b6351 Add VHS pause/rewind effect 2019-04-08 23:21:11 -05:00
James R
03c27101df "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
TehRealSalt
2d92fcee46 Better speedometer 
Better graphics, appears in Battle, and has a new percentage mode ala Sonic Drift 2
 2019-04-08 16:39:06 -04:00
Wolfy
2c21b62f65 Merge remote-tracking branch 'remotes/public/master' into followme 2019-04-06 13:48:46 -05:00
fickleheart
c466412902 Begin work on playback menu 2019-04-05 02:38:48 -05:00
Monster Iestyn
6827688575 Merge branch 'public_next' 2019-04-02 15:49:15 +01:00
Monster Iestyn
4f58d00eec Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
Steel Titanium
e47854880a Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-27 19:18:51 -04:00
James R
841daf940f Don't close console when changing map 2019-03-26 13:04:11 -07:00
James R
0c112e92e8 Prevent just anyone from skipping credits but allow admins 
exitlevel works too
 2019-03-25 16:19:40 -07:00
fickleheart
8d9462d4aa Refactor replay saving handler for later use 2019-03-24 21:55:08 -05:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
fa28feb8db 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
be458c1d05 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
5d059da843 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
TehRealSalt
40093a9213 Merge branch 'master' into rings 2019-03-12 01:27:11 -04:00
fickleheart
5c4c0a5ff6 Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00