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
cb12d1ebf8
Merge branch 'master' into pet-robo
2020-05-03 21:30:40 -04:00
lachwright
1568114d13
Dashmode fixes:
...
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
James R
a1502046cf
Merge remote-tracking branch 'origin/master' into resume
2020-04-30 09:32:40 -07:00
Latapostrophe
0897f6f21a
Cam lockon, allow viewpoint change during freecam
2020-04-28 23:24:48 +02:00
ThatAwesomeGuy173
3e37730545
Use "addons" instead of "add-ons" for consistency
2020-04-22 01:24:59 -06:00
ThatAwesomeGuy173
1bd3055937
Do the same for other messages too
2020-04-22 00:03:45 -06:00
James R
8490919257
Bye death fades
2020-04-19 22:06:22 -07:00
Sally Cochenour
21bab775b1
Add difficulty settings
2020-04-19 09:07:29 -04:00
Latapostrophe
4c1459cd4e
Chaos Conflicts
2020-03-29 12:14:27 +02: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
toaster
0f591967ff
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally.
...
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
Sally Cochenour
d1580a5b42
More Flame Shield visuals
2020-03-26 08:48:02 -04: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
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
7f07fa9b2d
Move item box counter stuff into k_battle
2020-03-22 16:23:56 -04:00
Sally Cochenour
601ab839f0
Set bumpers to 1 in Break the Capsules
2020-03-22 14:55:47 -04: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
d99d1994da
Let invincibility and grow music fades work again
2020-03-21 22:28:55 -07:00
James R
80c7cc3c87
3 AM Moment: The death fades now only apply to local players
2020-03-21 22:28:55 -07:00
James R
f6888ab004
Reset mapmusresume on level load etc.
...
This is probably important, right?
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
James R
310a9cd09c
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 17:22:57 -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
Sal
bda7dc9ddf
Merge branch 'colors-yet-again' into 'master'
...
Another round of small color tweaks
See merge request KartKrew/Kart!208
2020-03-21 19:03:27 -04:00
Monster Iestyn
ffb2674a6e
Merge branch 'next' into demos-refactor
...
# Conflicts:
# src/g_game.c
(also update g_demo.c)
2020-03-20 17:48:31 +00:00
Monster Iestyn
690ccb49d8
Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all)
2020-03-19 20:42:51 +00:00
Monster Iestyn
ac7a71f85b
Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c
2020-03-19 20:09:55 +00:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Steel Titanium
98be23e3c2
Merge branch 'master' into next
2020-03-18 15:42:02 -04:00
SteelT
f3a275930b
Merge branch 'deadzone-sigfpe-fix' into 'master'
...
Fix division-by-0 crash from 100% gamepad deadzones, and lack of input from 0% deadzones
See merge request STJr/SRB2!838
2020-03-18 15:39:04 -04: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
Latapostrophe
6fe54eafba
Fix Lua crashes when loading without addons
2020-03-12 16:03:12 +01:00
Latapostrophe
1f5bbb2c3d
Merge branch 'push-more-lua' into awful-mix
2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
Latapostrophe
b7702f5ff5
Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix
2020-03-10 21:46:12 +01:00
Latapostrophe
4dfb47dff6
Merge branch 'record-attack-changes' into v1.2-frankeinstein
2020-03-10 20:27:00 +01:00
