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

1038 commits

Author SHA1 Message Date
Alam Ed Arias
d09016c808 Merge branch 'public_next' into master 2016-02-09 14:19:50 -05:00
Alam Ed Arias
6000b5c980 Merge branch 'master' into next 2016-02-09 14:13:50 -05:00
Sean Ryder
ddb5652ab6 Tabbing 2016-02-09 18:05:19 +00:00
Sryder13
6b8c438e58 Change a few colours. 2016-02-09 18:05:11 +00:00
Sryder13
31deecc51c Colour Changing MD2s 
I don't know how I can move my old branch over so I've just created a new one.
 2016-02-09 18:04:59 +00:00
Monster Iestyn
700c9c2e70 Merge branch 'md2_colourchange' into 'master' 
Colour Changing MD2s

What it says it is, I haven't touched it in quite a while, but I have checked and it seems to be working.

See merge request !30
 2016-02-09 13:03:52 -05:00
Sean Ryder
b7ebb8186d Fix MD2 interpolation for FF_ANIMATE states 2016-02-09 16:20:18 +00:00
Inuyasha
8fc484cea9 Just a few more changes to TUNES, nothing special 
(cherry picked from commit 63a9c66317)
 2016-02-09 02:48:35 -08:00
Inuyasha
04d112276e Fixed some oddities with TUNES. 
(cherry picked from commit a4d05350f7)
 2016-02-09 02:48:35 -08:00
Inuyasha
1203b0aa73 Fix crash on game clear 
(No, game, you can't allocate a map header for the credits, why were you doing that before and how did it not break anything??)

(cherry picked from commit e1f9a01229)
 2016-02-09 02:48:34 -08:00
Inuyasha
caab150c92 Fixed LD413 
(cherry picked from commit 1e4c2f8aad)
 2016-02-09 02:48:34 -08:00
Inuyasha
8c17dac589 The concept of "music slots" doesn't exist anymore. 
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.

(cherry picked from commit 025ca413a2)

# Conflicts:
#	src/p_user.c
 2016-02-09 02:48:33 -08:00
Inuyasha
58e685353a Attempt 2 at special stage fades. 
More basic in execution.
 2016-02-09 02:43:24 -08:00
Inuyasha
1bdd4cf641 backport state-animations from internal master to public next 
most other code in the branch did not come along for the ride.
 2016-02-09 02:39:16 -08:00
Monster Iestyn
66175d87b8 removed unused macros from doomdef.h 2016-02-08 20:10:32 +00:00
Alam Ed Arias
985b9a11cc Merge branch 'travis-ci' into 'master' 
Travis-CI builds

Merge support to build SRB2 for Linux system via Travis-Ci
This will build SRB2 with GCC and Clang to make sure we do not break Linux/GNU builds

See merge request !41
 2016-02-07 21:57:26 -05:00
Alam Ed Arias
dff65aa9e0 Merge branch 'public_next' into master 2016-02-07 21:25:42 -05:00
Alam Ed Arias
2dc9a4b34a Merge branch 'master' into next 2016-02-07 21:22:28 -05:00
Alam Ed Arias
6b626f1b27 build: cmake is messly 2016-02-07 20:53:27 -05:00
Alam Ed Arias
3ba827f33d Merge branch 'master' into travis-ci 2016-02-07 00:39:25 -05:00
Monster Iestyn
ae2b1e8ea1 Use <= instead of ==, so that sprites for second-tier portals and beyond still display 
thx Red for spotting this
 2016-02-06 21:06:52 +00:00
Monster Iestyn
166fafd717 Fixed div-by-zero crash relating to portals, drawsegs and midtextures 
Had to remove Red's scale hack in order to do so, because it utterly fails when the drawseg doesn't actually belong to the portal in the first place.
 2016-02-06 18:57:26 +00:00
Alam Ed Arias
07fc74eaf5 clang: fixup a few clang warnings 2016-02-05 22:38:40 -05:00
Alam Ed Arias
68054a49e3 clang: cleanup 2016-02-05 22:32:14 -05:00
Alam Ed Arias
f4886657c1 clang: fixup a few clang warnings 2016-02-05 22:12:12 -05:00
Alam Ed Arias
864baeda05 cmake: fixed up to handle Clang and AppleClang 2016-02-05 21:49:24 -05:00
Monster Iestyn
9973bedd5f Free the memory of all clipping arrays for each portal properly 
Not the actual fix I'm intending to make with this branch, but it's needed anyway
 2016-02-05 16:38:33 +00:00
Inuyasha
2b482324b4 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-02-03 18:11:51 -08:00
Inuyasha
5320424269 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-02-03 18:09:08 -08:00
Inuyasha
c05c43cfee Merge branch 'monster-misc' into 'master' 
Monster Iestyn's Miscellaneous (netplay-compatible) changes

Just cleaning up some unused or unnecessary things left in the source code, see the commits for exact changes made if you like.

May add more stuff to this branch later, there's no rush really.

See merge request !39
 2016-02-03 21:06:57 -05:00
Inuyasha
84fb4d108a Merge branch 'diagonal-spring-rings-tweak' into 'next' 
Diagonal spring rings tweak

If you didn't know before, those special placement ring lines for diagonal springs only use multiples of 45 for their angles in-game. In other words, they only face any of the 8 basic cardinal directions (N, S, E, W, NE, NW, etc). Considering that springs themselves don't follow the above behaviour, you can probably work out that's a bad thing.

This branch changes that of course, if you couldn't guess from context. Diagonal spring rings can now be placed with any angles like most thing types already could!

See merge request !37
 2016-02-03 21:05:44 -05:00
Inuyasha
e87a86dd67 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-02-03 18:03:02 -08:00
Inuyasha
f17be6641e Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-02-03 18:00:28 -08:00
Monster Iestyn
0455b572dc Removed weird test for water planes in HWR_Subsector 
It crashes when you try to test it anyway, lol
 2016-02-03 17:58:44 -08:00
Monster Iestyn
d1b89c9320 Quick fix for another drawer lib function while I'm here, cough 2016-01-31 22:52:02 +00:00
Monster Iestyn
04528eb3e6 <Inuyasha> MonsterIestyn: what about render_none? 2016-01-31 22:15:17 +00:00
Monster Iestyn
dafe0ccd11 Added v.width(), v.height() and v.renderer() to Lua's drawer/video library 2016-01-31 21:53:14 +00:00
RedEnchilada
8505ad4d14 Merge remote-tracking branch 'public/next' 2016-01-31 13:06:55 -06:00
Monster Iestyn
2e58f6c4d9 Fixed that odd bug where PolyObjects sometimes leave a vertex or two in their control sectors 
Turns out the seg-searching code falsely assumed it'd find frontfacing segs first, who knew?
 2016-01-31 13:05:30 -06:00
Monster Iestyn
2d94b2a85f keys.h doesn't need to be included twice here lol 2016-01-31 17:10:57 +00:00
Monster Iestyn
deb958a796 Remove unused "INVERSECOLORMAP" macro 2016-01-31 17:06:03 +00:00
Monster Iestyn
9e29b69a29 Remove unused "firstnewseg" variable 2016-01-31 16:49:04 +00:00
Monster Iestyn
8b56cd76c7 doomtype.h tweaks 
some of the mess in here really bothers me

(cherry-picking this commit of mine from next since it only fixes a small oversight with compiling and adds a comment)
 2016-01-31 15:08:16 +00:00
Monster Iestyn
cd198d6809 merge SOC_****, MAINCFG and OBJCTCFG searches into one big search for any of them 
This makes it so that it doesn't matter what order you place SOC lumps within a WAD... relative to other SOC lumps at least, anyway
 2016-01-30 17:19:05 +00:00
Monster Iestyn
5cae87430f Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into new-SOC-lump-names 2016-01-30 16:39:55 +00:00
Inuyasha
cd4442d971 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-01-29 18:30:58 -08:00
Inuyasha
e49f531ba1 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-01-29 18:27:33 -08:00
Alam Ed Arias
82bfce7683 Merge remote-tracking branch 'magicgirl/master' 2016-01-29 20:29:28 -05:00
Inuyasha
93d1f9920e Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-01-29 16:03:52 -08:00
Inuyasha
e6f0a4be18 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-01-29 16:01:57 -08:00