Monster Iestyn
ca5a4d90e0
Fix mixed declaration-and-code compiling error
2019-12-26 21:59:09 +00:00
Jaime Passos
69b4efb579
Rename R_WorldSegTextured
2019-12-26 18:13:03 -03:00
Jaime Passos
ad6cda7c53
Masked stuff
2019-12-26 17:39:18 -03:00
Jaime Passos
0ec800b266
I forgot a `static`
2019-12-26 17:20:17 -03:00
Jaime Passos
919864d0f3
Thick stuff. Hoping I didn't break anything.
2019-12-26 17:15:30 -03:00
MascaraSnake
b24bcbab65
Merge branch 'mobjthinker-refactoring' into 'next'
...
Hack P_MobjThinker into little pieces
See merge request STJr/SRB2!574
2019-12-26 14:59:37 -05:00
MascaraSnake
2d90098b6a
Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen
2019-12-26 20:55:29 +01:00
MascaraSnake
7ccb695fa1
Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost
2019-12-26 20:54:06 +01:00
MascaraSnake
24e15387b3
Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift
2019-12-26 20:50:48 +01:00
Alam Ed Arias
e823441e31
Merge branch 'next' into mobjthinker-refactoring
2019-12-26 14:50:35 -05:00
MascaraSnake
f86c5f13ce
Use mt->z instead of mt->options >> ZSHIFT in Command_Teleport_f
2019-12-26 20:48:52 +01:00
Alam Ed Arias
61a0197339
Merge branch 'next' into gametype-clownery
2019-12-26 14:48:04 -05:00
Alam Ed Arias
5a5d5a76d4
Merge branch 'next' into kill-zshift
2019-12-26 14:45:18 -05:00
Alam Ed Arias
c0d6cd8599
Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift
2019-12-26 14:43:03 -05:00
Jaime Passos
5f1e3bab71
struct time
2019-12-26 16:25:04 -03:00
MascaraSnake
855f5da6c9
Make P_RespawnSpecials call P_SpawnMapThing instead of trying to do everything itself
2019-12-26 20:13:56 +01:00
Sally Cochenour
a1d944fc4d
Fix scoreadd not doing anything when modified by Lua
...
This does not change any vanilla behavior, as scoreadd is reset constantly on the ground anyway -- this simply makes the behavior modifiable for Lua scripts.
2019-12-26 14:02:02 -05:00
Jaime Passos
4e0a7030ca
Move all the thick/masked/splat stuff to the end of the file
2019-12-26 15:34:33 -03:00
Jaime Passos
e09838224e
ifdef this right so it works like before without the define
2019-12-26 15:27:16 -03:00
Monster Iestyn
6314f5b00a
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
e8431e168a
Merge branch 'next' into kill-zshift
2019-12-26 12:49:04 -05:00
Alam Ed Arias
4906cd4331
ISO C90 fixup
2019-12-26 12:44:47 -05:00
Alam Ed Arias
0a873d857d
Merge branch 'next' into lua-damage-hooks-hotfix
2019-12-26 12:41:02 -05:00
Alam Ed Arias
50379dac85
cleanup buildbot error
2019-12-26 12:27:15 -05:00
Nev3r
4411a0f039
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
Jaime Passos
649455c2d0
R_CalculateSegDistance stuff...
2019-12-26 01:58:38 -03:00
James R
6bd383621e
More fine tuned versioning
...
You get a PACKETVERSION, for when some packets change format.
You get SRB2APPLICATION, for when you have big fucking mod.
2019-12-25 20:52:02 -08:00
Jaime Passos
69e9784085
Something in R_RenderSegLoop I thought looked off...
2019-12-26 00:55:34 -03:00
Jaime Passos
6f5a259983
Tame R_StoreWallRange
2019-12-26 00:07:04 -03:00
James R
70f08007eb
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
5241030012
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
9b89ed92f5
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
a932b54b26
Merge branch 'mapdataload_refactor' into 'next'
...
Mapdataload refactor
See merge request STJr/SRB2!568
2019-12-25 06:21:49 -05:00
Nev3r
c4a017ddf0
Move flat caching code to the map data load function.
2019-12-25 12:05:40 +01:00
MascaraSnake
de7575416a
P_FlagFuseThink: Use mt->z instead of mt->options >> ZSHIFT
2019-12-25 11:17:57 +01:00
MascaraSnake
f4c6068ab1
P_MovePlayerToSpawn: Use mthing->z instead of mthing->options >> ZSHIFT
2019-12-25 10:59:12 +01:00
Jaime Passos
7e5ec552ee
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-25 06:09:00 -03:00
MascaraSnake
12d30b7acc
Use mthing->z instead of mthing->options >> ZSHIFT in particle generator setup
2019-12-25 09:46:09 +01:00
Jaime Passos
03a3b02301
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-25 05:43:46 -03:00
MascaraSnake
32ef930c04
Get rid of a few mt->options >> ZSHIFT usages in objectplace
2019-12-25 09:40:08 +01:00
MascaraSnake
b9a276f5aa
Make slope vertices use mt->z directly instead of mt->options >> ZSHIFT
2019-12-25 09:10:20 +01:00
MascaraSnake
f11caefed7
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
64df10f7be
P_MobjThinker: Separate fuse handling into its own function
2019-12-25 00:36:24 +01:00
Steel Titanium
f0ef4e3193
Fix edge case with R_SkinUsable
2019-12-24 18:31:47 -05:00
MascaraSnake
6032aa3cd1
P_MobjThinker: Separate MF2_FIRING handling into its own function
2019-12-25 00:18:12 +01:00
MascaraSnake
5d89e915c6
Continue cutting up P_MobjThinker into multiple functions
2019-12-25 00:14:53 +01:00
Steel Titanium
8d8e0ca22c
Clean up comment
2019-12-24 17:45:57 -05:00
Steel Titanium
b49672e3f9
Change this condition a bit
2019-12-24 17:44:06 -05:00
Steel Titanium
2f83c2977e
Merge branch 'next' into char-damage-fix
2019-12-24 17:08:23 -05:00
Jaime Passos
3622829504
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
