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
9547 commits 1 branch 12 tags 205 MiB
Commit graph

8361 commits

Author SHA1 Message Date
toaster
336b6ad85e Hexafaceted sprite angle support (See merge request description coming soon). 
Also, some minor memory efficiency fixes to both rotsprite and ordinary sprite rotations.
 2020-01-08 20:49:14 +00:00
toaster
44b68036e8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into showconditionset 
# Conflicts:
#	src/m_menu.c
 2020-01-08 20:00:50 +00:00
toaster
a2ae30c2e2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into morehints 
# Conflicts:
#	src/m_menu.c
 2020-01-08 19:18:35 +00:00
Sally Cochenour
0365716299 Fullbright transparent planes 
(I disagree with this feature so hard but w/e)

(cherry picked from commit fe809b2734d430655966151e56f96963e2d7b2cf)
 2020-01-08 13:13:07 -05:00
Sally Cochenour
3191c365de More blend image updates 
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software

(cherry picked from commit 74d7f256a7849d0c829177614b37089e2446f86b)
 2020-01-08 13:12:37 -05:00
Sally Cochenour
1871d01de6 Increase precision of smooth contrast 
(cherry picked from commit 4c6664292e1f9b0d5c2ff34e28f05a8b63a4dd45)
 2020-01-08 13:12:15 -05:00
Sally Cochenour
23cb9a018d Fake contrast 2020-01-08 13:11:53 -05:00
Sally Cochenour
e4744f6c34 Update blend textures to smooth out colors that have duplicate indices 2020-01-08 13:09:29 -05:00
James R
d68c420315 Left word jump (whoo that took long) 2020-01-08 02:54:17 -08:00
James R
827d673667 Right word jump 2020-01-08 01:03:44 -08:00
MascaraSnake
8ae2f1d4d3 Don't create colormap data out of sidedef text for fake planes linedef (the colormap data isn't even used anymore) 2020-01-08 09:28:37 +01:00
MascaraSnake
ce7a1b289f Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next 2020-01-08 08:43:55 +01:00
MascaraSnake
3a6614409b Fix a condition in the flame jet thinkers I accidentally messed up 2020-01-08 08:43:36 +01:00
fickleheart
e20365ca81 Mixed code and declaration stuff 2020-01-08 00:22:17 -06:00
fickleheart
7008c10f23 oh god I forget why this is here but let's not remove it now 2020-01-08 00:21:03 -06:00
James R
cea03e4256 Merge branch 'dashmode-tweaks' into 'next' 
Dashmode tweaks

See merge request STJr/SRB2!646
 2020-01-08 01:10:44 -05:00
fickleheart
084a8db5a9 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
lachwright
1811a2a34d Dashmode tweaks: 
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
 2020-01-07 15:38:48 +08:00
James R
9804e15e6f Merge branch 'amyhearts-fix' into 'next' 
Fix NPC Amy's love hearts crashing if they didn't have a set fuse

See merge request STJr/SRB2!641
 2020-01-07 01:05:09 -05:00
lachwright
58d1bcf984 Apply skin's highresscale to continue screen 2020-01-07 13:56:54 +08:00
Tatsuru
30683f5bdd ifdefs make indenting confusing 2020-01-07 01:24:04 -03:00
Steel Titanium
9a48bc65ec Update copyright statements for changed names 2020-01-06 17:16:27 -05:00
MascaraSnake
36183e0455 Merge branch 'ignore-glsegs' into 'next' 
Add missing glseg checks (and remove a superfluous one)

See merge request STJr/SRB2!642
 2020-01-06 17:08:32 -05:00
Alam Ed Arias
06849fed6b Merge branch 'master' into next 2020-01-06 10:28:21 -05:00
Alam Ed Arias
ca130c4313 idented hell 2020-01-06 09:58:05 -05:00
MascaraSnake
33c35230c2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
MascaraSnake
b9a8ebbdac Merge branch 'move-map-copying' into 'next' 
Reorder map loading

See merge request STJr/SRB2!635
 2020-01-06 04:24:39 -05:00
Alam Ed Arias
4ffe5d0670 cleanup whitespace 2020-01-05 21:49:07 -05:00
Tatsuru
a50549aa7c Don't fuck with the fuse if it's negative 2020-01-05 23:41:22 -03:00
Tatsuru
ce45746d02 No comments 2020-01-05 23:19:52 -03:00
Tatsuru
89eda2fa9b :amybruh: 2020-01-05 23:18:38 -03:00
James R
2a6cf10f79 Merge branch 'lua-neatstuff' into 'next' 
Extra functionality for lua

See merge request STJr/SRB2!601
 2020-01-05 20:54:17 -05:00
Jaime Passos
652a71abf6 Merge remote-tracking branch 'origin/master' into more-opengl-fixes 2020-01-05 22:04:51 -03:00
Jaime Passos
c47ab3b31f Fix chroma key 2020-01-05 22:04:19 -03:00
James R
3d3b4d183f Merge branch 'fix-mouse-grabbing' into 'master' 
Fix mouse being grabbed even when not used

See merge request STJr/SRB2!639
 2020-01-05 18:46:13 -05:00
Louis-Antoine
059a09d00e Fix mouse being grabbed even when not used 
The other way around this time.
 2020-01-06 00:40:28 +01:00
Louis-Antoine
93e878b8f0 Revert "Fix mouse being grabbed even when not used" 
This reverts commit 7d67be582b.
 2020-01-06 00:38:40 +01:00
James R
db591f85e3 Merge branch 'vgetcolorfixes' into 'master' 
Fix usage of V_GetColor

See merge request STJr/SRB2!638
 2020-01-05 17:12:21 -05:00
James R
a850a97300 Merge branch 'connect-ip-textbox' into 'master' 
Add clipboard functionality to the Connect via IP textbox.

See merge request STJr/SRB2!597
 2020-01-05 17:06:45 -05:00
Jaime Passos
e9e82b5ea0 Fix GetTextureUsed 2020-01-05 18:10:33 -03:00
Louis-Antoine
7d67be582b Fix mouse being grabbed even when not used 2020-01-05 18:39:16 +01:00
Jaime Passos
8cfc38813c I was using V_GetColor in a lot of places I shouldn't have, making the game look wrong with a non-default colour profile. 
Though, I left R_RainbowColormap alone.
 2020-01-05 03:20:05 -03:00
Jaime Passos
71f7130abe AA trees are not needed at all for rotated patches 2020-01-05 03:10:03 -03:00
MascaraSnake
387313a539 Merge branch 'remove-vertex-z-mk2' into 'next' 
Remove "z" from "vertex_t"

See merge request STJr/SRB2!636
 2020-01-04 19:31:16 -05:00
Alam Ed Arias
4408d2bb17 Copy and Paste error 2020-01-04 18:34:16 -05:00
Alam Ed Arias
fbee649c65 SpawnVertexSlops() is only used in p_slopes.c 2020-01-04 18:33:58 -05:00
Nev3r
82b73a9ea8 Add missing initialization on vertex heights for binary maps. 2020-01-04 23:01:01 +01:00
Nev3r
d8b24fcfba Merge branch 'remove-vertex-z-mk2' into udmf-vslopes 
# Conflicts:
#	src/lua_maplib.c
#	src/p_setup.c
#	src/r_defs.h
 2020-01-04 22:59:42 +01:00
Nev3r
764a8ad43f Remove vertex_t's z variable. 2020-01-04 18:29:02 +01:00
Nev3r
ab63d3e33f Adapt P_ClosestPointOnLine3D() to be much like FV3_ClosestPointOnLine() and use vector3_t's as args, save for the hypotenuse calculation, which remains the same; the output should be the same as before. 
Adapt the rope hang snapping to the new function's form.
 2020-01-04 18:28:25 +01:00