thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3804 commits 1 branch 12 tags 205 MiB
Commit graph

3804 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
b2caed8528 Merge branch 'public_flatsprite' 
# Conflicts:
#	src/dehacked.c
#	src/hardware/hw_main.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_pspr.h
#	src/p_user.c
#	src/r_defs.h
#	src/r_things.c
#	src/r_things.h
 2018-06-09 21:14:41 +01:00
Monster Iestyn
105eee7e0a Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/d_netfil.c
#	src/p_setup.c
 2018-06-09 19:35:36 +01:00
Monster Iestyn
241ec4123b 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
41cb51159d 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
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
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
MascaraSnake
11798833ba Merge branch 'flat-alignment-change' into 'master' 
Change to linedef type 7 (flat alignment): If no tag is given, affect front sector.

See merge request STJr/SRB2Internal!145
 2018-05-15 03:40:31 -04:00
MascaraSnake
ba7fa3a407 Consistency: Pointer declarations next to the variable name instead of the type 2018-05-15 09:39:52 +02:00
MascaraSnake
3e99456542 Change to linedef type 7 (flat alignment): If no tag is given, affect front sector. 2018-05-14 19:34:22 +02: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
toasterbabe
8fdbb3a97b [13:01] toaster: hey 
[13:01] toaster: would anyone object if i pushed this to master
[13:02] toaster: so my changes to devmode don't fuck with gifs, for example https://cdn.discordapp.com/attachments/428262628893261828/432500920773771264/srb20575.gif
[13:02] NEV3R: ¯\_(ツ)_/¯
[13:02] toaster: ok i'll just do it
 2018-04-08 13:03:40 +01:00
toaster
cfc895d59e Merge branch 'delag_maces' into 'master' 
Delag Maces

See merge request STJr/SRB2Internal!141
 2018-04-07 18:11:31 -04:00
toasterbabe
52c7a57052 comment goof 2018-04-07 23:10:34 +01:00
toasterbabe
504f162b59 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into delag_maces 
# Conflicts:
#	src/p_mobj.c
 2018-04-07 01:54:43 +01:00
Digiku
9f46d30ba2 Merge branch 'op-nightsbumper' into 'master' 
NiGHTS Objectplace: Preserve MT_NIGHTSBUMPER vertical angle upon WRITETHINGS

See merge request STJr/SRB2Internal!137
 2018-04-06 20:21:25 -04:00
toaster
f4e2d7afd5 Merge branch 'texture-fixes' into 'master' 
Texture fixes

See merge request STJr/SRB2Internal!135
 2018-04-06 17:44:17 -04:00
toaster
ab1fa8d7ed Merge branch '100-make-slopes-static-by-default-and-require-flag-to-turn-them-dynamic' into 'master' 
Resolve "Make slopes static by default, and require flag to turn them dynamic."

Closes #100

See merge request STJr/SRB2Internal!140
 2018-04-06 17:43:47 -04:00
toaster
7787f6e347 Merge branch 'pretty_stuff' into 'master' 
Pretty stuff

See merge request STJr/SRB2Internal!131
 2018-04-06 17:40:52 -04:00
toasterbabe
4e02562182 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 
# Conflicts:
#	src/hardware/hw_draw.c
 2018-04-06 19:38:19 +01:00
Monster Iestyn
43743722c7 Merge branch 'public_next' 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
#	src/sdl12/hwsym_sdl.c
#	src/sdl12/i_video.c
 2018-04-06 18:42:07 +01:00
toasterbabe
6a037d09e5 * Improve devmode text. 
* Make sure showfps never covers anything relevant to the base game.
* Tweak spectator text for raising/lowering.
* Minor code-smell squishes.
 2018-04-06 18:40:08 +01:00
toasterbabe
4a2cad49fc * Correct V_PERPLAYER's screen-centered (no snapto flags on a given axis) behaviour. 
* Fix that one comment Digiku mentioned. ;P
* Make extra lives/100 ring rewards consistent between lives being relevant and lives being infinite/not present, which was a problem this branch made evident when Race ended up getting the infinite lives symbol!
 2018-04-06 14:42:49 +01:00
toasterbabe
d7111f67c0 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 2018-04-06 12:54:39 +01:00
Wolfy
b62752a7b4 Revert "THZ Hardcoding" 
This reverts commit c6fc425648.

Note to self: read through the fucking merge requests
 2018-04-05 12:49:39 -05:00