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

9137 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Cochenour
a0a0b8a6dd How'd this happen...? 2020-01-11 09:36:47 -05:00
Sally Cochenour
889bb09e6c Merge branch 'namirays' into oglshaderport 2020-01-11 09:32:59 -05:00
Sally Cochenour
7dad75f6dd Merge remote-tracking branch 'nami/next' into namirays 2020-01-11 09:30:11 -05:00
James R
013d4858e2 Merge branch 'unsigned-bruh' into 'next' 
Fix incorrect cast

See merge request STJr/SRB2!669
 2020-01-11 02:26:52 -05:00
Nami
eedbb29063 Merge remote-tracking branch 'upstream/next' into lua-railstuff 
# Conflicts:
#	src/p_map.c
 2020-01-10 19:11:17 -08:00
MascaraSnake
07ec05a44b Fix incorrect cast 2020-01-10 23:32:31 +01:00
James R
3a7ee3e5b9 Merge branch 'brickblockbustin' into 'next' 
Brick Block Bustin

See merge request STJr/SRB2!666
 2020-01-10 16:02:59 -05:00
James R
3225affa98 Merge branch 'showconditionset' into 'next' 
Showconditionset

See merge request STJr/SRB2!651
 2020-01-10 15:59:37 -05:00
James R
fc82e03600 Merge branch 'morehints' into 'next' 
Allow for 10 emblem hints on a map by poking the drawer a bit.

See merge request STJr/SRB2!650
 2020-01-10 15:59:22 -05:00
James R
5d281ebfd3 Merge branch 'playerthink-hook' into 'next' 
PlayerThink Hook

See merge request STJr/SRB2!557
 2020-01-10 15:58:30 -05:00
MascaraSnake
c5a7f6d6cb Merge branch 'stars-fix' into 'next' 
Add MT_FLINGNIGHTSSTAR mobj type

See merge request STJr/SRB2!663
 2020-01-10 13:34:43 -05:00
MascaraSnake
595537267a Merge branch 'minor-ogl-improvements' into 'next' 
Minor OpenGL improvements

See merge request STJr/SRB2!661
 2020-01-10 13:32:37 -05:00
MascaraSnake
000dbb2336 Merge branch 'extratextoffs' into 'next' 
Fix snapping of extra multiplayer text. (Resolves #101)

See merge request STJr/SRB2!667
 2020-01-10 13:31:57 -05:00
toaster
8926b8b324 Fix snapping of extra multiplayer text. (Resolves #101) 2020-01-10 12:50:58 +00:00
toaster
1adceb858c Mario brick blocks are likely to always have square sectors dividing seperate bricks, so allow them to be busted individually. 2020-01-10 11:43:41 +00:00
James R
f1712f2cd8 Merge branch 'rollout_consistency' into 'next' 
Rollout Rockonsistency

See merge request STJr/SRB2!655
 2020-01-09 16:20:34 -05:00
Alam Ed Arias
f267f7bb3e whitespace cleanup 2020-01-09 16:19:12 -05:00
James R
2317cb4c04 Merge branch 'public_hexang' into 'next' 
Hexafaceted sprite angle support.

See merge request STJr/SRB2!652
 2020-01-09 16:14:49 -05:00
MascaraSnake
9c70ee2690 Merge branch 'fakeplanes-colormap' into 'next' 
Don't create colormap data out of sidedef text for fake planes linedef

See merge request STJr/SRB2!648
 2020-01-09 15:04:33 -05:00
Tatsuru
2fda026608 *bends over seductively to pick up whitespace* 2020-01-09 16:16:24 -03:00
Tatsuru
8d5153a595 This is stupid 2020-01-09 12:15:26 -03:00
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
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
Nami
03e8097744 Splits part of PTR_SlideTraverse into a lua-exposed function, exposes P_RailThinker 2020-01-08 03:48:30 -08:00
Sally Cochenour
7c70cce4ce Fullbright transparent planes 
(I disagree with this feature so hard but w/e)
 2020-01-08 04:10:23 -05:00
Sally Cochenour
be3bf3acd1 Water surface shader 
Does not warp anything beneath the surface YET, just the texture itself, but it's far better than nothing
 2020-01-08 03:37:46 -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