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
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
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
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
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
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
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
Monster Iestyn
3b7bf18971
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
9726134af7
Merge branch 'master' into next
2018-05-08 21:26:26 -04:00
Steel Titanium
9bd92b7e2d
Fix small typo
2018-05-08 18:38:28 -04:00
Steel Titanium
a41f8756e1
Add indentation
2018-05-08 18:36:47 -04:00
Steel Titanium
d85f42689b
Don't increment totalplaytime if a demo is playing.
2018-05-08 18:16:01 -04:00
Monster Iestyn
f677746603
Merge branch 'dedicated-nosoundinit' into 'master'
...
Don't init the sound system on dedicated servers
See merge request STJr/SRB2!225
2018-04-21 17:40:45 -04:00
Monster Iestyn
ee85d2a974
Merge branch 'connect-empty-address-fix' into 'master'
...
Fixed "invalid pointer" error when passing "" to Command_connect().
See merge request STJr/SRB2!234
2018-04-21 17:32:50 -04:00
Monster Iestyn
fe529f26e4
Merge branch 'connect-server-fix' into 'master'
...
Removed contradictory `-connect` check
See merge request STJr/SRB2!236
2018-04-21 16:25:28 -04:00
Monster Iestyn
2ddd15333e
Merge branch 'findfile-rewrite' into 'master'
...
Rewrite of d_netfil.c's findfile
See merge request STJr/SRB2!240
2018-04-21 16:22:21 -04:00
Monster Iestyn
f2b3bac6a5
Merge branch 'dedicated-debug-hotfix' into 'master'
...
Dedicated debug hotfix
See merge request STJr/SRB2!239
2018-04-21 16:13:38 -04:00
Monster Iestyn
400c6698bd
Merge branch 'movie-spec-stage-fade-fix' into 'master'
...
Movie mode: special stage intro fade recording fix
See merge request STJr/SRB2!229
2018-04-21 16:12:46 -04:00
Monster Iestyn
df7c54d620
Rewrote findfile to store whether any of the three paths searched had a bad MD5 rather than just simply being not there.
...
This means that, if the three paths are not the same, you should be able to tell if at least one of them has a file that just had a bad MD5. Most relevant for Linux peeps I expect.
Note: Untested as of writing
2018-04-15 22:00:31 +01:00
Monster Iestyn
a3b345f6b1
Don't use CV_StealthSetValue on cv_itemfinder if running the game in dedicated mode
2018-04-15 19:59:57 +01:00
TehRealSalt
8fe068ef46
Merge remote-tracking branch 'refs/remotes/srb2public/next'
...
# Conflicts:
# src/f_finale.c
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/m_misc.c
2018-04-07 18:43:59 -04:00
Steel Titanium
bd928ddb80
Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit
2018-04-03 16:16:20 -04:00
Steel Titanium
91d2ffd660
Indentation fixup
2018-04-03 16:11:07 -04:00
Alam Ed Arias
583e6dd10f
Merge branch 'master' into next
2018-04-03 15:48:06 -04:00
toaster
8924f40744
Merge branch 'openglquickfixes' into 'master'
...
Opengl Quick Fixes
See merge request STJr/SRB2!237
2018-04-03 15:34:24 -04:00
TehRealSalt
70baa4fcd8
This little thing slipped by the merge
2018-04-02 06:43:03 -04:00
TehRealSalt
a9a6ec9393
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
2018-04-02 06:39:26 -04:00
TehRealSalt
69b26f227c
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-31 16:18:28 -04:00
