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

16729 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hannu Hanhi
1c4d605b51 Fix shader comment 2020-07-19 16:07:53 +03:00
James R
1dae3d196b Who said anything about a 5th frame? 2020-07-18 14:52:30 -07:00
Hannu Hanhi
e575676887 Don't override custom shaders with model lighting shader 2020-07-18 15:48:37 +03:00
Hannu Hanhi
5b8c41fffd Add capability to use model lighting with shaders enabled 2020-07-18 15:08:59 +03:00
James R
59c0f99865 5th frame + rainbow colors cycle on the drift explody 2020-07-17 23:44:00 -07:00
Jaime Passos
16c4ba672a Move the sky dome code out of r_opengl.c, fix issues with shaders 2020-07-17 02:48:05 -03:00
Zachary McAlpin
ad38289605 Bruh I screwed up 2020-07-17 00:33:07 -05:00
Zachary McAlpin
6877df94bc Ported Lat's PlayerCmd hook to vanilla SRB2 2020-07-17 00:08:38 -05:00
James R
9841464e39 Merge branch 'next-lc-uint16' into 'next' 
Fix skincolor-related memory leak

See merge request STJr/SRB2!1066
 2020-07-16 22:01:07 -04:00
James R
95a6e194e1 Merge remote-tracking branch 'origin/master' into next 2020-07-16 19:00:21 -07:00
Hannu Hanhi
85b2ed594f More work on sprite-texture model uv adjustment 2 2020-07-16 22:39:44 +03:00
Hannu Hanhi
edc479fd13 More work on sprite-texture model uv adjustment 2020-07-16 22:11:36 +03:00
James R
755a0e9440 It's not always GCC, but it probably is gcc (I hope) 
(cherry picked from commit 4e1d54c3322c17276e532ab4d9e875a8c8ebc399)
 2020-07-15 14:47:41 -07:00
James R
7c2aa5fd19 Forgot a comma 
(cherry picked from commit 193c45aa2f555b56f548f70e7fa0d74a1ce4e412)
 2020-07-15 14:47:17 -07:00
James R
87e55c18c4 Makefile: Move the PREFIX stuff up so version detection can take advantage of 
(cherry picked from commit 489bb81d0065299ffea09b20cfa06dbbedcf247a)
 2020-07-15 14:47:16 -07:00
James R
2610163096 Detect the compiler version and set the correct GCC flag 
If the version is not supported by the Makefile, the flag for the latest
version supported is set instead.

(cherry picked from commit bf90fbb91f28af30ff79523681e7f73e60121535)
 2020-07-15 14:47:16 -07:00
Ashnal
f4d648526d Moved K_DropRocketSneaker call into K_StripItems 
This should catch when DropHnextList misses it
Should probably fix sinks too ...
 2020-07-15 09:17:35 -04:00
Ashnal
f60b6c881d Properly handle rocket sneakers when shrinking 2020-07-14 19:50:37 -04:00
Ashnal
fef23cf779 Some safeguards for K_DropRocketSneaker usage 2020-07-14 19:45:15 -04:00
Ashnal
bb6a5662c2 Fixing RocketSneakers 
New function specifically for dropping rocketsneakers K_DropRocketSneaker
Used by Eggbox touchspecial to properly dispose of shoes and clean up hnext
Now also used by the shoe thinker to drop themselves
Fixes angle of spent shoe launch
 2020-07-14 18:45:45 -04:00
James R
afe235a269 Merge branch 'fix-lib_freeslot' into 'next' 
Fix lib_freeslot

See merge request STJr/SRB2!1064
 2020-07-14 18:32:10 -04:00
James R
5c44774994 Merge branch 'minor-lua-fixes' into 'next' 
Minor Lua Fixes (CONS_Printf and mobj_t.valid)

See merge request STJr/SRB2!1065
 2020-07-14 18:32:00 -04:00
SwitchKaze
4184d83ef2 Fix skincolor-related memory leak 2020-07-14 17:09:31 -05:00
Hannu Hanhi
73b8f9f131 Merge remote-tracking branch 'upstream/next' into ogl-model-uv-adjust 2020-07-14 20:30:56 +03:00
Sryder
f1ba06351c Merge branch 'float-in-mobjscale' into 'master' 
Rings float height is not mobjscaled!

See merge request KartKrew/Kart!295
 2020-07-14 07:54:29 -04:00
kaysrishaq
de3b0c36c8 minor lua fixes 
minor lua fixes
 2020-07-14 01:34:57 -04:00
Ashnal
fb51f60e20 Add clean up to K_PuntMine 
This cleans up hnext when a mine shield is P_RemoveMobj'ed while being punted
Otherwise, hnext could point to a removed mobj and cause undefined behavior
This also fixes the bug where if you have multiple mines in your slot, drag one
and have it punted, all your unused mines would disappear.
This should/may fix the crashes/desyncs I've observed in gameplay when a held mine is punted.
 2020-07-14 00:21:46 -04:00
James R
716898ebf6 Probably a good idea to flip with mobjscaled height 2020-07-13 19:58:00 -07:00
James R
f348cd0f1f Multiply ring float height by mobjscale 2020-07-13 19:55:00 -07:00
kaysrishaq
a3558c29e3 Fix lib_freeslot 2020-07-13 18:56:07 -04:00
James R
f8b659e4bd Merge branch 'various-color-fixes' into 'next' 
Various color fixes

See merge request STJr/SRB2!1060
 2020-07-13 18:24:55 -04:00
kaysrishaq
9916f468a7 Fix formatting 
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
 2020-07-13 15:16:49 -04:00
James R
f4a68ade51 Merge branch 'cmake-adjustments' into 'master' 
CMAKE additions: SDL Mixer X, *.debug adjustments, CPACK adjustments, CCACHE

See merge request STJr/SRB2!992
 2020-07-13 12:40:13 -04:00
James R
4982a79ca4 Use SRB2VERSION here... 2020-07-13 08:59:41 -07:00
James R
47719474ef Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
GoldenTails
68058acc79 Fix small inconsistency 2020-07-12 19:38:38 -05:00
GoldenTails
2b2d47d8b0 Allow multiple ports to host under one IP address. 2020-07-12 19:38:24 -05:00
GoldenTails
9d7e8a19c8 Fix the Master Server so it works 
Instructions:
1. In SQL, create an account called "srb2_ms" @ "localhost" (or your hostname).
2. Grant the account full priviledges to "srb2_ms" (the database).
3. Compile, and run using the sh script provided.
That's all I'm telling you, I don't want this to become rampant.
 2020-07-12 19:38:15 -05:00
James R
3a34fa8561 Merge remote-tracking branch 'origin/master' into next 2020-07-12 17:11:22 -07:00
James R
6efedfc756 Merge remote-tracking branch 'origin/master' into cmake-adjustments 2020-07-12 16:24:24 -07:00
James R
2182018930 Merge branch 'p-xymovement-lua-exposure' into 'next' 
Expose several movement-related functions to Lua.

See merge request STJr/SRB2!884
 2020-07-12 19:11:47 -04:00
James R
a030a05f8b Merge branch 'remove-glide-2' into 'next' 
Remove references to the Glide API

See merge request STJr/SRB2!1037
 2020-07-12 19:10:34 -04:00
James R
16ce826caf A few more instances of "gr" to purge 2020-07-12 16:09:43 -07:00
Kays Ishaq
639de75fc1 move dupenum declaration to beginning of block 2020-07-12 19:05:27 -04:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
GoldenTails
80b42ba46e Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails
a913a8a652 Expose P_PlayerZMovement to Lua. 
Finishing off these changes; how a player moves vertically.
 2020-07-12 18:02:50 -05:00
GoldenTails
6124e010b2 Expose P_SceneryZMovement to Lua. 
Still more complex than P_RingZMovement.
 2020-07-12 18:02:50 -05:00
GoldenTails
93edc25cae Expose P_RingZMovement to Lua. 
Ever wanted to move like a ring vertically?
 2020-07-12 18:02:50 -05:00
GoldenTails
d0f9d79170 Expose P_ZMovement to Lua. 
Because P_XYMovement wasn't enough.
 2020-07-12 18:02:50 -05:00