stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-26 20:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity
8256 commits 173 branches 41 tags 298 MiB
Commit graph

8256 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
37dd048f12 tweak the defaults for titlescrollxspeed and numDemos 2019-08-11 22:28:32 +01:00
Monster Iestyn
92b47f8729 Fix uninitialised variable error toaster found in P_MinecartThink 2019-08-11 22:14:50 +01:00
toaster
c7bbefb3f8 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
0ba2b28381 Disable patch.dta at Rob's request, since we don't really use it anymore 2019-08-11 20:24:14 +01:00
toaster
f85bc7c61f Fix Rob's Knuckles issue. 2019-08-11 19:37:15 +01:00
toaster
ed8ad7abde Did some testing, needed to fix one more issue with moving surfaces and spinning. 2019-08-11 14:36:52 +01:00
GoldenTails
aa165f4f19 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem 2019-08-10 19:48:19 -05:00
toaster
e3aec8e067 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
24526d4758 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
fd77fe819b curbgname need one more byte to hold the NULL 2019-08-08 23:46:08 -04:00
Alam Ed Arias
92a954609d Merge branch 'public_next' into private 2019-08-08 23:41:19 -04:00
Alam Ed Arias
81b294eec1 Merge branch 'master' into next 2019-08-08 23:18:31 -04:00
Alam Ed Arias
0c2b300294 Appveyor: other way around, the Mingw32 is at 9.1 2019-08-08 23:05:24 -04:00
Alam Ed Arias
33c0b825a7 Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3 2019-08-08 23:02:03 -04:00
Alam Ed Arias
268b5a09d9 Disable address-of-packed-member warning 2019-08-08 22:47:33 -04:00
Alam Ed Arias
eacf89e309 Makefile: GCC80 does not exist 2019-08-08 22:34:09 -04:00
Alam Ed Arias
b773b61b8c Revert "Try to compile with AppVeyor's GCC 9.1.0" 
This reverts commit 749c2753e4.
 2019-08-08 22:31:18 -04:00
Alam Ed Arias
749c2753e4 Try to compile with AppVeyor's GCC 9.1.0 2019-08-08 22:19:22 -04:00
Alam Ed Arias
5a79a446df Tested to be compile with Mingw64 9.1.0 2019-08-08 21:25:46 -04:00
Alam Ed Arias
d5cc3ce48d Makefile: support GCC 9.1 2019-08-08 20:27:57 -04:00
Alam Ed Arias
07f89fd6b5 Makefile: stop building with DWARF v2 debugging info 2019-08-08 18:43:42 -04:00
Monster Iestyn
1b9eb3c3e4 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
17e53ee27b 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
a8b7ecab4d 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
506093acbb 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
3196fd225d Merge branch 'fixme' into 'master' 
Build fixes

See merge request STJr/SRB2Internal!287
 2019-08-07 14:45:41 -04:00
MascaraSnake
088f39adbd Merge branch 'musicplus-strtok' into 'master' 
Use strtok instead of strtok_r

See merge request STJr/SRB2Internal!286
 2019-08-07 14:34:25 -04:00
Alam Ed Arias
b5279c34fa Fix compiling without MixerX support 2019-08-07 12:42:07 -04:00
Alam Ed Arias
a6fe6ebcd3 Fix signed vs unsigned comapre 2019-08-07 12:41:22 -04:00
Alam Ed Arias
cebc1d46f0 All C files should a newline at the end 2019-08-07 12:39:51 -04:00
Alam Ed Arias
4e78617c29 fix PARANOIA builds 2019-08-07 12:39:04 -04:00
mazmazz
688fdf35f9 Use strtok instead of strtok_r 2019-08-07 01:29:05 -04:00
MascaraSnake
aac9592e31 Set Fang's minimum bounce strength to 1.5 times jump strength 2019-08-06 23:35:20 +02:00
MascaraSnake
842b503d90 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
mazmazz
e1e2572357 More post-merge fixes 2019-08-04 21:49:31 -04:00
mazmazz
84c9633579 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-08-04 21:33:13 -04:00
mazmazz
b1f402538f Post-merge fixes (todo: spr2) 2019-08-04 21:32:41 -04:00
mazmazz
46993268ae * Added FORCERESETMUSIC level header 
* cv_resetmusicbyheader toggle to disable said override
* Never reset music during time attack
* Change cv_resetmusic default back to off
 2019-08-04 20:02:38 -04:00
toaster
3add792986 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
b06af59907 Merge branch 'revert_revert_musicplus' into 'master' 
Revert "Revert MusicPlus"

See merge request STJr/SRB2Internal!282
 2019-08-04 13:58:01 -04:00
Steel Titanium
dacee0665d
More menu stuff 2019-08-04 13:26:25 -04:00
toaster
5585059f6b Merge branch 'ringsparkle' into 'master' 
New ring sparkles

See merge request STJr/SRB2Internal!271
 2019-08-04 11:46:40 -04:00
Steel Titanium
153ed82849 Last min changes 2019-08-04 11:34:55 -04:00
toaster
af07412ac8 Merge branch 'statefix' into 'master' 
Quick state fixes

See merge request STJr/SRB2Internal!283
 2019-08-04 10:53:38 -04:00
toaster
1fbd3eff40 * 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
015abfc970 Revert "Revert "Fix MIDI Soundfont code shadowing a global variable."" 
This reverts commit 99dbcb9f65.
 2019-08-04 12:04:01 +01:00
toaster
384dc0674e Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit 603d5805f7.
 2019-08-04 12:03:57 +01:00
MascaraSnake
a302db2dc0 Merge branch 'revert_musicplus' into 'master' 
Revert musicplus (for now)

See merge request STJr/SRB2Internal!281
 2019-08-04 07:02:48 -04:00
toaster
603d5805f7 Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
 2019-08-04 11:32:55 +01:00
toaster
99dbcb9f65 Revert "Fix MIDI Soundfont code shadowing a global variable." 
This reverts commit 3591e3d092.
 2019-08-04 11:28:04 +01:00