Monster Iestyn
|
30105621d4
|
Merge branch 'master' into next
|
2020-05-06 21:51:36 +01:00 |
|
|
Monster Iestyn
|
9571c1e503
|
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 |
|
|
Zipper
|
87f7100d2e
|
Update p_user.c
|
2020-05-06 09:30:15 -04:00 |
|
|
ZipperQR
|
d0376e284a
|
S_StopSoundByID Lua support
|
2020-05-06 16:22:04 +03:00 |
|
|
Lachlan
|
05ea95d0eb
|
Merge branch 'next' into gfz3laser-mkii
|
2020-05-06 09:10:27 +08:00 |
|
|
lachwright
|
63cb58a10a
|
Update new GFZ3 laser
|
2020-05-06 09:03:03 +08:00 |
|
|
lachwright
|
92c900f284
|
New GFZ3 laser
|
2020-05-06 09:01:02 +08:00 |
|
|
LJ Sonic
|
20d207a7b7
|
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
|
2d6c9a94f4
|
Fix compiler warning
|
2020-05-05 14:05:19 +02:00 |
|
|
MascaraSnake
|
5282f01a53
|
Fix PolyObject flags not being applied when there is no parameter line
|
2020-05-05 08:40:59 +02:00 |
|
|
MascaraSnake
|
023c095d55
|
Merge branch 'polyobject-cleanup' into 'next'
PolyObject cleanup
See merge request STJr/SRB2!919
|
2020-05-04 14:18:08 -04:00 |
|
|
MascaraSnake
|
41efc0786d
|
Add new PolyObject flag to ZB config
|
2020-05-04 19:55:25 +02:00 |
|
|
MascaraSnake
|
de100b076a
|
PolyObject: Allow translucency to be set via X offset
|
2020-05-04 19:47:39 +02:00 |
|
|
MascaraSnake
|
d03742b15b
|
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
|
f81b5a7421
|
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
|
248df41a2f
|
Simplify set/fade polyobject translucency code
|
2020-05-04 10:29:35 +02:00 |
|
|
MascaraSnake
|
e3ddb413aa
|
Make PolyObject special functions return boolean instead of INT32
|
2020-05-04 10:07:38 +02:00 |
|
|
MascaraSnake
|
78a700f5fa
|
Remove non-descriptive comments
|
2020-05-04 10:01:44 +02:00 |
|
|
MascaraSnake
|
2be775e74c
|
Move parameter parsing for EV_DoPolyObjFlag into its own function
|
2020-05-04 09:58:27 +02:00 |
|
|
MascaraSnake
|
482adc6124
|
Pass parameters to EV_DoPolyObjFlag in a struct and not via the line
|
2020-05-04 09:54:32 +02:00 |
|
|
MascaraSnake
|
02c347ada2
|
Refactor Polyobj_findSegs
|
2020-05-04 01:28:21 +02:00 |
|
|
MascaraSnake
|
8ae635c7ba
|
Purge uninformative comments
|
2020-05-04 00:17:05 +02:00 |
|
|
MascaraSnake
|
b82c3c2089
|
Clean up Polyobj_GetInfo
|
2020-05-03 23:55:23 +02:00 |
|
|
MascaraSnake
|
5de11441a1
|
Remove "explicitly include line in polyobject" code which has never worked
|
2020-05-03 23:47:26 +02:00 |
|
|
MascaraSnake
|
700b340827
|
Allow map-wide gravity to be set via level header
|
2020-05-03 18:33:18 +02:00 |
|
|
MascaraSnake
|
4b87bee759
|
Add level header options for setting special stage time and spheres requirements
|
2020-05-03 17:56:49 +02:00 |
|
|
MascaraSnake
|
f7bcc759b6
|
Merge branch 'next' into egg-capsule
# Conflicts:
# extras/conf/SRB2-22.cfg
|
2020-05-03 16:00:05 +02:00 |
|
|
MascaraSnake
|
1b66d1f936
|
Add object dye linedef executors to ZB config
|
2020-05-03 15:57:18 +02:00 |
|
|
MascaraSnake
|
a9bd307dc0
|
Merge branch 'next' into egg-capsule
# Conflicts:
# src/p_spec.c
|
2020-05-03 15:29:20 +02:00 |
|
|
MascaraSnake
|
dd50990e85
|
Add "trigger egg capsule" linedef executor
|
2020-05-03 15:22:13 +02:00 |
|
|
ZipperQR
|
0d7c49e7e4
|
no message
|
2020-05-03 14:02:23 +03:00 |
|
|
MascaraSnake
|
d0d25025e1
|
Refactor P_CheckBouncySectors
|
2020-05-03 10:01:58 +02:00 |
|
|
Steel Titanium
|
887c25e047
|
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 |
|
|
Hannu Hanhi
|
c9114867cc
|
Dummy I_GetTimeMicros
|
2020-05-02 23:24:49 +03:00 |
|
|
Hannu Hanhi
|
1b6e65b91c
|
Implement I_GetTimeMicros without affecting I_GetTime behaviour details
|
2020-05-02 23:14:20 +03:00 |
|
|
Hannu Hanhi
|
724e093ce8
|
Render stats cleanup
|
2020-05-02 23:14:08 +03:00 |
|
|
Hannu Hanhi
|
7e8543a408
|
More render stats for software mode, renamed and relocated some render stats variables
|
2020-05-02 23:13:53 +03:00 |
|
|
Hannu Hanhi
|
8dcc2fe20d
|
Move some render stats variables to better locations, add I_FinishUpdate timing
|
2020-05-02 23:13:32 +03:00 |
|
|
Hannu Hanhi
|
64a153fdee
|
Render stats
|
2020-05-02 23:13:08 +03:00 |
|
|
Monster Iestyn
|
1528f2aef8
|
Fix drop shadow and rotsprite code to use SHORT()
|
2020-05-02 17:13:16 +01:00 |
|
|
MascaraSnake
|
d9ed914e14
|
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
|
b8a9686aaf
|
Merge branch 'remove-polyobjects' into 'next'
Delete polyobjects
See merge request STJr/SRB2!911
|
2020-05-02 09:53:37 -04:00 |
|
|
MascaraSnake
|
452fd100b8
|
Refactor P_CheckBustableBlocks
|
2020-05-02 15:50:18 +02:00 |
|
|
MascaraSnake
|
122104815a
|
Revert some very incorrect refactoring
|
2020-05-02 15:33:15 +02:00 |
|
|
MascaraSnake
|
ddb4c2c97f
|
Refactor P_PushableCheckBustables
|
2020-05-02 15:30:56 +02:00 |
|
|
MascaraSnake
|
bc2d0dcea6
|
Some minor PTR_GlideClimbTraverse cleanup
|
2020-05-02 15:25:19 +02:00 |
|
|
MascaraSnake
|
929064b998
|
Refactor PTR_SlideTraverse
|
2020-05-02 15:21:53 +02:00 |
|
|
MascaraSnake
|
a67c8786ae
|
P_PlayerZMovement: Move PolyObject handling code into its own function
|
2020-05-02 13:49:16 +02:00 |
|
|
MascaraSnake
|
29192eff9a
|
Merge branch 'remove-polyobjects' into movement-refactor
|
2020-05-02 13:37:13 +02:00 |
|
|
MascaraSnake
|
afc6378868
|
P_PlayerZMovement: Move checks for Mario blocks into their own function
|
2020-05-02 13:34:24 +02:00 |
|