MascaraSnake
63b5ee0650
Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift
2019-12-26 20:50:48 +01:00
Alam Ed Arias
dc1f97e634
Merge branch 'next' into mobjthinker-refactoring
2019-12-26 14:50:35 -05:00
MascaraSnake
92ca7e9f24
Use mt->z instead of mt->options >> ZSHIFT in Command_Teleport_f
2019-12-26 20:48:52 +01:00
Alam Ed Arias
97b5d2449c
Merge branch 'next' into gametype-clownery
2019-12-26 14:48:04 -05:00
Alam Ed Arias
fbe937e547
Merge branch 'next' into kill-zshift
2019-12-26 14:45:18 -05:00
Alam Ed Arias
19379a0a68
Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift
2019-12-26 14:43:03 -05:00
MascaraSnake
015f3a36d2
Make P_RespawnSpecials call P_SpawnMapThing instead of trying to do everything itself
2019-12-26 20:13:56 +01:00
Monster Iestyn
5420f4d19c
Merge branch 'lua-damage-hooks-hotfix' into 'next'
...
Lua: ShouldDamage/MobjDamage/MobjDeath hotfix
See merge request STJr/SRB2!575
2019-12-26 13:05:06 -05:00
Alam Ed Arias
5089b93e4c
Merge branch 'next' into kill-zshift
2019-12-26 12:49:04 -05:00
Alam Ed Arias
64792ab9fd
ISO C90 fixup
2019-12-26 12:44:47 -05:00
Alam Ed Arias
22a04b2845
Merge branch 'next' into lua-damage-hooks-hotfix
2019-12-26 12:41:02 -05:00
Alam Ed Arias
c1b52069e3
cleanup buildbot error
2019-12-26 12:27:15 -05:00
Nev3r
4b31297a11
Merge branch 'ring-circle-fix' into 'next'
...
Circle of Blue Spheres were spawning in place of Rings
See merge request STJr/SRB2!576
2019-12-26 04:21:26 -05:00
James R
12f0e584b2
Correct the check for rings on thing 604 - 607
...
The original code used a switch case, not AND 1. :V
2019-12-25 15:23:19 -08:00
Monster Iestyn
bdacaa64ab
Fix ShouldDamage, MobjDamage and MobjDeath hooks all messing up the pushing of variables to Lua as function args, by adding damagetype support where it was missing!
...
The above issue occured only if you had both a generic hook and a type specific hook for a particular hook type. This way, the stack is never updated to include damagetype at the start, and all pushes of the variables get offsetted by 1 compared to what they should be, once the code *expects* damagetype to be included in it.
2019-12-25 21:48:59 +00:00
Nev3r
5a1c375c29
Merge branch 'tokentweaks' into 'next'
...
Slight touchups on the tokenizer
See merge request STJr/SRB2!569
2019-12-25 06:22:11 -05:00
Nev3r
cae6a061b2
Merge branch 'mapdataload_refactor' into 'next'
...
Mapdataload refactor
See merge request STJr/SRB2!568
2019-12-25 06:21:49 -05:00
Nev3r
d2e7e6cd9c
Move flat caching code to the map data load function.
2019-12-25 12:05:40 +01:00
MascaraSnake
c4a6424642
P_FlagFuseThink: Use mt->z instead of mt->options >> ZSHIFT
2019-12-25 11:17:57 +01:00
MascaraSnake
27361fbf43
P_MovePlayerToSpawn: Use mthing->z instead of mthing->options >> ZSHIFT
2019-12-25 10:59:12 +01:00
Jaime Passos
42c71d3f42
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-25 06:09:00 -03:00
MascaraSnake
1db2f6447d
Use mthing->z instead of mthing->options >> ZSHIFT in particle generator setup
2019-12-25 09:46:09 +01:00
MascaraSnake
b5d6c40d68
Get rid of a few mt->options >> ZSHIFT usages in objectplace
2019-12-25 09:40:08 +01:00
MascaraSnake
69539e640b
Make slope vertices use mt->z directly instead of mt->options >> ZSHIFT
2019-12-25 09:10:20 +01:00
MascaraSnake
23641863c8
Merge branch 'spawnhoopsandrings_refactor' into 'next'
...
Hack P_SpawnHoopsAndRings into little pieces
See merge request STJr/SRB2!572
2019-12-25 03:00:07 -05:00
MascaraSnake
07ec13b309
P_MobjThinker: Separate fuse handling into its own function
2019-12-25 00:36:24 +01:00
Steel Titanium
721f3c0373
Fix edge case with R_SkinUsable
2019-12-24 18:31:47 -05:00
MascaraSnake
8647d2784b
P_MobjThinker: Separate MF2_FIRING handling into its own function
2019-12-25 00:18:12 +01:00
MascaraSnake
14086ce86d
Continue cutting up P_MobjThinker into multiple functions
2019-12-25 00:14:53 +01:00
Steel Titanium
86381d31bf
Clean up comment
2019-12-24 17:45:57 -05:00
Steel Titanium
ffa78e1531
Change this condition a bit
2019-12-24 17:44:06 -05:00
Steel Titanium
90ca018318
Merge branch 'next' into char-damage-fix
2019-12-24 17:08:23 -05:00
Jaime Passos
31eeb90056
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
MascaraSnake
caa0800213
P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions
2019-12-24 21:07:55 +01:00
James R
ddae69f672
Merge remote-tracking branch 'origin/master' into next
2019-12-24 11:53:49 -08:00
James R
248e452d7d
Merge branch 'titlecard2' into 'next'
...
More customisable title card
See merge request STJr/SRB2!552
2019-12-24 14:47:55 -05:00
James R
27e251e7fc
Merge branch 'wipes2' into 'master'
...
Wipe styles cleanup
See merge request STJr/SRB2!525
2019-12-24 14:47:14 -05:00
James R
d5fdbfda6b
Merge branch 'soc-srb2-fix' into 'master'
...
The "SRB2" directive, for warning if a SOC isn't compatible
See merge request STJr/SRB2!551
2019-12-24 14:44:55 -05:00
James R
cb9db74044
Merge branch 'gl_gifs' into 'master'
...
OpenGL GIF movie recording
See merge request STJr/SRB2!549
2019-12-24 14:44:44 -05:00
James R
d2239f5ea1
Merge branch 'hwrtexfix' into 'master'
...
Fix model texture blending
See merge request STJr/SRB2!546
2019-12-24 14:44:19 -05:00
James R
975f1e5f83
Merge branch 'soundtest-fix' into 'master'
...
Init MUSICDEFs regardless of music state
See merge request STJr/SRB2!532
2019-12-24 14:44:08 -05:00
James R
469e5a7c9b
Fix NOPNG compiling
2019-12-24 11:37:37 -08:00
Jaime Passos
debacf34bb
Turn the babysitting deterrent into its own rule.
2019-12-24 16:30:18 -03:00
Jaime Passos
c6dd9f016e
Title card fixes.
2019-12-24 16:22:25 -03:00
James R
699407dbb0
I'm an idiot
2019-12-24 11:14:21 -08:00
Jaime Passos
c76154d3a1
Don't warn about missing CTF starts if the gametype doesn't have team flags.
2019-12-24 16:12:05 -03:00
Jaime Passos
4f54da125d
GTR_HURTMESSAGES
2019-12-24 16:09:00 -03:00
James R
984281e85e
Merge remote-tracking branch 'origin/master' into time
2019-12-24 11:02:31 -08:00
MascaraSnake
604a1c654d
Merge branch 'horizontalspring-oops' into 'next'
...
Fixed missing break in offset handling for horizontal springs
See merge request STJr/SRB2!571
2019-12-24 07:02:34 -05:00
MascaraSnake
418cc50bbc
Fixed missing break in offset handling for horizontal springs
2019-12-24 13:01:17 +01:00
