wolfs
e394f41c52
Merge branch 'public-musicplus-tagfix' into 'next'
...
Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
Monster Iestyn
360a6ff89a
Merge branch 'public_flatsprite' into 'public_flatsprite'
...
Merge in next and don't billboard papersprites in GL
See merge request STJr/SRB2!488
2019-05-06 15:34:35 -04:00
Sryder
b304b268c8
No sprite billboarding on papersprites
2019-05-06 20:24:26 +01:00
Sryder
1f1d67cd7e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
...
# Conflicts:
# src/p_user.c
2019-05-06 20:20:57 +01:00
Monster Iestyn
406c3619d7
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
Nev3r
aab2f55aec
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
Nev3r
ae25e8ea07
Merge branch 'console-wait-fix' into 'master'
...
Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483
2019-05-06 12:56:07 -04:00
Nev3r
8b8e165d19
Merge branch 'opengl-sprite-billboarding' into 'master'
...
OpenGL Sprite Billboarding
See merge request STJr/SRB2!485
2019-05-06 12:45:53 -04:00
Sryder
8273534967
Add a cvar for sprite billboarding, off by default.
2019-05-06 16:57:32 +01:00
Monster Iestyn
ea951eef78
fix an inconsistency I introduced between counting the waypoints and finding them again
2019-05-05 21:16:44 +01:00
Monster Iestyn
ee0c4b42a6
fix P_CheckSight to consider FOFs that completely block the view
...
(this could probably be in its own branch to be tested properly, but I'm on a roll with this atm)
2019-05-05 21:03:15 +01:00
Monster Iestyn
b9611c3a81
Hardcoded the cork's stun-you-even-while-flashing behaviour
2019-05-05 19:16:30 +01:00
Monster Iestyn
b0087616c7
Hardcoded the boss's TouchSpecial hook.
...
Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
2019-05-05 18:22:19 +01:00
Monster Iestyn
373d12cb82
Hardcode "slapstick"
2019-05-05 17:36:55 +01:00
Monster Iestyn
f7fbf40437
Hardcoded MT_FSGNA's MobjThinker hook function
2019-05-05 16:42:50 +01:00
Monster Iestyn
9c0c0ad3dc
hardcoded the boss's A_BossDeath behaviour.
...
(also turned this part of the function into a switch case to make things neater)
2019-05-05 16:03:34 +01:00
Monster Iestyn
289a412377
Hardcode the boss thinker function
2019-05-05 15:34:06 +01:00
Monster Iestyn
9e26d7bdaa
I just checked how P_LookForPlayers works, and it turns out it doesn't modify the target *unless* it returns true. So I guess we've no need to account for a change in target in A_LookForBetter after all?
2019-05-05 14:09:09 +01:00
Monster Iestyn
09368963dd
hardcode MT_FBOMB's MobjSpawn hook function
2019-05-04 22:46:27 +01:00
Monster Iestyn
d44265a217
Mystery solved, he was turning "invisible" because of this mistake in A_DoNPCSkid
2019-05-04 22:38:14 +01:00
Monster Iestyn
691ae982e7
S_FANG_SLIDE wasn't defined in the Lua script, despite being declared :|
...
Also Fang seems to turn invisible after his first jump for some reason, and I can't figure out why???
2019-05-04 21:31:46 +01:00
Monster Iestyn
7b6b34212b
Swap "S_TNTBARREL_EXPL1" for S_NULL as a temporary measure until I actually hardcode the explosion states.
...
As of now, you can now compile this branch with no issues. But Fang won't work properly for a while yet, we'll get there don't worry.
2019-05-04 20:20:34 +01:00
Monster Iestyn
445709037d
Fix some compiler complaints about A_Boss5FindWaypoint
2019-05-04 20:17:00 +01:00
Monster Iestyn
b205602db6
DO NOT USE FRACUNIT AS A LAZY WAY TO DO UPPER 16 BITS FOR ACTION VARS
2019-05-04 19:43:14 +01:00
Monster Iestyn
a5331f8024
Fix A_LookForBetter to not leave a stray thinker reference lingering potentially forever, as toaster pointed out it might do.
2019-05-04 17:15:59 +01:00
Monster Iestyn
54fea4d0b9
AND I forgot these checks, confound it
2019-05-03 23:16:11 +01:00
Monster Iestyn
ee1fd72f9f
ah, forgot to do this
2019-05-03 23:12:03 +01:00
Monster Iestyn
df99e93288
Hardcoded A_Boss5FindWaypoint
...
...that took a while x_x
2019-05-03 22:58:54 +01:00
Monster Iestyn
0d7cd34882
Hardcoded A_Boss5MakeItRain
2019-05-03 20:52:56 +01:00
Monster Iestyn
b03bfbabe4
Hardcode A_DoNPCSkid
2019-05-03 20:00:31 +01:00
Monster Iestyn
b4d8c2fa29
Hardcoded A_Boss5PinchShot
2019-05-03 19:46:41 +01:00
Monster Iestyn
6cd2b73273
Hardcoded A_LookForBetter
2019-05-03 19:14:17 +01:00
Monster Iestyn
a0220454fd
Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description)
2019-05-03 18:51:17 +01:00
Monster Iestyn
1b2afea091
Merge branch 'public_next'
2019-05-03 16:42:42 +01:00
Monster Iestyn
454306cf86
Merge branch 'master' into next
2019-05-03 16:40:13 +01:00
Monster Iestyn
a5dfbe7eff
add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
...
not making a merge request because this is so laughably stupidly simple
2019-05-03 16:38:59 +01:00
Monster Iestyn
d4ab2837bb
Merge branch 'master' into next
2019-05-03 16:00:45 +01:00
wolfs
1f2d720363
Merge branch 'nonet-upnp' into 'master'
...
Don't enable UPnP support if NONET is defined.
See merge request STJr/SRB2!484
2019-05-03 06:40:22 -04:00
Digiku
271e0eb5b7
Merge branch 'menu-execs' into 'master'
...
New title screen features
See merge request STJr/SRB2Internal!204
2019-05-03 03:48:39 -04:00
mazmazz
904b00e921
Remove song_length tag search
...
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
3e5b0c4531
Remove MP3 widechar tag searching
...
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
mazmazz
89ab777c40
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
Monster Iestyn
266fa05e15
fix a slipup in A_DoNPCPain I just noticed I made, whoops
2019-05-02 21:34:00 +01:00
Monster Iestyn
61eb05eab2
Hardcoded A_Boss5CheckFalling
2019-05-02 21:32:28 +01:00
Monster Iestyn
953a0c2967
Hardcoded A_Boss5ExtraRepeat
2019-05-02 21:21:15 +01:00
Monster Iestyn
fb17c1ac5a
Hardcoded A_Boss5CheckOnGround
2019-05-02 19:09:40 +01:00
Monster Iestyn
3bbc5d0b08
hardcoded A_DoNPCPain
2019-05-02 18:32:43 +01:00
Monster Iestyn
75701294ea
Hardcode Fang waypoint object type (turns out no state is needed)
2019-05-02 18:11:44 +01:00
Monster Iestyn
d92ccf6823
Hardcoded all the main Fang-specific object types, states and sprites.
...
This cannot be compiled as-is right now for the following reasons:
* Numerous actions still need to be hardcoded.
* MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it.
Also missing:
* Fang waypoint object type+states.
* Fang's good looks (to be put in the resource files obviously).
* Fang's brain.
2019-05-02 18:01:18 +01:00
Sryder
4d77ed925e
OpenGL sprite billboarding
...
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
2019-05-01 20:15:00 +01:00