53ac815334
...and also rename the palm tree leaves accordingly
2019-10-25 20:48:51 +02:00
863101824a
Removed palm tree trunks from the ZB config. They no longer exist as mapthings.
2019-10-25 20:17:50 +02:00
989e089e0a
resolve #263 (this is going into master because it's literally just the line being present twice)
2019-10-24 19:00:54 +01:00
0ef50557c2
Merge branch 'spinbust' into 'master'
...
Make spinbust behavior consistent with other bustable blocks
Closes #254
See merge request STJr/SRB2Internal!398
2019-10-23 02:51:47 -04:00
8cd0ebb679
Merge branch 'atz-hazards' into 'master'
...
Azure Temple Hazards
See merge request STJr/SRB2Internal!404
2019-10-23 02:51:00 -04:00
d62674c184
Clang warnings
2019-10-22 19:18:56 -07:00
386ac78600
Merge branch 'mace-place' into 'master'
...
Make maces normally placeable in maps.
See merge request STJr/SRB2Internal!390
2019-10-22 13:29:06 -04:00
520deac658
remove last few specks of Windows CE code I missed years ago
2019-10-22 16:39:44 +01:00
dbd8e563b4
Merge branch 'soundex_tweak' into 'master'
...
Tweak Line Special 414's behavior
See merge request STJr/SRB2Internal!382
2019-10-22 05:31:22 -04:00
57a8af1557
Disable standalone hangable chains, since they're not a good mechanic.
2019-10-22 02:29:34 +02:00
8c5c2a7e4b
Flatb
2019-10-21 12:42:04 -07:00
3a3122e255
Add green flame sprites, state, and object
2019-10-21 16:22:20 +08:00
d6411b9549
Add new ATZ gargoyle sprites
2019-10-21 13:43:02 +08:00
57d29a9b65
Merge branch 'platterwrap' into 'master'
...
Prevent wraparound on Level platter when there are less than 3 rows
See merge request STJr/SRB2Internal!383
2019-10-20 06:45:05 -04:00
7c481744a4
Merge branch 'kartport_dedi' into 'master'
...
Kart-port dedicated server Lua fix (round 2)
See merge request STJr/SRB2Internal!387
2019-10-20 06:43:54 -04:00
41dd9c4f0a
Merge branch 'flats-fixes-13102019' into 'master'
...
Transparent flat fixes (Resolves #249 )
Closes #249
See merge request STJr/SRB2Internal!384
2019-10-20 06:42:17 -04:00
54847b1949
Merge branch 'mapthingtweaks' into 'master'
...
Mapthing tweaks (object_tweaks division 1)
See merge request STJr/SRB2Internal!396
2019-10-20 06:33:01 -04:00
0a321b96d3
Clarified description of "strong" bustable blocks in the ZB config
2019-10-20 12:28:30 +02:00
1604e4d439
Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST
2019-10-19 22:20:48 +02:00
9c36cf00d8
Merge branch 'fix-player-state-resynch' into 'master'
...
Fix player state resynching
See merge request STJr/SRB2Internal!393
2019-10-19 16:15:19 -04:00
3f42834a98
Merge branch 'thinkerlists_oops' into 'master'
...
Fixed a netgame crash that was caused by a closing brace being in the wrong place :v
See merge request STJr/SRB2Internal!395
2019-10-19 13:34:28 -04:00
7e04cbbc16
Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2)
2019-10-19 16:01:04 +01:00
920736ac8b
Grouped ports from object_tweaks.
...
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
* Put diagonal blue spring in config.
2019-10-19 15:57:01 +01:00
73c39990f9
Fix restoration of delayed linedef executors in P_NetUnArchiveThinkers for real
2019-10-19 14:51:24 +02:00
c7fd22f98a
Fixed a netgame crash that was caused by a closing brace being in the wrong place :v
2019-10-19 12:08:15 +02:00
246a6489e9
Fix missing & which I totally forgot about in writing this fix (yes this is the "compile error" everyone was talking about)
2019-10-18 13:37:42 +01:00
07c02f075b
Fix sprite-related console errors that occur in netgames whenever the game attempts to synch the player's state.
...
Turns out the code was using P_SetMobjStateNF to "fix" the player's state ...which got things all wrong, lol.
2019-10-17 18:22:06 +01:00
bb9a0de4f5
Merge branch 'resynch-fix' into 'master'
...
Fix clients being resynched at the wrong gametic
See merge request STJr/SRB2Internal!391
2019-10-16 19:42:20 -04:00
26fed77671
Fix standalone hangable chains being broken, thanks to toaster.
2019-10-17 01:01:40 +02:00
2cc129c5c0
Undo grabbable chains being placeable for now, since they're bugged.
2019-10-16 22:31:57 +02:00
124716b8dd
Correct some ZB config errors & remove grabbable chains.
2019-10-16 22:30:52 +02:00
92b92dd3eb
Fix clients being resynched at the wrong gametic
2019-10-16 21:24:30 +02:00
b58b043a5e
Add normally placeable maces to the ZB config.
2019-10-16 21:20:49 +02:00
42de16b904
Make the maces and related objects normally placeable.
2019-10-16 21:12:04 +02:00
079ef023c9
Fix dedicated server extra lua variables not being synched for joiners.
...
Original fix written by Lat`.
2019-10-15 10:49:14 +01:00
cbcb113d8e
Update these files that I forgot to update.
...
Better than not updating it at all and having a inconsistency between versions reported from the header and internal lib version.
2019-10-14 20:41:37 -04:00
526d4a5e4b
Merge branch 'shatter_solid' into 'master'
...
Make shatter blocks solid to non-players
See merge request STJr/SRB2Internal!379
2019-10-14 15:06:29 -04:00
2f9a13d5e0
Make shatter blocks intangible to the player, but solid to everything else
2019-10-14 20:15:03 +02:00
a4ef99c8fe
Merge branch 'zb_config' into 'master'
...
Add ZB config to the repo
See merge request STJr/SRB2Internal!381
2019-10-14 14:01:30 -04:00
857adc980f
Changed Special 414's flags2text description to be less confusing
2019-10-14 19:59:07 +02:00
2f26cfad01
Prevent wraparound on Level platter when there are less than 3 rows.
...
Addresses #251 - I wanted to keep the scrolling because it looks nice and because I don't want to fuck with these drawers too bad.
2019-10-14 17:17:00 +01:00
c935797a34
Encapsulate the second behavior branch into an else.
...
When a tag is provided, the tagged sector-related branch is run exclusively now. This prevents playing the same sound again from the caller object's origin and other unwanted behaviors.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-10-14 16:30:20 +02:00
7eaa575dce
Added ZB config
2019-10-14 08:32:04 +02:00
0cf2774129
remove duplicate NearestColor prototype
2019-10-13 19:45:35 -03:00
88d19a2d9c
fix holey textures
2019-10-13 18:37:41 -03:00
ad4033ec9e
Make shatter blocks solid
2019-10-13 23:08:54 +02:00
63a7fb6956
Merge branch 'anotherctgfix' into 'master'
...
Fix reverse gravity cacti (and all other A_ConnectToGround stuffs)
See merge request STJr/SRB2Internal!378
2019-10-13 13:27:24 -04:00
46268214fc
Fix reverse gravity cacti (and all other A_ConnectToGround stuffs).
2019-10-13 17:48:40 +01:00
05a3023cb0
Merge branch 'nightsangle' into 'master'
...
Fixed NiGHTS spawnpoint angle camera jump fuckups
See merge request STJr/SRB2Internal!376
2019-10-13 12:47:32 -04:00
39a0644477
Merge branch 'hidegrade' into 'master'
...
Hide NiGHTS grade in singleplayer if ranking is below GRADE_A
Closes #250
See merge request STJr/SRB2Internal!377
2019-10-13 12:47:11 -04:00
MascaraSnake