Steel Titanium
997b6bb9d3
Draw record attack foreground even if a message is currently on-screen.
2019-08-20 00:15:35 -04:00
Jaime Passos
2460f670f7
Unlock all cached patches, fix accidental merge conflict.
2019-08-20 00:41:06 -03:00
Jaime Passos
3da02a2056
Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus
2019-08-20 00:21:28 -03:00
Jaime Passos
4b13ba15c9
Remove new character select screen transitions.
...
I should not have implemented it in the first place.
2019-08-20 00:18:34 -03:00
Jaime Passos
fb889d3d1a
New Record Attack menu.
2019-08-20 00:12:22 -03:00
Steel Titanium
1491d68122
Fix record attack foreground not appearing.
...
I'm not sure why it suddenly broke when the same condition worked before.
2019-08-19 22:10:52 -04:00
Jaime Passos
a37caff23e
Fix character description text rendering.
2019-08-19 18:49:23 -03:00
Jaime Passos
42590d5aff
Cool defines
2019-08-19 16:19:25 -03:00
Jaime Passos
21f2553a98
hghdfhdjhdhkdlfh
2019-08-19 15:34:12 -03:00
Jaime Passos
1ef58da49b
slight cleanup
2019-08-19 15:27:20 -03:00
Jaime Passos
af8c67c59a
uh
2019-08-19 14:43:48 -03:00
Jaime Passos
518bb32ecb
did The Thing
2019-08-19 14:23:03 -03:00
Jaime Passos
4ce5840289
More character select work
2019-08-18 22:26:52 -03:00
Jaime Passos
4ba044c30b
Tweak Record Attack screen just a little bit
2019-08-18 20:35:16 -03:00
Jaime Passos
ec797ee106
how do i code
2019-08-18 19:46:55 -03:00
Jaime Passos
b214a4c123
Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus
2019-08-18 19:35:14 -03:00
Jaime Passos
513d34aef8
Character select WIP
2019-08-18 19:34:54 -03:00
Steel Titanium
17cbd9a986
New music for record attack and nights attack menus
2019-08-18 17:32:52 -04:00
Steel Titanium
79587c90ce
Merge branch 'newmenus' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus
2019-08-18 13:49:08 -04:00
Steel Titanium
07cf717e33
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus
2019-08-18 13:46:50 -04:00
Jaime Passos
b31c012063
Merge remote-tracking branch 'origin/master' into newmenus
2019-08-18 14:46:34 -03:00
Steel Titanium
6b16560832
Merge branch 'master' into newmenus
2019-08-14 22:51:06 -04:00
Monster Iestyn
fac04cf853
tweak the defaults for titlescrollxspeed and numDemos
2019-08-11 22:28:32 +01:00
Monster Iestyn
33277fbbd3
Fix uninitialised variable error toaster found in P_MinecartThink
2019-08-11 22:14:50 +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
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
cb5b7a5555
Appveyor: other way around, the Mingw32 is at 9.1
2019-08-08 23:05:24 -04:00
Alam Ed Arias
4d1c2b4de0
Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
2019-08-08 23:02:03 -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
MascaraSnake
51badb96c6
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
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
