Commit graph

25568 commits

Author SHA1 Message Date
TehRealSalt
681ee4fcfa Exit siren, disable constant forcing of Mario Mode sounds 2018-06-03 18:20:21 -04:00
Steel Titanium
61d8033d5e Fix pausing on gme 2018-06-03 18:15:20 -04:00
toaster
849eeae3b9 MONSTER COMMIT.
OLD SPECIAL STAGES:
* Spheres in old special stages instead of rings!
* Individual timers in old special stages instead of a global one!
* Old special stages use a variant of the NiGHTS HUD now!
* Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres!
* All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore.
* Made emerald gaining function be based on special stage number rather than gained emeralds!
* Consistency with...

NiGHTS SPECIAL STAGES:
* Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif
* Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.)

SPECIAL STAGES IN GENERAL:
* useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS.
* CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif
* SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif

NiGHTS NON-SPECIAL STAGES:
* Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages.
* Colour Chips turn yellow in bonus time.
* Ideya!
* Its own "drowning" music!
* All of the object types for Dream Hill.
* GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif

RANDOM BS:
* Turn super with the spin button instead of the jump button!
* Followmobj now correctly set with P_SetTarget instead of pointer assignment.
* Emerald hunt uses new sprites!
* Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 22:41:54 +01:00
TehRealSalt
c9907bfa75 Support ALL of the classic games' sounds
Sonic 1, 2, 3D Blast, & CD, on top of the existing S3K and Chaotix.
2018-06-03 16:13:26 -04:00
Monster Iestyn
b0b02ea99a Merge branch 'master' into next 2018-06-03 20:17:51 +01:00
Monster Iestyn
fac46adc20 Merge branch 'fixedmul-c-fix' into 'master'
Correct C FixedMul() off-by-one errors

See merge request STJr/SRB2!245
2018-06-03 15:14:06 -04:00
Monster Iestyn
2a61e0bc63 Merge branch 'f12-fix' into 'master'
F12 fix

See merge request STJr/SRB2!250
2018-06-03 15:11:20 -04:00
Monster Iestyn
26686823c8 Merge branch 'demototalplaytime' into 'next'
Don't increment totalplaytime if a demo is playing.

See merge request STJr/SRB2!241
2018-06-03 15:10:42 -04:00
Monster Iestyn
f79c061ad0 Merge branch 'opengl-mappalette-fix' into 'master'
OpenGL: Map Specific Palette Fix

See merge request STJr/SRB2!247
2018-06-03 15:09:23 -04:00
Monster Iestyn
892bed87d9 Merge branch 'opengl-bigmap-fix' into 'master'
OpenGL: Very large map rendering issue fixed

See merge request STJr/SRB2!249
2018-06-03 15:08:10 -04:00
Monster Iestyn
c607abcfc1 Merge branch 'addfile-typo' into 'master'
Fix console typo

See merge request STJr/SRB2!246
2018-06-03 15:06:13 -04:00
Monster Iestyn
464201477e Merge branch 'opengl-fullbrightsprite-fix' into 'master'
OpenGL: Fix FF_FULLBRIGHT not working in sectors with multiple light levels

See merge request STJr/SRB2!244
2018-06-03 15:05:00 -04:00
Monster Iestyn
b4ca0cef8a Merge branch 'fof-sector-special-fixes' into 'next'
FOF sector special fixes

See merge request STJr/SRB2!242
2018-06-03 15:03:10 -04:00
TehRealSalt
d5d1073a79 Fix Battle scoring, hopefully 2018-06-02 10:57:43 -04:00
TehRealSalt
c5b95659b2 Changed time requirements to accomedate lap changes 2018-06-02 10:29:43 -04:00
TehRealSalt
abf1ae5a24 Messing with item distributions a tad 2018-06-01 02:19:40 -04:00
TehRealSalt
ddb8e7a8c4 Incredibly rudimentary Jawz stuff 2018-05-31 20:51:05 -04:00
TehRealSalt
ec65ad380e Merge branch 'master' into sonicitems 2018-05-31 19:47:50 -04:00
TehRealSalt
e4d380d2ad I continue to be a buffoon. 2018-05-31 19:21:26 -04:00
TehRealSalt
71572b94d1 Splitscreen-friendly voting screen 2018-05-31 18:49:19 -04:00
toaster
9dd5da2670 New CEZ hardcoding done!!
* Better Robo Hood arrows.
* Shield break animation for Egg Guard. (Temporary state slot so I don't have to compile from scratch until I do something more complicated later.)
* Suspicious Facestabber Statue animates a little before bursting open.
* Fix Facestabber radius.
* Fix some stuff in Flicky functions that could be overwritten in Lua call actions by mistake.
2018-05-31 21:00:12 +01:00
TehRealSalt
a3fe415d8a Thaaaat was stupid of me 2018-05-31 15:39:00 -04:00
TehRealSalt
aff74fa234 nice
nice
2018-05-31 01:06:48 -04:00
TehRealSalt
80be093e46 A couple of RA-related things
An unlockables/time emblems update, the stats screen shows all maps without needing to visit each one, and respawning is enabled in Record Attack now
2018-05-30 22:53:06 -04:00
TehRealSalt
91354d86b2 Fix Star/Mega music persisting after death for splitscreen players 2018-05-30 18:38:30 -04:00
toaster
5680e8ffad First commit on new tablet-laptop!
* Robo Hood.
* Hi MI, I know you're looking at this just because it features Robo hood. :V
2018-05-30 23:16:57 +01:00
TehRealSalt
4c995e7e47 Changing from Relaxed Standard Turbo to the typical Easy Normal Hard
Reception to the naming convention has been either "don't care" or "too hard to remember"
2018-05-30 17:29:40 -04:00
TehRealSalt
cabc70faea Record Attack sets all of kart's gameplay variables now 2018-05-30 17:22:31 -04:00
TehRealSalt
fd75bbb79c Merge remote-tracking branch 'srb2public/next' 2018-05-30 17:11:02 -04:00
TehRealSalt
976cd48ea3 But hey, what if I also made color & skin save to the config too!
Does this make up for it? :V
2018-05-30 16:59:53 -04:00
TehRealSalt
74c36852a1 Merge branch 'master' into sal-misc 2018-05-30 16:55:59 -04:00
TehRealSalt
714992a152 Restore gc_camrotate
Sorry if this breaks everyone's configs again :V
2018-05-30 16:54:59 -04:00
Steel Titanium
884f10d8d2 Removed CONS_Printf line. That wasn't meant to be commited. 2018-05-29 22:12:36 -04:00
Steel Titanium
5f72975466 Some small change
Really this is just to prevent the music end up being disorted at max
volume
2018-05-29 20:31:28 -04:00
toasterbabe
14c85108f9 Realised I forgot to commit these, didn't want to move to a new laptop-tablet and just have them disappear on me.
* Facestabber statues now have fun breaking effects.
* Fake coronas for candles and prickets.
* hnext and hprev are properly dealt with in MobjThinker if P_MobjIsRemoved.
2018-05-29 18:48:57 +01:00
Monster Iestyn
71fa00e423 Ignore mouse button events if the mouse's focus is not actually on the window at the moment.
This should hopefully kill the F12 getting stuck issue once and for all.
2018-05-28 21:29:46 +01:00
Sryder
51606f675f Very large map rendering issue fixed
Move old fix for too large maps having rendering issues from R_CheckBBox to OpenGL's HWR_CheckBBox
From what I know, this effects at least Aerial Garden and Seraphic Skylands
2018-05-26 13:13:37 +01:00
Monster Iestyn
b6835e8579 change fickle's hack so that the bottoms of polyobj plane columns are set to 0 instead of 65535 when not intended to be visible 2018-05-25 20:54:50 +01:00
Steel Titanium
528cb48d5d GME low volume fix 2018-05-24 16:24:09 -04:00
toasterbabe
bc015903a7 Fix bugs (uninitialised memory the compiler didn't pick up, and not setting scale) I sleepily caused last night. 2018-05-24 13:19:42 +01:00
toasterbabe
0e5ef6080a * Castlebot Facestabbers.
* Facestabber statues, of both the suspicious and non-suspicious kind.
* New object type for the end of grabbable chains.
* I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's.
* Random extra stuff.
2018-05-24 01:40:57 +01:00
toasterbabe
612885150e * New Egg Guard behaviour!
* Fix the thing I mistakenly messed up with all of the things I moved out of P_SpawnMapThing without good reason to.
2018-05-22 23:02:54 +01:00
toasterbabe
7b99787300 * CEZ decorations!
* Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.
2018-05-22 11:04:28 +01:00
Monster Iestyn
745be2c641 Stop Each Time trigger linedefs and object-carrying scrollers from doing anything with FOFs without FF_EXISTS 2018-05-21 20:02:30 +01:00
Tasos Sahanidis
2d3ae11d6f Correct C FixedMul() off-by-one errors
The FixedMul() C implementation would produce off by one results,
causing constant desyncs on 64 bit builds and builds without an
ASM implementation of the function.

This is fixed by shifting instead of dividing, possibly avoiding
rounding errors.
2018-05-20 22:55:21 +03:00
toasterbabe
626e36e50d * Bumpers and Balloons in a more final state.
* Blue diagonal springs, because that gap is very, very odd.
* Improved A_SpawnFreshCopy.
* Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-20 00:04:39 +01:00
Oleksii Vilchanskyi
15f8881ea0 m_fixed: asm: cc is not a register
gcc accepts

  __asm__ ( "" : : : "%cc");

but not clang:

    error: unknown register name '%cc' in asm
        :"%cc", "%edx"         // edx and condition codes clobbered

'cc' is not a register, thus '%cc' is rightfully not accepted.

Repro: build the project on x86_64 with:
    cmake -H. -Bbuild -DCMAKE_C_COMPILER=clang -DCMAKE_SIZEOF_VOID_P=4 -DCMAKE_C_FLAGS="-m32"
2018-05-18 00:23:22 +02:00
Sryder
424b66d09b OpenGL Map Specific palettes working
This makes OpenGL stop using a specific function that doesn't really do anything for it anymore. It looks like it was used for a hack that would change the colour of polygons for the flashpal equivalent in DOOM.
I made it so ST_DoPaletteStuff doesn't set the flashpal in OpenGL as it already does its own hacky overlay and doing that would cause all the textures to be flushed more mid-level, it could be enabled for more correct flashpals, but they still wouldn't effect fog or lighting.
This means the palette will be set when going to the title screen, and twice when starting a map, (causing the OpenGL cached textures to also be flushed at those times)
2018-05-17 22:17:20 +01:00
Steel Titanium
0c0d54c98c Fix console typo 2018-05-17 13:57:19 -04:00
Sryder
85aff6fa6b Fix FF_FULLBRIGHT not working in sectors with multiple light levels in OpenGL 2018-05-16 21:04:57 +01:00