thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-02 06:04:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18440 commits 2 branches 14 tags 206 MiB
Commit graph

176 commits

Author SHA1 Message Date
James R
0e6bb75230 Check TRIPWIRE texture at map load 
So it can be animated.
 2021-11-28 04:08:38 -08:00
toaster
ebe38ff518 * Add a blend field to FOFs. 
* Set via a fourth digit in the upper midtexture for transparent FOFs
        * For example - #2551 is additive solid, #1282 is subtractive half...
    * The original method of setting the upper midtexture to #900 or 901 still works, since I'm not out to break existing maps.
* Software: Remove the horrible `else if` ladder for FOF translucency. Algorithms, baby!
* OpenGL: Move to using `HWR_GetBlendModeFlag` in more places, for more long-term extensible support for multiple blendmodes.
 2021-04-01 23:45:21 +01:00
toaster
40cbc30bff Mammoth commit, sorry. 
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.

Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.

If nothing else, the hard engineering problems are solved and it's just bug hammering...
 2021-03-31 22:46:23 +01:00
Sally Coolatta
4139e67ddb Renderer compile errors 2021-02-28 23:31:56 -05:00
Sally Coolatta
420a6ccccb Fix Dehacked loading 2021-02-28 22:39:47 -05:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next 
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
 2021-02-27 05:18:36 -05:00
James R
0292464611 Let sector flags control plane ripple effect 2021-01-12 22:16:55 -08:00
Jaime Ita Passos
be274a4fa9 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
Jaime Passos
8599447c70 Remove RF_VOXELSPRITE 2020-11-05 00:44:10 -03:00
Jaime Passos
d2c000b252 Implement an "ignore colormaps" sprite rendering flag 2020-10-27 19:54:50 -03:00
Sryder
d311242a6e Support for additive/subtractive translation maps on FOFs and Polyobjects 
Polyobjects set translucency to 11 for additive, and 12 for subtractive
FOFs using the regular translucency settings set the top texture to #900 for additive, and #901 for subtractive
 2020-10-22 23:13:51 +01:00
Jaime Passos
96fa912bae Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
Jaime Passos
a6f2e8b9c6 Implement relative and absolute sprite offsets for objects (mobjs) 
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
 2020-10-13 12:57:36 -03:00
Jaime Passos
9bb09cdc8c OpenGL support for splats, fix some shadow draw bugs in Software 2020-10-12 19:53:21 -03:00
Jaime Passos
b4b4738c94 Changes to sprite rendering: 
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
 2020-10-12 00:13:22 -03:00
Jaime Passos
e23929a899 Refactor patch rotation 2020-10-10 18:43:26 -03:00
Jaime Passos
98c6b54994 Improved memory management for patches 2020-09-07 02:23:07 -03:00
Sally Coolatta
9efdc98de6 Makes it through all kart files 
All that's left is SDL, OGL, maybe also Lua
 2020-08-15 04:42:56 -04:00
Sally Coolatta
9b9ab8a2d5 Get up to p_user 2020-08-14 23:23:14 -04:00
Sally Coolatta
b9436ee015 More fixing up 
Got tired again, but now it makes it to f_finale
 2020-08-11 18:46:00 -04:00
Sally Coolatta
27f289ea6e Fix random #endif in seg_t 2020-08-10 17:05:29 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Jaime Passos
f6a5acc6f3 Remove LUA_PATCH_SAFETY 2020-08-08 14:56:04 -03:00
Jaime Passos
a7f3dd7eff Refactor patch loading 2020-08-08 05:16:47 -03:00
SteelT
30fd6f5db5 Merge src/r_defs.h 2020-08-06 18:36:30 -04:00
Nev3r
ebe16a66d9 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
 2020-07-10 18:18:07 +02:00
Nev3r
9210b2ba0b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
Jaime Passos
9788afa820 Remove Software tricks 2020-07-06 01:26:56 -03:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Sryder
d4080e94f7 Better fake contrast. 
Fake contrast for the segs are calculated at map load.
OpenGL only has the options "Standard" and "Smooth" now. Standard is default and replicates software. Smooth changes the contrast more smoothly depending on angle.
 2020-05-21 16:32:34 +01:00
MascaraSnake
2e9a6afa3e Merge branch 'udmf-next' into executordelay 
# Conflicts:
#	src/p_spec.c
 2020-05-13 09:55:25 +02:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
MascaraSnake
8c22834b46 Merge branch 'next' into udmf-next 2020-05-04 20:32:56 +02:00
MascaraSnake
5c0559a3d2 Adapt linedef executor delay to UDMF 2020-05-03 20:41:37 +02:00
MascaraSnake
8efec04051 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
Nev3r
dbf2b9c0f0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/r_segs.c
 2020-04-25 10:47:45 +02:00
MascaraSnake
d2e21afaf1 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
 2020-04-24 21:15:53 +02:00
Nev3r
c6cc863a3a Merge branch 'udmf-next' into udmf-multitag 
# Conflicts:
#	src/p_spec.c
 2020-04-18 14:04:15 +02:00
Nev3r
109d09aa4c Merge branch 'udmf-colormaps' into 'udmf-next' 
UDMF colormaps

See merge request STJr/SRB2!855
 2020-04-18 07:42:24 -04:00
Nev3r
f61d677f34 Delete tags. 2020-04-18 00:23:24 +02:00
Nev3r
86b0eabaa2 Delete old taglists. 2020-04-18 00:05:55 +02:00
MascaraSnake
93eb0ee1c8 Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
Nev3r
cccf5d8151 Merge branch 'udmf-next' into udmf-multitag 2020-04-14 22:21:32 +02:00
Nev3r
750cafbcbc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-14 22:20:54 +02:00
Nev3r
44426fd453 Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose. 2020-04-13 15:17:53 +02:00
Nev3r
e00c8fcdbe Added static multitag read and storage on mapload. 2020-04-12 11:56:36 +02:00
Nev3r
860c44d953 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/lua_hooklib.c
 2020-04-12 09:57:19 +02:00
Sally Cochenour
505b0176c0 Horizon line apply to FOFs backport 2020-03-25 22:30:52 -04:00
MascaraSnake
58e8ec6500 Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES 2020-03-25 08:34:52 +01:00
MascaraSnake
62603ff226 Merge branch 'udmf-next' into udmf-colormaps 2020-03-22 08:05:05 +01:00