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

9167 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Cochenour
d6e15bd2cd Remove smooth setting 
It got denied before for Software so I won't include it in the merge request :(
 2020-01-09 01:28:14 -05:00
James R
adf76f6e78 Don't clip player MD2 either! 2020-01-08 20:52:34 -08:00
James R
0bc03b8f9d Don't make player transparent if the orbital camera is looking straight down 2020-01-08 20:49:38 -08:00
fickleheart
e276e1979c Check for papersprites per-sprite instead of per-row 
In theory, should be a performance improvement. In practice idk
 2020-01-08 21:14:11 -06:00
fickleheart
8cae57eab0 Reduce disappearance of vissprites close to the camera 2020-01-08 21:14:09 -06:00
fickleheart
4fcae66242 Make papersprite projection completely correct in software 
I heard properpaper had some weird crashes? I couldn't reproduce
them no matter how hard I tried, but I added some bounds checking
to this version too just in case. Gotta get other people's help
to try to reproduce those.
 2020-01-08 21:14:07 -06:00
Zachary McAlpin
6f60341aec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-08 18:52:56 -06:00
toaster
4f77e1e99b Allow Rollout Rocks that are being ridden to: 
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.

This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).

Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
 2020-01-08 22:36:29 +00:00
toaster
456778f950 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang 
# Conflicts:
#	src/r_defs.h
 2020-01-08 21:47:47 +00:00
James R
f97afe47fa Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
James R
b3a03c76b4 Merge branch 'names-update' into 'master' 
Update copyright statements for changed names

See merge request STJr/SRB2!644
 2020-01-08 16:16:41 -05:00
James R
0046d8844d Merge branch 'state-fix' into 'next' 
Fix S_HAMMER being off by one

See merge request STJr/SRB2!654
 2020-01-08 16:15:55 -05:00
James R
0035964251 Merge branch 'next-newcontrols' into 'next' 
fcam simple controls but slightly less hacky

See merge request STJr/SRB2!647
 2020-01-08 16:15:47 -05:00
James R
0f79370188 Merge branch 'highresscale-continue' into 'master' 
Apply skin's highresscale to continue screen

See merge request STJr/SRB2!645
 2020-01-08 16:15:15 -05:00
James R
60ffbcdf29 Merge branch 'more-opengl-fixes' into 'master' 
More OpenGL fixes plus masked PNG conversion

See merge request STJr/SRB2!619
 2020-01-08 16:14:51 -05:00
James R
40d080cfe1 Merge branch 'local-lua-commands' into 'next' 
Local Lua commands + no magic numbers

See merge request STJr/SRB2!602
 2020-01-08 16:14:30 -05:00
Steel Titanium
447f9e65c3 Fix S_HAMMER being off by one 2020-01-08 16:00:02 -05:00
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
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