Latapostrophe
313c8b27a6
Cleaned up a little, courtesy of toaster
2018-08-31 13:52:53 +02:00
toaster
7e68741a42
Improve intermission drawer further.
...
* Change `MM:SS.MS` to `MM'SS"MS' to match all other recorded instances of time in-game.
* Add a full stop to NO CONTEST to scrounge up an extra four pixels to match the increased width of above.
* Make it such that the number of players per column will never be desynced with future code changes by tying it to a local #define.
* Other minor code improvements.
2018-08-31 12:37:15 +01:00
Latapostrophe
043d0581a6
Coloured names for chat
2018-08-31 13:30:40 +02:00
mazmazz
e33d385a6a
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-31 02:26:45 -04:00
mazmazz
580a3471a8
Updated SDL Mixer X binaries
2018-08-31 02:26:21 -04:00
TehRealSalt
1be9b16f3a
Scale the speed of SA dash pads with higher scales
...
Also, added a define for GROWNEVERMISSES, which fixes every single jump with Grow but with feels terrible.
2018-08-31 00:05:46 -04:00
TehRealSalt
2e809548e4
separate var for dashpad cooldown
...
- no longer has weirdness with pw_flashing
- can now have an SA1-style effect for it
2018-08-30 22:27:18 -04:00
TehRealSalt
5c9e1a7d68
Grow no longer sets flashing tics
...
Just causes a bunch of other, really dumb side-effects, and nothing else I could test suffers from it
2018-08-30 21:51:27 -04:00
TehRealSalt
9f6c132629
Karma players can bump again
2018-08-30 21:32:24 -04:00
TehRealSalt
5fa2ffd26e
Jawz reticule
2018-08-30 19:24:22 -04:00
Steel Titanium
277bec55c2
Only do this if the admin player isn't the server host also.
2018-08-30 18:32:26 -04:00
TehRealSalt
2f7563a5b0
Ignore texture on horizon lines when in OGL
...
Before: https://cdn.discordapp.com/attachments/300531341957529602/484842910475354124/kart0110.png
After: https://cdn.discordapp.com/attachments/270211093761097728/484841628771680258/kart0109.png
Not a solution, but better than the previous.
2018-08-30 17:53:25 -04:00
TehRealSalt
4018301434
Remove use of a duplicated sound
2018-08-30 17:50:47 -04:00
Digiku
b24a04989e
Merge branch 'nights-nofastattract' into 'master'
...
NiGHTS: Dummy out faster item attract
See merge request STJr/SRB2Internal!183
2018-08-30 17:26:42 -04:00
TehRealSalt
f549205721
Halved radius of MT_CHOMPER
2018-08-30 17:12:35 -04:00
TehRealSalt
bd3b346f32
Apply to bananas, eggmen, and mines also
2018-08-30 16:36:46 -04:00
TehRealSalt
4b38c3e48e
Put on player's center during this animation
2018-08-30 16:28:01 -04:00
TehRealSalt
85ee66f64a
Held Orbinaut & Jawz radius+scaling animation on spawn
2018-08-30 16:10:25 -04:00
TehRealSalt
56e74678af
More fundamental Jawz changes.
...
1.) Instead of prioritizing best angle above all else, it averages both distance and angle to figure out which is the best overall target.
2.) Jawz will completely cut out angles higher than 45 degrees, preventing instances where someone behind you is considered a better target than who you're looking at.
3.) Jawz does the 45 degree angle checking in Race as well, meaning that they will ignore racers that are neck & neck with you, even if they're technically the next place above you, so that Jawz doesn't take a hard left into a wall.
2018-08-30 15:30:27 -04:00
Monster Iestyn
9d8d239eab
Apparently I am blind and missed that splitscreen only CC offset that overrides the code for the other offset below
2018-08-30 20:08:17 +01:00
mazmazz
dcca56bc04
Dummy out NiGHTS item faster attract
2018-08-30 10:50:03 -04:00
Digiku
2b18908fe4
Merge branch 'nights-inufixes' into 'master'
...
NiGHTS Minor Fixes: Snappier paraloop attract; drill mash penalty; configurable link timer
See merge request STJr/SRB2Internal!156
2018-08-30 09:12:55 -04:00
mazmazz
f8588739b8
Drill mash penalty fix
2018-08-30 09:09:19 -04:00
mazmazz
631a053e92
Merge remote-tracking branch 'origin/master' into nights-inufixes
2018-08-30 08:13:34 -04:00
toaster
5a1e52ba33
Overlays and rings now properly handle encore-ness, in that they are sans encore (most of the time).
...
... :V
2018-08-30 13:13:25 +01:00
TehRealSalt
0fb69a859a
Foolish
2018-08-29 18:12:18 -04:00
TehRealSalt
3bf3d6df33
- Revamped Jawz targetting for Battle Mode
...
- Cleaned up some redundant code
- Halved the speed of backwards thrown missiles (previously PROJSPEED/2, now is PROJSPEED/4)
2018-08-29 18:12:02 -04:00
Monster Iestyn
46be411454
Fix compiler complaints, remove a slipup of mine from when I was dealing with merge conflicts
2018-08-29 22:07:38 +01:00
toaster
c95e6f01d3
disable encore ruby/flip on record attack menu with kartencore on
2018-08-29 22:02:42 +01:00
toaster
1b1f057e82
* Prettier record attack screen!
...
* Uses the in-game timer element to draw its times.
* This includes showing them time emblems-to-get!
* good night sweet prince
* Make the emblem time use the same ' and " as the normal time.
2018-08-29 21:37:47 +01:00
Monster Iestyn
d9440f419c
Use INFLIVES macro in place of 0x7f for infinite lives check
2018-08-29 21:31:15 +01:00
Monster Iestyn
d60ade9f95
Merge branch 'master' into hud-n-menu-tidbits
2018-08-29 21:28:11 +01:00
Monster Iestyn
ede540a259
Merge branch 'hud-cleaning' into 'master'
...
Hud cleaning
See merge request STJr/SRB2Internal!170
2018-08-29 16:22:48 -04:00
Monster Iestyn
a9882bfda4
Merge branch 'master' into hud-cleaning
2018-08-29 20:46:35 +01:00
Monster Iestyn
d130c48787
Fix typo introduced by changes to the setrings command
2018-08-29 20:46:08 +01:00
mazmazz
2c38ecadd1
Add mapmusposition placeholder to LE 413 change music
2018-08-29 15:21:17 -04:00
toaster
2a17839c24
Merge branch 'sonicitems' into encore
2018-08-29 19:56:52 +01:00
TehRealSalt
79eb4feb74
Lower capped spring pad max speed even harder, to properly fix BC3
2018-08-29 14:46:42 -04:00
TehRealSalt
d443650c26
Item distribution debugger, and oversight pointed out by this
...
Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 14:28:28 -04:00
Monster Iestyn
3c65251bb6
Merge branch 'master' into hud-cleaning
...
# Conflicts:
# src/y_inter.c
2018-08-29 16:39:02 +01:00
mazmazz
c43c15ff10
Merge remote-tracking branch 'origin/master' into nightsplus-le
2018-08-29 11:06:00 -04:00
Digiku
cc828ce709
Merge branch 'nightsplus-laplogic' into 'master'
...
NiGHTS: Track player mare lap variables
See merge request STJr/SRB2Internal!143
2018-08-29 10:58:05 -04:00
mazmazz
2ee3228ee4
Merge remote-tracking branch 'origin/master' into nightsplus-laplogic
2018-08-29 10:16:49 -04:00
toaster
c15fcaf51d
* Add support for .kart files.
...
* Wrap behind-the-scenes `addfile/exec` contents in quotation marks to allow for files with spaces in them.
2018-08-29 14:19:08 +01:00
toaster
dfe1f865fc
* Make some minor performance improvements.
...
* Make the I_Errors in filesrch.c more descriptive.
* Fix up the loading of sounds.kart such that it has SOME protection against being loaded with game-modifying lumps.
* SERIOUSLY fix up the MD5/mainwads++ section in D_SRB2Main, since 1) I broke it and 2) it was already a little broken in the first place but we just didn't notice it because #ifndef DEVELOP.
2018-08-29 12:50:25 +01:00
Digiku
ce1127e5c9
Merge branch 'nights-bumper-fix' into 'master'
...
NiGHTS: Fix player positioning when touching Bumper
See merge request STJr/SRB2Internal!165
2018-08-29 06:02:24 -04:00
Digiku
66b4d0f929
Merge branch 'op-nights-bumper' into 'master'
...
Objectplace: Place NiGHTS Bumpers with the player's fly angle
See merge request STJr/SRB2Internal!166
2018-08-29 06:01:27 -04:00
Digiku
8389cb9f03
Merge branch 'nights-nightserizeangle' into 'master'
...
NiGHTS: Reset player another/flyangle on De/Nightserize
See merge request STJr/SRB2Internal!139
2018-08-29 04:27:02 -04:00
Digiku
e5a1db2870
Merge branch 'intermission-bonuslivesmax' into 'master'
...
Intermission: MaxBonusLives level header option for # of lives in score tally
See merge request STJr/SRB2Internal!162
2018-08-29 04:25:03 -04:00
Digiku
33ba87fea1
Merge branch 'le-ringspheres' into 'master'
...
Line Execs: Make Ring triggers accept spheres in NiGHTS levels
See merge request STJr/SRB2Internal!163
2018-08-29 04:24:47 -04:00
