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
