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
TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
TehRealSalt
06d27ae36e
Merge branch 'master' into fortnite
2019-09-27 06:36:11 -04:00
Sal
39115db560
Merge branch 'sky-improvements' into 'master'
...
Sky improvements
See merge request KartKrew/Kart!174
2019-09-27 03:06:51 -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
b8a752e40a
Merge master
2019-09-18 21:47:11 -04:00
TehRealSalt
47da526313
Use texture names instead of predesignated sky numbers
2019-09-18 19:29:28 -04:00
TehRealSalt
31534fe96b
Merge branch 'master' into versus-record
2019-05-29 22:23:17 -04:00
TehRealSalt
c6a0a41d1a
Model tilts
...
- Add modeltilt variable, for more manual control of the model tilting. By default this just copies standingslope, but doesn't get cleared in the air.
- Shadows & trailing bananas now tilt to match the ground they are on.
- Rocket Sneakers & afterimages now tilt to match the player's current orientation.
2019-05-28 17:21:22 -04:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
TehRealSalt
e59a7175be
Fix skin shit
2019-05-02 00:39:49 -04: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
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
fickleheart
93bd5b61c9
Fix bad merge in map data archiving code
2019-03-16 14:56:56 -05:00
TehRealSalt
6aa55bdbe2
Merge remote-tracking branch 'kartpublic/next' into fortnite
2019-03-11 13:49:12 -04:00
Sal
6db91223cf
Merge branch 'minor-item-tweaks' into 'next'
...
Assorted item tweaks
See merge request KartKrew/Kart-Public!85
2019-03-07 21:24:51 -05:00
wolfy852
17d7c536de
Merge branch 'master' into next
2019-03-07 00:23:17 -06:00
James R
99d2af5669
Check that lumps are okay
2019-03-04 22:13:22 -08:00
Sally Cochenour
12dd8e49c0
Merge branch 'next' into minor-item-tweaks
2019-02-22 19:30:52 -05:00
James R
f8928300ec
Rename splitscreen member to something more meaningful
2019-02-22 15:57:44 -08:00
James
4f9109501e
Hyu b gone
2019-02-19 23:15:31 -05:00
james
76f2df2c40
Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t
2019-02-16 23:25:50 -08:00
Sally Cochenour
b2d2d64323
Merge branch 'master' into fortnite
2019-02-04 20:01:20 -05:00
fickleheart
d9f1345701
[HACK] Save correct lap count on netreplays
2019-01-27 15:45:42 -06:00
TehRealSalt
3246ca6b33
More finished power level
...
broken, can't finish
2019-01-16 14:49:42 -05:00
TehRealSalt
654580d48b
Minor whitespace
2019-01-15 21:56:46 -05:00
fickleheart
bc3a7ba5cb
Save stored turn ranges in NetArchivePlayers
2019-01-08 23:27:39 -06:00
TehRealSalt
f8a1cf849f
Merge branch 'master' into fortnite
2019-01-08 18:17:09 -05:00
SeventhSentinel
8391dd520a
Add item spinning, turn into papersprites, spawn more orbs
...
Also tried to fix a memory issue I only get from Sev's compiles by removing the need to free memory for this... but didn't fix anything :/
2019-01-02 14:08:00 -05:00
TehRealSalt
b27c709879
a bunch of stuff I left uncommited
2018-12-15 19:14:30 -05:00
SeventhSentinel
d9a3b37e30
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
TehRealSalt
43af067415
Add a 5-second delay before the kill-field kicks in
...
Until it's ready, the orbs are transparent and the minimap icon blinks. Also, tons more sounds. ALSO, Super Overtime mode.
2018-12-06 18:13:40 -05:00
TehRealSalt
dfa0522326
Battle Mode overtime
...
After the time limit is up, spawn a shrinking kill-field. This is one hefty initial commit!
2018-12-06 13:46:38 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
668efe9105
Require 3/5ths of checkpoints instead of 1/2
...
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
2018-11-27 14:28:11 -05:00
MonsterIestyn
d158d7e011
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
Monster Iestyn
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
d3fb778a52
Keep track of the place SPB is following
...
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-24 20:41:17 -05:00
Nev3r
34c472dfb7
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
623c7097f1
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
TehRealSalt
9bec65ca03
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
TehRealSalt
193941945e
The motherload: all of my Lua is hardcoded
...
This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 05:00:08 -04:00
Sal
ec80cfc3d2
Merge branch 'new-spb' into 'master'
...
New SPB
See merge request KartKrew/Kart!56
2018-10-24 16:04:29 -04:00
Sal
5a6524fc93
Merge branch 'some_scaling_stuff' into 'master'
...
Two scale things I noticed.
See merge request KartKrew/Kart!51
2018-10-24 16:01:39 -04:00
TehRealSalt
71452edda2
Merge branch 'master' into new-spb
2018-10-19 17:45:06 -04:00
toaster
df4e12ac15
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 21:53:02 +01:00
TehRealSalt
2ae44ab10e
New SPB
...
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
TehRealSalt
c4a249366c
Merge branch 'master' into no-spectate-griefing
2018-10-16 16:38:35 -04:00