Steel Titanium
490e3fe9a9
Merge branch 'master' into musicplus-sdlmixerx
2019-07-22 22:20:08 -04:00
Steel Titanium
d44702cb0e
Some fixup
2019-07-22 22:01:05 -04:00
Monster Iestyn
14b3d97e16
Merge branch 'recordattack-bg-fixes' into 'master'
...
Record Attack bg fixes
See merge request STJr/SRB2Internal!259
2019-07-20 11:33:06 -04:00
Monster Iestyn
0cc9cc0acf
On second thoughts I'll go back to 8 for length in these variables, since as far as I can tell the code doesn't need it to be longer anyway
2019-07-20 16:30:30 +01:00
Steel Titanium
a7c6fb7a06
New award rings linedef executor
2019-07-18 22:42:46 -04:00
toaster
6603b605e7
Fix !150 , too
2019-07-18 00:16:01 +01:00
toaster
71e5835e66
Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground.
2019-07-17 23:25:49 +01:00
toaster
8024e686c4
Fix Knuckles-in-quicksand messup.
2019-07-17 23:24:44 +01:00
toasterbabe
32ee846c4a
* Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector.
...
* Make CA2_GUNSLINGER not get overridden by being in quicksand.
2019-07-17 21:34:04 +01:00
toaster
c9b560b083
Fix spindash being broken in quicksand
...
# Conflicts:
# src/p_mobj.c
# src/p_user.c
2019-07-17 21:33:18 +01:00
Steel Titanium
1d5f417a86
Let's not use this
2019-07-16 19:26:16 -04:00
Steel Titanium
93acb98aa7
New icons
...
Also update IMG_xpm.c
2019-07-16 19:20:00 -04:00
Monster Iestyn
f266eda97b
Merge branch 'public_next'
2019-07-16 18:28:49 +01:00
Monster Iestyn
f563f95c32
Merge branch 'master' into next
2019-07-16 18:26:46 +01:00
Monster Iestyn
82cfd76402
Merge branch 'master' into recordattack-bg-fixes
2019-07-16 17:04:42 +01:00
James R
6fdfd3b90c
Don't send login final hashes to everyone
...
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.
P.S. The netcode is LOL XD by VincyTM -Telos
2019-07-15 16:14:00 -07:00
Monster Iestyn
b0f30ca0df
Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead.
...
(I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)
2019-07-15 20:25:57 +01:00
Monster Iestyn
a424fce29d
Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks
2019-07-14 22:36:14 +01:00
Monster Iestyn
1ec917f44e
remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/
2019-07-14 22:28:19 +01:00
Monster Iestyn
5303475033
Fixes for menus:
...
* add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds
* increase bgname to 9 to include the extra NULL byte? (is this a good idea actually)
* make M_IterateMenuTree ignore menu levels without a menutype value
2019-07-14 21:58:48 +01:00
Steel Titanium
db525c43a7
Fix crash with GME sounds when being freed
2019-07-14 14:55:04 -04:00
Monster Iestyn
157808c0b5
The titlemap glitches turned out to be linked to deathmatchstarts, which wasn't actually properly cleared out each level load ...let's actually fix that, lol.
...
(Neither were the CTF starts but those didn't directly cause any problems luckily)
2019-07-14 18:10:03 +01:00
sphere
76d6a96c69
Add a blue variant of the pole banner & change some doomednums.
2019-07-14 17:30:33 +02:00
Monster Iestyn
3fec42c436
Add static keyword to these variables for correctness
2019-07-14 16:23:01 +01:00
Monster Iestyn
1ba1318f37
Fix mixed code-and-declaration error
2019-07-14 16:19:48 +01:00
Monster Iestyn
97404e9b8c
Merge branch 'libopenmpt-fixes' into 'master'
...
Improved libopenmpt loading
See merge request STJr/SRB2Internal!251
2019-07-14 11:03:14 -04:00
MascaraSnake
1b79c29559
Merge branch 'wallspike-fix' into 'master'
...
Fix wall spikes that start retracted
See merge request STJr/SRB2Internal!255
2019-07-14 10:55:10 -04:00
Monster Iestyn
a001167bb4
Merge branch 'thinkerlists-fix' into 'master'
...
Thinkerlists fix
Closes #161
See merge request STJr/SRB2Internal!253
2019-07-14 10:52:56 -04:00
sphere
aabf7ed113
Add a blue variant of the waving flags.
2019-07-14 16:50:45 +02:00
sphere
3f2f037456
Don't upscale the waving flags, make them twice as large instead
2019-07-14 15:30:00 +02:00
toaster
85d46b49e1
Correct some extant fuckups.
2019-07-14 14:21:32 +01:00
sphere
530683ae01
Whoops, forgot to revert this.
2019-07-14 02:31:33 +02:00
sphere
6b6efa3909
Add spring flags: float for horizontal & no gravity for diagonal.
2019-07-14 02:17:44 +02:00
sphere
af3089cda5
Add meleestate to MT_WALLSPIKE.
2019-07-14 01:29:36 +02:00
sphere
d244f7d18e
Assign sound to the wood debris object.
2019-07-13 23:15:56 +02:00
toaster
6a90505009
Correct some more minor issues with hw_light.c and the ALAM_LIGHTING. (Hi Alam! ^u^)
2019-07-13 14:07:40 +01:00
toaster
2fbb0bbb52
I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here.
2019-07-13 13:43:22 +01:00
Jonas Sauer
b7c783223a
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
...
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00
Monster Iestyn
b7b32167f7
fix leftshift of negative value MascaraSnake also gets
2019-07-09 21:48:18 +01:00
Monster Iestyn
b820635130
Fix MascaraSnake's issues with sign-compare (hopefully)
2019-07-09 21:43:38 +01:00
Monster Iestyn
8151360ca7
Merge branch 'eggcolosseum' into 'master'
...
Egg Colosseum (CEZ3 remaster)
See merge request STJr/SRB2Internal!248
2019-07-09 16:32:24 -04:00
Monster Iestyn
7a8843a295
Merge branch 'seaegg_tweaks' into 'master'
...
Sea Egg
See merge request STJr/SRB2Internal!244
2019-07-09 16:25:07 -04:00
Monster Iestyn
6105275e42
Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well
2019-07-09 21:15:12 +01:00
Steel Titanium
c0927754a1
Seperate declarations from code
2019-07-09 15:51:11 -04:00
Steel Titanium
7088a5d534
Merge branch 'master' into libopenmpt-fixes
2019-07-09 15:44:58 -04:00
Steel Titanium
d9ed4be606
Fix compiling on Linux
2019-07-09 15:42:14 -04:00
toaster
3c5cbd5980
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum
...
# Conflicts:
# src/p_mobj.c
# src/sounds.c
# src/sounds.h
2019-07-09 19:52:52 +01:00
Monster Iestyn
dcbe0f7f46
Merge branch 'toast_cleanup' into 'master'
...
PITY IN PINK and everything associated (formerly toast_fixes)
See merge request STJr/SRB2Internal!232
2019-07-09 14:31:25 -04:00
Monster Iestyn
d9048f2c39
Merge branch 'metalfixes' into 'toast_cleanup'
...
Metal Sonic Boss fixes (again)
See merge request STJr/SRB2Internal!245
2019-07-09 14:29:42 -04:00
Monster Iestyn
11bf294a74
Merge branch 'rainfixesmkII' into 'master'
...
Accidentially broke rain in the rainfixes branch (oh, the irony!)
See merge request STJr/SRB2Internal!249
2019-07-09 14:24:14 -04:00
