94bb6655a5
Merge branch 'master' into next
2019-12-27 17:08:16 -05:00
152a63b682
Merge branch 'rotsprite3' into 'next'
...
More rollangle changes
See merge request STJr/SRB2!582
2019-12-27 16:49:21 -05:00
69ad41e58e
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
0caa08defd
fread and fwrite use size_t, not int
2019-12-27 13:08:26 -05:00
ff004c4cf6
we only need link on unix systems
2019-12-27 13:05:15 -05:00
45c432462e
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
6a85e40232
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
e19d0877e8
Merge branch 'time' into 'master'
...
haha log files
See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
da1718f93c
Avoid possible overflows in the rotsprite arrays.
2019-12-26 21:49:36 -03:00
4b653a0b12
Remove the min() and max() calls.
2019-12-26 21:36:35 -03:00
56fd29a42a
stuff
2019-12-26 21:27:30 -03:00
1dac3d174e
Merge remote-tracking branch 'origin/master' into next
2019-12-26 15:35:53 -08:00
5872e8d453
Merge branch 'rotsprite2' into 'next'
...
rollangle and SpriteInfo changes
See merge request STJr/SRB2!547
2019-12-26 18:32:37 -05:00
c0390f5186
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
414a066ec8
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
aa9cc6e6f2
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
e6532b9bad
Merge branch 'gametype-clownery' into 'next'
...
Custom gametypes
See merge request STJr/SRB2!566
2019-12-26 18:08:41 -05:00
dd1ca69f54
P_PlayerHitsPlayer is too big for inline, and these other functions are getting there
2019-12-26 14:59:31 -08:00
ca5a4d90e0
Fix mixed declaration-and-code compiling error
2019-12-26 21:59:09 +00:00
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
e823441e31
Merge branch 'next' into mobjthinker-refactoring
2019-12-26 14:50:35 -05:00
61a0197339
Merge branch 'next' into gametype-clownery
2019-12-26 14:48:04 -05:00
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
0a873d857d
Merge branch 'next' into lua-damage-hooks-hotfix
2019-12-26 12:41:02 -05:00
50379dac85
cleanup buildbot error
2019-12-26 12:27:15 -05:00
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
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
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
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
a932b54b26
Merge branch 'mapdataload_refactor' into 'next'
...
Mapdataload refactor
See merge request STJr/SRB2!568
2019-12-25 06:21:49 -05:00
c4a017ddf0
Move flat caching code to the map data load function.
2019-12-25 12:05:40 +01:00
7e5ec552ee
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-25 06:09:00 -03:00
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
64df10f7be
P_MobjThinker: Separate fuse handling into its own function
2019-12-25 00:36:24 +01:00
f0ef4e3193
Fix edge case with R_SkinUsable
2019-12-24 18:31:47 -05:00
6032aa3cd1
P_MobjThinker: Separate MF2_FIRING handling into its own function
2019-12-25 00:18:12 +01:00
5d89e915c6
Continue cutting up P_MobjThinker into multiple functions
2019-12-25 00:14:53 +01:00
8d8e0ca22c
Clean up comment
2019-12-24 17:45:57 -05:00
b49672e3f9
Change this condition a bit
2019-12-24 17:44:06 -05:00
2f83c2977e
Merge branch 'next' into char-damage-fix
2019-12-24 17:08:23 -05:00
3622829504
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
ddccfbd73d
P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions
2019-12-24 21:07:55 +01:00
02779cb6ef
Merge remote-tracking branch 'origin/master' into next
2019-12-24 11:53:49 -08:00
0780e48f86
Merge branch 'titlecard2' into 'next'
...
More customisable title card
See merge request STJr/SRB2!552
2019-12-24 14:47:55 -05:00
75a5142aad
Merge branch 'wipes2' into 'master'
...
Wipe styles cleanup
See merge request STJr/SRB2!525
2019-12-24 14:47:14 -05:00
f077413f31
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
e0a20a733c
Merge branch 'gl_gifs' into 'master'
...
OpenGL GIF movie recording
See merge request STJr/SRB2!549
2019-12-24 14:44:44 -05:00
3f339384c8
Merge branch 'hwrtexfix' into 'master'
...
Fix model texture blending
See merge request STJr/SRB2!546
2019-12-24 14:44:19 -05:00
1df31f2e98
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
be063c454a
Fix NOPNG compiling
2019-12-24 11:37:37 -08:00
Alam Ed Arias