Commit graph

23092 commits

Author SHA1 Message Date
toasterbabe
371bbf48aa * Incorporate (almost) all of Mystic's feedback.
* Prevent ANY input when blindfolded.
* Make CECHOs always perplayer'd. (A little hacky; quads will need work here.)
* Make NiGHTS link timer bounces not a mess, and only when the colour changes.
2018-03-30 16:39:59 +01:00
TehRealSalt
ff96cfab11 zzzzz 2018-03-30 00:53:32 -04:00
TehRealSalt
6298f4e6ee MK rules for Battle scoring
and quick fix for karma items
2018-03-30 00:53:25 -04:00
TehRealSalt
1b1f29bd2b Unsuck start boosts 2018-03-29 21:43:02 -04:00
Sryder
d27b10d5eb static tempsec for R_FakeFlat
I don't fully understand this, but it's what software does and it fixes the issue of the lighting in DSZ3. Also don't need the extra call to R_Prep3DFloors.
2018-03-29 23:28:54 +01:00
TehRealSalt
89f2f8ebaf Zigs & better scroll 2018-03-29 18:11:06 -04:00
TehRealSalt
c078b70806 Oh boy another real name 2018-03-29 14:48:45 -04:00
Nevur
0e5a389d01 asdf
Signed-off-by: Nevur <apophycens@gmail.com>
2018-03-29 20:12:19 +02:00
TehRealSalt
5958930c24 Add the accent 2018-03-29 13:35:40 -04:00
TehRealSalt
1541c6e88b Real naaaames 2018-03-29 12:57:41 -04:00
TehRealSalt
1fa99865d5 Forgot to remove some debug stuff 2018-03-29 12:01:04 -04:00
TehRealSalt
aa6b39b21a Finished checklist 2018-03-29 11:43:56 -04:00
TehRealSalt
4f7ebd1607 More full names, and more names 2018-03-29 01:34:31 -04:00
TehRealSalt
c5dd734b8b :( 2018-03-29 01:14:47 -04:00
TehRealSalt
7338ed99e2 Start of a better unlockable checklist
Still WIP, doesn't display properly
2018-03-29 01:14:29 -04:00
TehRealSalt
4abc12bb34 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-28 23:28:10 -04:00
TehRealSalt
86eec2b895 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-28 23:09:48 -04:00
TehRealSalt
b37c50e786 Allow skipping (for real this time) 2018-03-28 22:12:45 -04:00
TehRealSalt
a7c919290d Allow skipping 2018-03-28 21:52:35 -04:00
TehRealSalt
c72d412b74 Some more credit adjustments 2018-03-28 20:32:53 -04:00
TehRealSalt
e431b472bb More credit stuff 2018-03-28 19:27:26 -04:00
TehRealSalt
abff81137c Actually, ehhh, let's remove full names for everyone who hasn't went "yes, I want my full name on Kart's credits 2018-03-28 16:25:43 -04:00
TehRealSalt
8561d14727 A quick credits draft
Please give me corrections and people to add. I've not been here as long
as some people, so there is 100% probably people I missed
2018-03-28 16:17:04 -04:00
TehRealSalt
ab0fc15b81 Actually, this makes more sense :U 2018-03-28 15:28:50 -04:00
TehRealSalt
582f626c13 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-28 15:25:12 -04:00
TehRealSalt
a4ae9a6fe6 Idea: Make Boo make you invisible instead of flash in splitscreen
There's no way atm to make you flash on your screen but not on everyone else's, so I think just making you invisible on all of them keeps the original SMK intent of "you have to pay extra close attention to their screen to know where they are at all" better
2018-03-27 18:30:02 -04:00
TehRealSalt
fb135aede6 HUD improvements
Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 18:22:33 -04:00
TehRealSalt
51e14937d7 Items respawn in Battle properly again
and in a slightly less wasteful way.
2018-03-27 17:53:47 -04:00
TehRealSalt
7264c284cf WIP karma item stuff 2018-03-26 20:36:16 -04:00
toasterbabe
117017b0a0 A lot!
* cv_powerupdisplay. Never, First-person only (default), Always.
* New monitor stuff.
* Fixed hitmessages.
* Some CTF stuff.
* Aaaaugh it's a lot I hate myself I need to work on my coursework.
* I'll figure out what I did here in the merge request when that's done.
2018-03-26 23:53:09 +01:00
mazmazz
58089255ef Reset player->another/flyangle on any Nightserize or DeNightserize 2018-03-26 01:54:38 -04:00
mazmazz
fd6f5c7ef0 Nightserize: Reset player another/flyangle on new mare 2018-03-26 01:40:15 -04:00
mazmazz
e21bcbf619 NiGHTS drone loop: Change flyangle comparison to fix detection from vertical angles
Use > 90 && < 270 instead of >= 90 && <= 270. Fixes a bug where if you fly directly up (flyangle 90) or directly down (flyangle 270), that registers as a backwards direction, so you trigger the loop detection by flying BACKWARDS, not FORWARDS. This edge case (only possible via JUMPTOAXIS) should default to FORWARDS looping.
2018-03-26 01:04:02 -04:00
mazmazz
613cad1ffd Fix NiGHTS drone loop detection by using pl->flyangle 2018-03-26 00:33:17 -04:00
mazmazz
0ffcc5037e P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER 2018-03-25 19:42:46 -04:00
mazmazz
94d7f3b031 MT_NIGHTSBUMPER Spawn: Don't reset mthing->options 2018-03-25 19:07:21 -04:00
mazmazz
019d698e09 NiGHTS objectplace: Place new hoop 1713 instead of 1705
* Add cv_ophoopflags consvar to manage hoop flags separately from other flags
* Simplify hoop mt->options operation so we're not recalculating Z flags; just XOR cv_opflags OR cv_ophoopflags
2018-03-25 18:07:15 -04:00
toasterbabe
fe61c5d80e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
# Conflicts:
#	src/d_main.c
#	src/st_stuff.c
2018-03-24 17:17:01 +00:00
TehRealSalt
79983e8b77 Fix errors 2018-03-24 08:13:33 -04:00
TehRealSalt
936b121ad0 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-24 08:03:55 -04:00
TehRealSalt
ebc55d62ee Splitscreen sound improvements
- Fixed a simple oversight that prevented P3 and P4's sounds from ever
playing
- Changed how sound priority works, now compares distances between

(Untested as of commit since my computer wants a quick restart before it
compiles :V)
2018-03-23 22:50:42 -04:00
TehRealSalt
3160acd3a6 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-23 22:24:01 -04:00
jameds
8623322bfc Removed contradictory -connect check 2018-03-23 18:09:07 -07:00
Sryder
3898fbadf8 I've commented out the call to HWR_CorrectSWTricks.
I don't think it does anything for us anymore, and might even break things with slopes.
Someone let me know if I'm wrong and am breaking things horribly here.
2018-03-23 22:27:29 +00:00
jameds
0e788e8cfe Fixed "invalid pointer" error when passing "" to Command_connect(). 2018-03-22 21:21:26 -07:00
Sryder
fd64227e95 Stop squashing the screen vertically in non-green resolutions 2018-03-22 01:10:53 +00:00
Sryder
59c1488435 OpenGL Sprite Splitting 2018-03-22 00:52:14 +00:00
Sryder
38cdee2532 Transform sprites in world space rather than screen space
Transformation based on screen space would make sense if we didn't want anything in the world to effect the sprites.
This should allow sprite splitting and sorting of sprites with level geometry easier.
stransform is no longer needed.
2018-03-21 19:45:37 +00:00
toasterbabe
d79541e63c Mammoth commit!
* Make TIME part of HUD count down in a bunch of circumstances where it was otherwise some other seperate thing.
* Make race countdown happen in a bunch of appropriate circumstances.
* Refactor race countdown.
* Remove a lot of useless stuff from H&S/Tag UI.
* Make co-op/competition/race end-of-act countdown use the race countdown and bigger HUD font.
* Remove useless PLAYING/SPECTATE text from lives element.
* Merge lap counter into lives element.
* Move some other text around.
2018-03-21 18:18:45 +00:00
toasterbabe
c959806e23 * M_Random function access to v! (so v.RandomFixed(), etc...)
* Remove deprecated P_Random() from Lua.
2018-03-20 15:00:27 +00:00