stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-21 20:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
13123 commits 171 branches 41 tags 312 MiB
Commit graph

335 commits

Author SHA1 Message Date
MascaraSnake
5fbe5189ce Merge branch 'udmf-sector-fields' into udmf-full 2022-04-20 21:01:52 +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
54640a8664 Merge branch 'udmf-executor-triggers' into udmf-thing-types 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_things.cfg
 2022-04-20 20:59:55 +02:00
MascaraSnake
39b7fb9ff8 Merge commit 'd624ee25' into udmf-thing-types 
# Conflicts:
#	src/p_mobj.c
#	src/p_spec.c
 2022-04-20 20:41:46 +02:00
MascaraSnake
9815d40c20 Adapt tutorial plant to UDMF 2022-04-20 20:06:08 +02:00
MascaraSnake
f76b104c4a Merge commit 'c7050671' into udmf-thing-types 2022-04-20 19:42:03 +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
f672b1b940 Merge branch 'udmf-scrollers' into udmf-polyobjects 
# Conflicts:
#	src/p_spec.c
 2022-04-19 22:17:28 +02:00
MascaraSnake
f164809618 Merge branch 'udmf-plane-linedefs' into udmf-scrollers 2022-04-19 22:06:32 +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
a342703b50 Merge branch 'udmf-sector-fields' into udmf-full 
# Conflicts:
#	src/lua_maplib.c
#	src/p_setup.c
 2022-01-14 21:16:23 +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
0833f0bd4f Merge branch 'udmf-executor-triggers' into udmf-thing-types 
# Conflicts:
#	src/p_setup.c
#	src/p_spec.h
 2022-01-14 21:01:39 +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
7d2a188c31 Merge branch 'udmf-scrollers' into udmf-polyobjects 2022-01-14 20:24:13 +01:00
MascaraSnake
940d076190 Merge branch 'udmf-plane-linedefs' into udmf-scrollers 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/p_spec.h
 2022-01-14 20:21:48 +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
323cfaace9 Add blendmode support to FOFs 2022-01-14 19:40:45 +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
868b2577ad Merge branch 'udmf-sector-fields' into udmf-full 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_setup.c
#	src/p_spec.c
 2022-01-09 13:58:27 +01:00
MascaraSnake
020b738aa9 Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-01-09 13:52:59 +01:00
MascaraSnake
e7a281d994 Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2022-01-09 13:52:26 +01:00
MascaraSnake
e19ba99f57 Merge branch 'udmf-executor-triggers' into udmf-thing-types 2022-01-09 13:51:50 +01:00
MascaraSnake
95bf8ea4bb Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-01-09 13:51:21 +01:00
MascaraSnake
fba986ff1c Merge branch 'udmf-lighting' into udmf-linedef-executors 2022-01-09 13:50:47 +01:00
MascaraSnake
b6a5ff98f0 Merge branch 'udmf-sector-fields' into udmf-full 2022-01-07 12:46:47 +01:00
MascaraSnake
2bef8da42f Remove access to unused effect6 flag in UDMF 2022-01-05 18:42:53 +01:00
MascaraSnake
577ae68d6d Make sector friction a floating-point field 2022-01-04 21:25:34 +01:00
MascaraSnake
8291d433cb Chained spring: Correct flag description in UDB config 2022-01-04 20:05:21 +01:00
MascaraSnake
70a28bad94 Gas jet: Fix typo in UDB config 2022-01-04 20:02:58 +01:00
MascaraSnake
9d67420e5c Egg Slimer: Fix typo in binary-to-UDMF conversion and invert speed-up flag 2022-01-04 19:57:14 +01:00
MascaraSnake
46ad1e4a5c UDB config: Move thing type args from Doom section to UDMF section 2022-01-04 19:54:43 +01:00
MascaraSnake
6cc7cc3276 Fix UDB config typo 2022-01-04 19:50:34 +01:00
MascaraSnake
e0ed58f577 Fix UDB config typo 2022-01-04 19:49:28 +01:00
MascaraSnake
afde568856 Add blendmode support to FOFs 2022-01-04 19:33:17 +01:00