lachwright
|
a4cba6a5f9
|
Merge branch 'master' into next
|
2020-05-11 01:29:10 +08:00 |
|
Lachlan Wright
|
72c16b0761
|
Merge branch '1upsound' into 'master'
Play the 1-up sound when 1upsound is set to sound
See merge request STJr/SRB2!926
|
2020-05-10 13:28:09 -04:00 |
|
Lachlan Wright
|
7df8c24a9b
|
Merge branch 'patch_music' into 'next'
patch_music.pk3
See merge request STJr/SRB2!812
|
2020-05-10 12:51:49 -04:00 |
|
LJ Sonic
|
1952c30344
|
Merge branch 'gfz3laser-mkii' into 'next'
New Greenflower Zone 3 laser
See merge request STJr/SRB2!924
|
2020-05-09 16:40:40 -04:00 |
|
LJ Sonic
|
8b5becfcba
|
Merge branch 'optimise-archiving' into 'next'
Optimise net-archiving of Lua strings, numbers and booleans
See merge request STJr/SRB2!904
|
2020-05-09 16:40:28 -04:00 |
|
LJ Sonic
|
9cfa75b9b5
|
Merge branch 'showfps-tweaks' into 'next'
FPS counter tweaks
See merge request STJr/SRB2!927
|
2020-05-09 15:46:08 -04:00 |
|
sphere
|
6b761c1486
|
Make showfps save to config, and add a compact option.
|
2020-05-08 15:40:50 +02:00 |
|
Lachlan
|
05c83bbd68
|
Play the 1-up sound when 1upsound is set to sound
|
2020-05-08 04:07:00 +08:00 |
|
MascaraSnake
|
59a49d9f3c
|
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
|
2020-05-07 22:00:02 +02:00 |
|
MascaraSnake
|
9ebbb5b7c2
|
Fixed a typo
|
2020-05-07 21:59:39 +02:00 |
|
lachwright
|
fa8e58bec9
|
Prevent laser sprites clipping into walls/off ledges
|
2020-05-08 02:58:56 +08:00 |
|
lachwright
|
bfd1d3d49f
|
Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it
|
2020-05-07 23:24:33 +08:00 |
|
lachwright
|
cd9774b649
|
Fix knockback scaling
|
2020-05-07 22:47:34 +08:00 |
|
lachwright
|
d3208568ee
|
Merge remote-tracking branch 'origin/next' into gfz3laser-mkii
|
2020-05-07 22:34:44 +08:00 |
|
Alam Ed Arias
|
ec948af34f
|
Merge branch 'master' into next
|
2020-05-06 18:36:20 -04:00 |
|
Alam Ed Arias
|
b46398b06a
|
fix build errors in public master
|
2020-05-06 18:35:54 -04:00 |
|
Monster Iestyn
|
c06fbf4fe7
|
Merge branch 'master' into next
|
2020-05-06 21:51:36 +01:00 |
|
Monster Iestyn
|
b315bc7b10
|
Merge branch 'to-put-it-in-short' into 'master'
To put it in SHORT()
See merge request STJr/SRB2!913
|
2020-05-06 16:50:23 -04:00 |
|
Lachlan
|
f533535db7
|
Merge branch 'next' into gfz3laser-mkii
|
2020-05-06 09:10:27 +08:00 |
|
lachwright
|
645c324d51
|
Update new GFZ3 laser
|
2020-05-06 09:03:03 +08:00 |
|
lachwright
|
b4648e4c78
|
New GFZ3 laser
|
2020-05-06 09:01:02 +08:00 |
|
LJ Sonic
|
57f30374fd
|
Merge branch 'fix-fucking-warning-why-did-my-compiler-not-tell-me-when-i-was-testing-omfg' into 'next'
fix warning and destroy universe
See merge request STJr/SRB2!922
|
2020-05-05 08:10:21 -04:00 |
|
Louis-Antoine
|
d3d01dd8eb
|
Fix compiler warning
|
2020-05-05 14:05:19 +02:00 |
|
MascaraSnake
|
34c55acf48
|
Fix PolyObject flags not being applied when there is no parameter line
|
2020-05-05 08:40:59 +02:00 |
|
MascaraSnake
|
b3f81349ae
|
Merge branch 'polyobject-cleanup' into 'next'
PolyObject cleanup
See merge request STJr/SRB2!919
|
2020-05-04 14:18:08 -04:00 |
|
MascaraSnake
|
486996702d
|
Add new PolyObject flag to ZB config
|
2020-05-04 19:55:25 +02:00 |
|
MascaraSnake
|
af2098c3b6
|
PolyObject: Allow translucency to be set via X offset
|
2020-05-04 19:47:39 +02:00 |
|
MascaraSnake
|
58a5e4ce7c
|
Merge branch 'level-header-sector-typeskd' into 'next'
Allow some map-wide settings to be set via level header instead of sector types
See merge request STJr/SRB2!917
|
2020-05-04 05:21:49 -04:00 |
|
MascaraSnake
|
6421b7b7e8
|
Merge branch 'egg-capsule' into 'next'
Add "trigger egg capsule" linedef executor
See merge request STJr/SRB2!916
|
2020-05-04 05:21:40 -04:00 |
|
MascaraSnake
|
ef394eccfb
|
Simplify set/fade polyobject translucency code
|
2020-05-04 10:29:35 +02:00 |
|
MascaraSnake
|
7b293d43c0
|
Make PolyObject special functions return boolean instead of INT32
|
2020-05-04 10:07:38 +02:00 |
|
MascaraSnake
|
5e188cb71b
|
Remove non-descriptive comments
|
2020-05-04 10:01:44 +02:00 |
|
MascaraSnake
|
a69201bf68
|
Move parameter parsing for EV_DoPolyObjFlag into its own function
|
2020-05-04 09:58:27 +02:00 |
|
MascaraSnake
|
c6d245879a
|
Pass parameters to EV_DoPolyObjFlag in a struct and not via the line
|
2020-05-04 09:54:32 +02:00 |
|
MascaraSnake
|
48c5bd4486
|
Refactor Polyobj_findSegs
|
2020-05-04 01:28:21 +02:00 |
|
MascaraSnake
|
3d9bf8335e
|
Purge uninformative comments
|
2020-05-04 00:17:05 +02:00 |
|
MascaraSnake
|
9fa267f247
|
Clean up Polyobj_GetInfo
|
2020-05-03 23:55:23 +02:00 |
|
MascaraSnake
|
a1a3b54108
|
Remove "explicitly include line in polyobject" code which has never worked
|
2020-05-03 23:47:26 +02:00 |
|
MascaraSnake
|
2df5758ecf
|
Allow map-wide gravity to be set via level header
|
2020-05-03 18:33:18 +02:00 |
|
MascaraSnake
|
9abfcacc3c
|
Add level header options for setting special stage time and spheres requirements
|
2020-05-03 17:56:49 +02:00 |
|
MascaraSnake
|
89dd809e04
|
Merge branch 'next' into egg-capsule
# Conflicts:
# extras/conf/SRB2-22.cfg
|
2020-05-03 16:00:05 +02:00 |
|
MascaraSnake
|
c39fd8053a
|
Add object dye linedef executors to ZB config
|
2020-05-03 15:57:18 +02:00 |
|
MascaraSnake
|
40f228c952
|
Merge branch 'next' into egg-capsule
# Conflicts:
# src/p_spec.c
|
2020-05-03 15:29:20 +02:00 |
|
MascaraSnake
|
6002a0e443
|
Add "trigger egg capsule" linedef executor
|
2020-05-03 15:22:13 +02:00 |
|
Steel Titanium
|
72b83986fa
|
Remove inline keyword from P_DoTwinSpin function
The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error
|
2020-05-02 17:39:55 -04:00 |
|
Monster Iestyn
|
145b7d8f66
|
Fix drop shadow and rotsprite code to use SHORT()
|
2020-05-02 17:13:16 +01:00 |
|
MascaraSnake
|
4346d22480
|
Merge branch 'amyswings' into 'next'
Restore jump-related pflags properly during twinspin
See merge request STJr/SRB2!908
|
2020-05-02 10:03:49 -04:00 |
|
MascaraSnake
|
96ae5dda22
|
Merge branch 'remove-polyobjects' into 'next'
Delete polyobjects
See merge request STJr/SRB2!911
|
2020-05-02 09:53:37 -04:00 |
|
MascaraSnake
|
8efec04051
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
MascaraSnake
|
238513ffd6
|
Merge branch 'find-sector-from-tag' into 'next'
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag
See merge request STJr/SRB2!901
|
2020-05-01 05:49:52 -04:00 |
|