stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
15854 commits 174 branches 41 tags 300 MiB
Commit graph

119 commits

Author SHA1 Message Date
spherallic
c64b242f01 Note to self: don't do busywork right after waking up from a short night of sleep 2023-07-15 13:07:55 +02:00
spherallic
28849c31a8 Update (U)ZB config with hitbox tweaks 2023-07-15 11:26:13 +02:00
sphere
777a1c6b83 Merge branch 'plane-scroller-tweaks-again' into 'next' 
Plane scroller & wind/current/pusher improvements (again)

See merge request STJr/SRB2!1811
 2023-05-25 21:00:30 +00:00
spherallic
b9c86a0f7f Zone Builder config updates 2023-05-23 17:54:32 +02:00
spherallic
540c5d6cc0 Add flag to action 433 to force MFE_VERTICALFLIP 2023-03-20 15:46:15 +01:00
spherallic
d0a91646ef Allow setting hoop pitch/yaw in degrees (binary) 2022-12-07 12:34:35 +01:00
Eidolon
9a88c9ea47 Merge branch 'gravityflipping' into 'next' 
Gravity flip bugfixes & additions

Closes #378, #661, and #430

See merge request STJr/SRB2!1808
 2022-11-12 23:33:07 +00:00
spherallic
862fdaaa3d Revert "prevent immediate re-flipping", streamline P_GetMobjGravity 2022-09-26 13:41:37 +02:00
spherallic
cd85240ec3 Add toggle for action 439 to use backside textures 2022-09-17 11:40:44 +02:00
spherallic
fe8485cc2f Add flag to set wind/current/push/pull strength using X offset 2022-09-17 11:20:51 +02:00
spherallic
3da9fb636a Add plane scroller features to binary map format: 
- Added actions for scrolling floor + ceiling simultaneously
- Added flag to use X offset for speed, instead of line length
 2022-09-17 10:51:16 +02:00
spherallic
872a2001c8 Add new linedef executor trigger that checks gravity 2022-09-17 02:14:25 +02:00
spherallic
1f73c9cf99 Add flag to per-sector gravity for overriding MF2_OBJECTFLIP 2022-09-11 16:15:50 +02:00
spherallic
9fabddd4bb Add sector type that flips gravity upon jumping 2022-09-08 16:56:35 +02:00
spherallic
f0adc71f9b Add flag to invert current gravity to gravity flip executor 2022-09-08 16:56:35 +02:00
MascaraSnake
faa7d89e3e Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-04-20 21:01:16 +02:00
MascaraSnake
5660d896e6 Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2022-04-20 21:00:44 +02:00
MascaraSnake
36bf8b1a77 Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-04-19 22:33:53 +02:00
MascaraSnake
863b1e125a Merge branch 'udmf-lighting' into udmf-linedef-executors 
# Conflicts:
#	src/p_spec.c
 2022-04-19 22:31:57 +02:00
MascaraSnake
2e56c3de35 Merge branch 'udmf-polyobjects' into udmf-lighting 2022-04-19 22:18:30 +02:00
MascaraSnake
36692483df Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 
# Conflicts:
#	src/p_inter.c
 2022-04-19 22:04:04 +02:00
MascaraSnake
a78e4e553c Merge branch 'next' into udmf-fofs-mkii 2022-03-18 07:29:02 +01:00
sphere
7e26377264 Merge branch 'state-changes' into 'next' 
Update Nightopians & other state changes

See merge request STJr/SRB2!1744
 2022-03-06 15:45:59 +00:00
sphere
ab711128c7 Merge branch 'tutorial-scenery' into 'next' 
Tutorial scenery

See merge request STJr/SRB2!1722
 2022-03-06 15:45:53 +00:00
spherallic
946100939a Update editor configurations & increase Nightopians' hitbox height. 2022-02-19 22:19:39 +01:00
sphere
249a3dfa25 Merge branch 'eggman-hitboxes' into 'next' 
Increase Eggman's hitboxes

See merge request STJr/SRB2!1706
 2022-02-19 20:24:20 +00:00
spherallic
bb84ae1793 Decrease hitbox sizes to prevent collision with thin air. 2022-02-10 13:10:56 +01:00
spherallic
c705067173 Update ZB configuration for the tutorial plant. 2022-01-24 13:50:14 +01:00
spherallic
be7f628e2c Add new plant object for the revamped tutorial. 2022-01-23 20:13:26 +01:00
MascaraSnake
13b8d1cf7e Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-01-14 21:09:11 +01:00
MascaraSnake
7fd1c0512a Merge branch 'udmf-thing-types' into udmf-more-linedef-types 
# Conflicts:
#	src/p_setup.c
 2022-01-14 21:06:45 +01:00
MascaraSnake
0d9860c368 Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-01-14 20:42:59 +01:00
MascaraSnake
4b8f5bd7f3 Merge branch 'udmf-lighting' into udmf-linedef-executors 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/doomdata.h
#	src/r_defs.h
 2022-01-14 20:30:29 +01:00
MascaraSnake
79cf2f53e8 Merge branch 'udmf-polyobjects' into udmf-lighting 2022-01-14 20:24:51 +01:00
MascaraSnake
5d343f9c13 Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/p_spec.h
 2022-01-14 20:17:18 +01:00
MascaraSnake
6bb6dc88ca Merge branch 'next' into udmf-fofs-mkii 
# Conflicts:
#	src/hardware/hw_main.c
#	src/lua_maplib.c
#	src/p_spec.c
#	src/p_user.c
 2022-01-14 07:24:05 +01:00
spherallic
93512ae9f9 Update Zone Builder configuration. 2022-01-12 00:46:24 +01:00
MascaraSnake
eef7763d68 Set SSF_WINDCURRENT and SSF_CONVEYOR automatically if there's a pusher/conveyor 2021-12-31 13:58:41 +01:00
MascaraSnake
e1393954c7 Make deprecated sector types inaccessible in UDMF 2021-12-30 21:27:09 +01:00
MascaraSnake
228efa5ffc Add "relative" setting to linedef type 799 and adapt it to UDMF 2021-12-29 15:29:59 +01:00
MascaraSnake
f431b20911 Add new blendmode linedef types to config 2021-12-12 06:54:48 +01:00
MascaraSnake
dc4dd75810 Add NiGHTS mare trigger linedef type and deprecate the NiGHTS mare sector type 2021-12-09 20:57:44 +01:00
MascaraSnake
18e8ebf394 Add emerald check trigger linedef types and deprecate the emerald check sector type 2021-12-09 20:37:39 +01:00
MascaraSnake
f5cda9f64c Merge branch 'udmf-lighting' into udmf-linedef-executors 2021-12-03 19:23:24 +01:00
MascaraSnake
aee4996eba Merge branch 'udmf-polyobjects' into udmf-lighting 2021-12-03 19:22:37 +01:00
MascaraSnake
c4775ed37b Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 
# Conflicts:
#	extras/conf/SRB2-22.cfg
#	src/p_ceilng.c
 2021-12-03 19:10:29 +01:00
MascaraSnake
adce427299 Merge branch 'next' into udmf-fofs-mkii 
# Conflicts:
#	src/p_user.c
 2021-12-03 18:58:02 +01:00
MascaraSnake
6dc49042de Port katsy's bouncy FOF cleanup 2021-12-03 18:48:16 +01:00
spherallic
c1c7607cb0 Add toggle for linedef action 401 to not change the ceiling texture. 2021-12-02 01:52:45 +01:00
MascaraSnake
75ef804f64 Merge branch 'udmf-lighting' into udmf-linedef-executors 2021-09-26 07:01:56 +02:00