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
TehRealSalt
e3008407d1
Adjustin' to Oni's requests
...
Only 1st place finish sound is global, use signpost instead of starpost
2018-06-03 20:19:03 -04:00
TehRealSalt
8408b1fef4
Some Battle fixes and additions
...
- mapgotboxes is synched
- Karma bombs/items flash while spinning out
- Karma bombs have a sound + explosion when hitting someone
- Karma bombs can no longer attempt to attack a player that is flashing and have to WAIT... again
- Fixed MT_GREENITEM's bounce sound, after breaking from last commit (WHY ARE YOU ABUSING MARIO MODE SOUNDS, STOP, AGHH)
2018-06-03 20:11:08 -04:00
TehRealSalt
0906978a2a
Remove collide debug stuff
2018-06-03 18:58:50 -04:00
TehRealSalt
b0099bd1cc
Less timer reduce on gold shroom
2018-06-03 18:25:28 -04:00
TehRealSalt
a223218155
Exit siren, disable constant forcing of Mario Mode sounds
2018-06-03 18:20:21 -04:00
TehRealSalt
483ac75238
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
bf042ed86c
Merge branch 'master' into next
2018-06-03 20:17:51 +01:00
Monster Iestyn
650e0eafce
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
602d5e0aa0
Merge branch 'f12-fix' into 'master'
...
F12 fix
See merge request STJr/SRB2!250
2018-06-03 15:11:20 -04:00
Monster Iestyn
37b8be2103
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
ef174f7b43
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
8e5dbb22f0
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
f4152e2e5d
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
98addbafa7
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
a3d8ceb9e5
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
dff33deb52
Fix Battle scoring, hopefully
2018-06-02 10:57:43 -04:00
TehRealSalt
73205c8229
Changed time requirements to accomedate lap changes
2018-06-02 10:29:43 -04:00
TehRealSalt
bc5c279317
Messing with item distributions a tad
2018-06-01 02:19:40 -04:00
TehRealSalt
4c0f64ff4f
Merge branch 'master' into sonicitems
2018-05-31 19:47:50 -04:00
TehRealSalt
7da0ff595e
I continue to be a buffoon.
2018-05-31 19:21:26 -04:00
TehRealSalt
7d021ae1e6
Splitscreen-friendly voting screen
2018-05-31 18:49:19 -04:00
TehRealSalt
c7692d6d7c
Thaaaat was stupid of me
2018-05-31 15:39:00 -04:00
TehRealSalt
123415fb08
nice
...
nice
2018-05-31 01:06:48 -04:00
TehRealSalt
240f037b27
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
75e77189d6
Fix Star/Mega music persisting after death for splitscreen players
2018-05-30 18:38:30 -04:00
TehRealSalt
eadd7381eb
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
efc64e70ab
Record Attack sets all of kart's gameplay variables now
2018-05-30 17:22:31 -04:00
TehRealSalt
762a8f6087
Merge remote-tracking branch 'srb2public/next'
2018-05-30 17:11:02 -04:00
TehRealSalt
dcd8c87c6f
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
4e97fbf188
Merge branch 'master' into sal-misc
2018-05-30 16:55:59 -04:00
TehRealSalt
609258baa6
Restore gc_camrotate
...
Sorry if this breaks everyone's configs again :V
2018-05-30 16:54:59 -04:00
Monster Iestyn
41e9c20c04
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
f4181f7eb6
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
f061ffa00e
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
001e4e11ca
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
Sryder
092e709235
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
0bef99f566
Fix console typo
2018-05-17 13:57:19 -04:00
Sryder
badbb4324e
Fix FF_FULLBRIGHT not working in sectors with multiple light levels in OpenGL
2018-05-16 21:04:57 +01:00
Monster Iestyn
4f75ae3a68
Fix both Bouncy FOF and Space Countdown sector specials working on FOFs without the FF_EXISTS flag
...
Also move the Bouncy FOF sector special check above the FOF heights checking in P_CheckBouncySectors, because it means not having to waste time calculating FOF heights only for it not to be bouncy anyway :P
2018-05-11 20:35:46 +01:00
Alam Ed Arias
6be0f90fbe
Merge branch 'master' into next
2018-05-08 21:26:26 -04:00
Steel Titanium
a1d696b38e
Fix small typo
2018-05-08 18:38:28 -04:00
Steel Titanium
9ff491dd78
Add indentation
2018-05-08 18:36:47 -04:00