MascaraSnake
f06184b466
Refactor P_SetupLines into P_InitializeLinedef
2019-12-28 17:21:31 +01:00
MascaraSnake
532a1bbfb7
Fix P_SetupLines printing the wrong line number
2019-12-28 17:05:04 +01:00
MascaraSnake
8646f6061c
Standardize P_LoadVertices and P_LoadSidedefs
2019-12-28 16:58:48 +01:00
MascaraSnake
06bcb74b37
Split P_LoadLineDefs2 into P_ProcessLinedefsWithSidedefs and P_CompressSidedefs
2019-12-28 16:49:56 +01:00
MascaraSnake
04dcc177ea
Reorganize and partially rename map loading functions
2019-12-28 16:40:35 +01:00
MascaraSnake
45359f830b
Remove stray #endif
2019-12-28 14:50:00 +01:00
MascaraSnake
af85de53d7
Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them.
2019-12-28 14:13:26 +01:00
MascaraSnake
d085296cbe
Remove some old #if 0'd code
2019-12-28 14:03:48 +01:00
MascaraSnake
9e72dcddb6
Merge branch 'next' into mapload-refactor
2019-12-28 13:59:24 +01:00
MascaraSnake
e3955ed4f3
Fix accidental removal of sector_t's spawn_lightlevel initialization
2019-12-28 13:58:23 +01:00
MascaraSnake
d00a9a42a1
Cleaned up some more stuff in P_LoadLevel()
2019-12-28 12:48:32 +01:00
MascaraSnake
9b81821d44
Move more P_LoadLevel parts into subfunctions
2019-12-28 11:37:56 +01:00
MascaraSnake
f67ff6d97e
Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions
2019-12-28 11:30:39 +01:00
MascaraSnake
12fbaf85f8
Fixed/clarified some flag descriptions in the ZB config
2019-12-28 08:43:27 +01:00
Alam Ed Arias
2c03fcaac5
Merge branch 'master' into next
2019-12-27 17:08:16 -05:00
James R
720ab51340
Merge branch 'rotsprite3' into 'next'
...
More rollangle changes
See merge request STJr/SRB2!582
2019-12-27 16:49:21 -05:00
James R
8d70a18fc7
Merge branch 'skinusable-fix' into 'next'
...
Fix edge case with R_SkinUsable
See merge request STJr/SRB2!573
2019-12-27 16:49:06 -05:00
Alam Ed Arias
848a144956
fread and fwrite use size_t, not int
2019-12-27 13:08:26 -05:00
Alam Ed Arias
7201e165a4
we only need link on unix systems
2019-12-27 13:05:15 -05:00
MascaraSnake
e673833780
Merge branch 'why-inline' into 'master'
...
I got a compiler warning from P_PlayerHitsPlayer being too big
See merge request STJr/SRB2!581
2019-12-27 02:12:01 -05:00
MascaraSnake
472749de84
Merge branch 'zb-config-refactor' into 'next'
...
Zone Builder configuration refactor
See merge request STJr/SRB2!570
2019-12-27 02:04:22 -05:00
James R
8311380146
Merge branch 'time' into 'master'
...
haha log files
See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
Jaime Passos
a88b0bffe7
Avoid possible overflows in the rotsprite arrays.
2019-12-26 21:49:36 -03:00
Jaime Passos
a187538157
Remove the min() and max() calls.
2019-12-26 21:36:35 -03:00
Jaime Passos
f65ac6feab
stuff
2019-12-26 21:27:30 -03:00
James R
0fd77ff5f4
Merge remote-tracking branch 'origin/master' into next
2019-12-26 15:35:53 -08:00
James R
0726e0b1ee
Merge branch 'rotsprite2' into 'next'
...
rollangle and SpriteInfo changes
See merge request STJr/SRB2!547
2019-12-26 18:32:37 -05:00
Jaime Passos
070adb4191
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
James R
bd472eb353
Merge branch 'turnmultiplier' into 'master'
...
Option to increase the turning speed
See merge request STJr/SRB2!553
2019-12-26 18:18:23 -05:00
James R
abdd904ef0
Merge branch 'char-damage-fix' into 'next'
...
Fix Amy and Fang being able to attack other players in MP Special Stages
See merge request STJr/SRB2!558
2019-12-26 18:18:10 -05:00
James R
599477061a
Merge branch 'gametype-clownery' into 'next'
...
Custom gametypes
See merge request STJr/SRB2!566
2019-12-26 18:08:41 -05:00
James R
2c93621d5c
P_PlayerHitsPlayer is too big for inline, and these other functions are getting there
2019-12-26 14:59:31 -08:00
Monster Iestyn
3bafa90b7a
Fix mixed declaration-and-code compiling error
2019-12-26 21:59:09 +00:00
MascaraSnake
29e78d161a
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
Alam Ed Arias
dc1f97e634
Merge branch 'next' into mobjthinker-refactoring
2019-12-26 14:50:35 -05:00
Alam Ed Arias
97b5d2449c
Merge branch 'next' into gametype-clownery
2019-12-26 14:48:04 -05: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
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
Jaime Passos
42c71d3f42
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-25 06:09:00 -03: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
