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

5779 commits

Author SHA1 Message Date
toaster
37ee6833d6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into gfz_boss_rework 2019-08-11 21:17:13 +01:00
Monster Iestyn
400cc8124a Disable patch.dta at Rob's request, since we don't really use it anymore 2019-08-11 20:24:14 +01:00
toaster
0fa49e09c8 Fix Rob's Knuckles issue. 2019-08-11 19:37:15 +01:00
toaster
f3eb35bb6d Did some testing, needed to fix one more issue with moving surfaces and spinning. 2019-08-11 14:36:52 +01:00
toaster
a98bbafbc3 Fix all our landing woes. (For now.) 
* Player state upon collision with ground after rolling now sets state properly.
* Fix the thing where Knuckles can glide up a slope like it's nothing WHILE keeping things working for bouncers.
 2019-08-10 16:06:59 +01:00
Monster Iestyn
d52a0365da Merge branch 'polyobj-collide-fix' into 'master' 
Polyobject collide fix

See merge request STJr/SRB2Internal!288
 2019-08-09 14:30:44 -04:00
Alam Ed Arias
06b339f6ae curbgname need one more byte to hold the NULL 2019-08-08 23:46:08 -04:00
Alam Ed Arias
01020ae65f Merge branch 'public_next' into private 2019-08-08 23:41:19 -04:00
Alam Ed Arias
1ae3ad733b Merge branch 'master' into next 2019-08-08 23:18:31 -04:00
Alam Ed Arias
abe1d9809f Disable address-of-packed-member warning 2019-08-08 22:47:33 -04:00
Alam Ed Arias
5b692acc6c Makefile: GCC80 does not exist 2019-08-08 22:34:09 -04:00
Alam Ed Arias
64159d55cf Revert "Try to compile with AppVeyor's GCC 9.1.0" 
This reverts commit 9fc6c3b136.
 2019-08-08 22:31:18 -04:00
Alam Ed Arias
9fc6c3b136 Try to compile with AppVeyor's GCC 9.1.0 2019-08-08 22:19:22 -04:00
Alam Ed Arias
5c0912bab1 Tested to be compile with Mingw64 9.1.0 2019-08-08 21:25:46 -04:00
Alam Ed Arias
e2927ffe2c Makefile: support GCC 9.1 2019-08-08 20:27:57 -04:00
Alam Ed Arias
2c7fbe2087 Makefile: stop building with DWARF v2 debugging info 2019-08-08 18:43:42 -04:00
Monster Iestyn
816d67c9ff After looking at the FOF part of P_LineOpening for a while I now realise many of these variables aren't even necessary, so I removed them all. 
(Naturally I did the same to the camera equivalent)
 2019-08-08 23:04:47 +01:00
Monster Iestyn
d9a78308fe Edit a lot of the rest of the polyobject-related code in P_LineOpening to make more sense and be more optimised. 
* If you collide with a line belonging to a polyobject, you should NEVER have to care about any FOFs that might be present in either sector of the linedef. This could lead to colliding with ghostly FOFs that aren't actually there or something dumb, if someone decided to give either of the polyobject's control sectors FOFs for some reason. We don't want that, obviously.
* Polyobjects without POF_CLIPPLANE apparently are supposed to have a top and bottom "physical" height of value INT32_MAX and _MIN respectively, according to P_CheckPosition ...let's be consistent with this.
* Finally, there is no more need for that back = front nonsense hack anymore with my changes made.
 2019-08-08 16:37:09 +01:00
Monster Iestyn
7940edd1fc P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a linedef you touched belongs to a polyobjetc. the only thing that really matters in this scenario is the polyobject itself after all! 
(This is an untested fix for VAda's apparent collision with thin air below a polyobject in ACZ2 in beta 5)
 2019-08-07 23:27:26 +01:00
MascaraSnake
ff5d1e7757 Merge branch 'fang-fixes' into 'master' 
Fang fixes

Closes #154 and #140

See merge request STJr/SRB2Internal!285
 2019-08-07 14:46:02 -04:00
MascaraSnake
09b49e729c Merge branch 'fixme' into 'master' 
Build fixes

See merge request STJr/SRB2Internal!287
 2019-08-07 14:45:41 -04:00
Alam Ed Arias
9d5abfcee0 Fix compiling without MixerX support 2019-08-07 12:42:07 -04:00
Alam Ed Arias
58a074db26 Fix signed vs unsigned comapre 2019-08-07 12:41:22 -04:00
Alam Ed Arias
f546dced92 All C files should a newline at the end 2019-08-07 12:39:51 -04:00
Alam Ed Arias
88445e72c4 fix PARANOIA builds 2019-08-07 12:39:04 -04:00
mazmazz
0d38d7087b Use strtok instead of strtok_r 2019-08-07 01:29:05 -04:00
MascaraSnake
c6b49391c9 Set Fang's minimum bounce strength to 1.5 times jump strength 2019-08-06 23:35:20 +02:00
MascaraSnake
3786604203 Don't zero out momz when landing on slopes. 
This fixes Fang's bounce on slopes and doesn't seem to make a difference otherwise, but there's still a non-zero chance this broke something.
 2019-08-06 23:18:53 +02:00
toaster
da848d5216 Fix spindashing on a moving surface causing you to change state to rolling instead of spindashing. 
(MI said I could commit to master since it was only a single line.)
 2019-08-04 19:11:58 +01:00
toaster
9cdeee5b84 Merge branch 'revert_revert_musicplus' into 'master' 
Revert "Revert MusicPlus"

See merge request STJr/SRB2Internal!282
 2019-08-04 13:58:01 -04:00
toaster
1425185804 Merge branch 'ringsparkle' into 'master' 
New ring sparkles

See merge request STJr/SRB2Internal!271
 2019-08-04 11:46:40 -04:00
Steel Titanium
7dfe696819 Last min changes 2019-08-04 11:34:55 -04:00
toaster
a664956c87 * Fix the thing where you "roll" in run/walk frames if you hold spin after jumping. 
* Fix the thing where you don't go through super transformation frames when starting NiGHTS.
 2019-08-04 15:25:13 +01:00
toaster
b928c5fc98 Revert "Revert "Fix MIDI Soundfont code shadowing a global variable."" 
This reverts commit d880a02fa1.
 2019-08-04 12:04:01 +01:00
toaster
534b98251b Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit a76668f55a.
 2019-08-04 12:03:57 +01:00
toaster
a76668f55a Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 0f89fb123f, reversing
changes made to 8fb211d8cf.
 2019-08-04 11:32:55 +01:00
toaster
d880a02fa1 Revert "Fix MIDI Soundfont code shadowing a global variable." 
This reverts commit 8a1b36322d.
 2019-08-04 11:28:04 +01:00
toaster
8a1b36322d Fix MIDI Soundfont code shadowing a global variable. 2019-08-04 10:28:10 +01:00
toaster
ec4b68888f Fix inadvertent fallthrough and associated whitespace. 2019-08-04 10:27:36 +01:00
toaster
c1af18cf66 Fix HWR_DrawConsoleFill. 2019-08-04 10:27:09 +01:00
mazmazz
8a637168f4 Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b 2019-08-04 03:22:36 -04:00
mazmazz
7ef6ffbf42 Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019 2019-08-04 02:52:33 -04:00
mazmazz
12e86aaa44 Merge branch 'internal-musicplus-jingle' into musicplus-aug2019 2019-08-04 02:41:37 -04:00
mazmazz
753ea04fe3 Mixer X menu touchup 2019-08-04 02:30:34 -04:00
mazmazz
cc31ab232d Revert djgppdos fade function inadvertent merge 2019-08-04 02:09:35 -04:00
mazmazz
7b0b6c5dc1 Revert MUSSERV code removal from S_LoadMusic 
(but we'll probably purge it later, anyway...)
 2019-08-04 02:04:02 -04:00
mazmazz
51d80dcea0 Fix HWR_DrawConsoleFill call extra input 2019-08-04 01:33:06 -04:00
mazmazz
336f54e90c Merge branch 'gcc7-fixes-aug2019' into musicplus-sdlmixerx 2019-08-04 01:10:34 -04:00
mazmazz
8ab76b50c6 Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx 2019-08-04 01:10:21 -04:00
mazmazz
ffa9475c54 Slight refactor for jingle resume lapse time 2019-08-04 00:59:32 -04:00