Commit graph

2718 commits

Author SHA1 Message Date
TehRealSalt ba43ed5d48 Squash a few more errors
Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-06 21:53:37 -04:00
TehRealSalt 7e7f4dc5bc F_WaitingPlayersTicker() -> F_WaitingPlayersTicker(void) 2018-07-06 19:44:21 -04:00
Sryder 7b82d0e695 Fix warning relating to max 0 with an unsigned variable
I've looked at the code above and can't see anything that would try to lower the value below 0 as it's mostly just addition and dividing
2018-07-07 00:34:03 +01:00
toaster 6c8a92b44f Remove the need for sending the savegame if you're the host. You don't need to send it to yourself. What are you doing? 2018-07-06 23:18:22 +01:00
toaster e37efda57e Fix a crashy oversight in the archiving! 2018-07-06 23:18:18 +01:00
Sryder 6fc29ce37d Always send gamestate to joiners.
It's cut down already outside of levels, needed to stop Lua sending mobj references during intermission though.
This is needed because in the past there was a separate way to send player information to joiners that has since been removed. Meaning player information is always desynched for joiners during anything but levels.
2018-07-06 20:25:13 +01:00
Sryder 6b3f35813a We use the PRNG far too much to not do consistancy checking on it in race 2018-07-03 21:01:46 +01:00
Sryder 0375ea4f0b Only do Mobj and RNG consistancy checking when actually in a level.
Mobjs are completely irrelevant outside of levels and the PRNG is not used in a synchronised way in anywhere except when in levels either
2018-07-03 20:53:37 +01:00
Sryder c8f61edea5 Screen for waiting during intermission after connecting 2018-07-02 22:11:03 +01:00
Sryder 5c2110dafe Fix the issue with timing out when joining during intermission 2018-07-01 03:06:34 +01:00
Sryder fffa3db5a8 Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:Sryder/SRB2.git
# Conflicts:
#	src/hardware/hw_main.c
2018-06-09 23:43:25 +01:00
Sryder ea915e5778 Fix papersprites more for real this time
(Seperate AL and AR sprites were broken, I figured out I was a dunce, oh noey)
2018-06-09 22:58:03 +01:00
Sryder 82b92d1881 Fix the issue from the merge 2018-06-09 22:25:00 +01:00
Sryder 00ac4dd59b Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:STJr/SRB2.git
# Conflicts:
#	src/hardware/hw_main.c
2018-06-09 21:01:59 +01:00
Monster Iestyn d3a60d9921 Merge branch 'public_flatsprite' into 'public_flatsprite'
OpenGL: Public flatsprite: The Fixening

See merge request STJr/SRB2!252
2018-06-09 14:25:52 -04:00
Sryder 0f4e8c1eda Merge branch 'next' into public_flatsprite
I also fix papersprites in regards to flipping on one sprite fits all rotation stuff

# Conflicts:
#	src/hardware/hw_main.c
2018-06-09 18:47:42 +01:00
Sryder 0a85e75eb8 Accidentally made HitEm sounds always play, even when hitting your own items 2018-06-09 16:42:03 +01:00
Sryder 2adbcd6dfd Merge branch 'master' into dust-kart 2018-06-09 01:00:03 +01:00
Sryder 17245b2d6b Merge branch 'master' into voice-loss-jpg
# Conflicts:
#	src/k_kart.c
2018-06-09 00:56:39 +01:00
Sryder 10270d20dd HitEm voice line can always play
Still starts the timer to at least 3 seconds on other voices though
2018-06-09 00:18:49 +01:00
Sryder 3daf6fbfd7 Slightly longer delay between voices
Fix win/lose quotes to work based on actual win/lose criteria
Don't play overtake sound until at least 10 seconds into the race
2018-06-09 00:05:05 +01:00
Sryder f00e3dfd5a New Drift dust
Applies all the time as long as the object is turning tight enough
New Sound
Works on Red Shells too!
2018-06-08 21:13:52 +01:00
Sryder 97caf79f16 Whoops, accidental rename 2018-06-07 20:03:47 +01:00
Sryder 213749b115 Big voices change
When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices
When using other voices, there's at least a 2 second delay on all other voices
2018-06-07 19:56:26 +01:00
Sryder 6023f794ac Restore the removed voices 2018-06-07 19:34:13 +01:00
TehRealSalt 7f996c6dfd P_RestoreMusic fix 2018-06-07 02:51:18 -04:00
TehRealSalt 7611f2c610 1v1 battle no items fix 2018-06-06 20:52:13 -04:00
TehRealSalt 7100db62ca No bumping when respawning 2018-06-06 20:41:23 -04:00
TehRealSalt adc1fa38f5 This print doesn't work for some reason?!
It keeps replacing actnum with zonttl, but ONLY if zonttl is set. Weird as heck, can't figure out why, commenting out for now.
2018-06-06 20:25:28 -04:00
TehRealSalt babc8be5da Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support
(also more item changes from last night that I just forgot to commit earlier)
2018-06-06 18:36:39 -04:00
TehRealSalt eb8464744b Adjustin' BL based off the netgame, and mashing is back
Now it just cripples your chances for good items, mwaha
2018-06-05 23:46:25 -04:00
TehRealSalt 6301d0ee38 Lightning cooldown change
- Lightning cooldown reduced to 20 seconds
- You can no longer mash to get an item quicker
2018-06-05 21:45:54 -04:00
TehRealSalt 5f610982ea The Lightning Update
- 30 sec cooldown on all lightning types
- Delay before Blue Lightning hits, based off of distance
- Blue Lightning can swap targets if 1st place is passed
- Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-05 21:36:48 -04:00
TehRealSalt 8de3890f26 Dang it, I always forget these... 2018-06-05 18:47:15 -04:00
TehRealSalt e39de53fa2 Use strlen for all of the valid zone title/act num checks 2018-06-05 17:28:46 -04:00
TehRealSalt d3793cb19c Lots of cmd restructuring.
- cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster.
- Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now.
- Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request.
- Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 17:12:42 -04:00
TehRealSalt 173d780ab7 P_RestoreMusic restores level exit music as well
Splitscreen fix
2018-06-05 02:41:55 -04:00
TehRealSalt ce14c13699 Multiplayer cursors in voting 2018-06-05 02:11:47 -04:00
TehRealSalt 0fc113e6dd actnum is now a 2 character long string
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
TehRealSalt 14caf66567 MFE_JUSTBOUNCEDWALL
Hopefully, this should prevent instances where shells/Oni get caught on walls.
2018-06-04 23:23:52 -04:00
TehRealSalt d5a2fb9317 Disable weather in netgames
Some people like to lag up the whole server by enabling precip, so y'know what, just turn it off in netgames. Weather can just stay a Record Attack/splitscreen only feature now I guess
2018-06-04 22:56:58 -04:00
TehRealSalt b4757779cd We did it, we finally fixed... The Shell Boost Bug
Instead of adding to your speed, it relatively multiplies it if you're above your top speed. This is applied to ALL of Kart projectiles as well, not just shells. May we never run into our own shell that we threw on a boost pad ever again.
2018-06-04 22:53:45 -04:00
TehRealSalt dd05edfcc0 Merge remote-tracking branch 'srb2public/next' 2018-06-04 16:58:35 -04:00
TehRealSalt 79b2ae8e7c Merge branch 'master' into sal-misc 2018-06-04 16:37:13 -04:00
TehRealSalt 35774d4f13 Revert "Merge branch 'master' into sonicitems"
This reverts commit 4c0f64ff4f, reversing
changes made to eaaf708381.
2018-06-04 16:30:16 -04:00
TehRealSalt ae66a8f769 Minimap offset support 2018-06-04 16:19:36 -04:00
TehRealSalt 09311bf061 WHOOPS 2018-06-04 00:29:31 -04:00
TehRealSalt 518676c2a4 P, not K 2018-06-03 21:07:36 -04:00
TehRealSalt fa125bc18d Leave the camera behind while exiting, for dramatic effect! 2018-06-03 21:01:59 -04:00
TehRealSalt 6d57d39e12 SUPER CHARGED KARMA ITEMS
They give equal chance on a lot of good shit, instead of the normal boring pool of items, mwahaha

(also calls P_CheckRacers when someone spectates)
2018-06-03 20:58:52 -04:00