Commit graph

14198 commits

Author SHA1 Message Date
sphere
e152a32c10 Merge branch 'HUD_fixes' into 'next'
Some hud fixes (by Confusion)

See merge request STJr/SRB2!1670
2021-12-29 09:59:40 +00:00
MascaraSnake
3bac97ee65 Clean up P_SpawnSpecials a bit 2021-12-29 10:59:26 +01:00
MascaraSnake
234e8f5f8f Disable camera scanner effect in UDMF 2021-12-29 10:55:39 +01:00
MascaraSnake
c76d0e3326 Implement linedef executor for changing linedef args 2021-12-29 10:42:20 +01:00
MascaraSnake
e7869039db Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2021-12-29 09:40:47 +01:00
MascaraSnake
95248dc80f Merge branch 'next' into udmf-thing-types
# Conflicts:
#	src/p_mobj.c
2021-12-29 09:35:25 +01:00
MascaraSnake
1aa9ba1447 Delete removed mobj types from deh_tables.c 2021-12-29 08:31:47 +01:00
MascaraSnake
cbf32c6615 Adapt some miscellaneous linedef types to UDMF 2021-12-29 08:12:28 +01:00
MascaraSnake
e76d332678 Disable the old hacky way of doing egg capsules in UDMF maps 2021-12-28 23:51:08 +01:00
MascaraSnake
2a868ca60d Adapt Glaregoyles to UDMF 2021-12-28 23:06:48 +01:00
MascaraSnake
a091b7d16d Adapt bosses to UDMF and remove now-unused mapthing flags 2021-12-28 22:52:24 +01:00
MascaraSnake
e71a952d70 Adapt monitors to UDMF 2021-12-28 17:54:26 +01:00
MascaraSnake
79c3197de2 Adapt various thing types for UDMF 2021-12-28 16:38:52 +01:00
MascaraSnake
53931727bd Adapt pushables to UDMF 2021-12-28 14:28:36 +01:00
MascaraSnake
42f823600c Adapt NiGHTS items to UDMF 2021-12-28 14:04:30 +01:00
MascaraSnake
b4a206c063 Adapt remaining enemies to UDMF 2021-12-28 13:14:48 +01:00
MascaraSnake
5d1284bc81 Fix unitialized array in P_ConvertBinaryMap 2021-12-28 11:42:53 +01:00
MascaraSnake
1cff7a161a Adapt ambient sound effects to UDMF 2021-12-28 09:58:45 +01:00
MascaraSnake
5248271619 Adapt blast linedef executor to UDMF 2021-12-28 08:33:57 +01:00
MascaraSnake
e140bd8252 Adapt balloon colors to UDMF 2021-12-28 08:26:04 +01:00
MascaraSnake
8b69c62111 Adapt more scenery items to UDMF 2021-12-28 08:19:56 +01:00
MascaraSnake
b1d0870511 (Mostly) adapt fan to UDMF 2021-12-28 07:47:10 +01:00
MascaraSnake
90eb7c71a3 Adapt skybox view point to UDMF 2021-12-28 07:29:41 +01:00
MascaraSnake
43a15387d2 Adapt diagonal springs to UDMF 2021-12-27 21:28:42 +01:00
MascaraSnake
fd3fa9a924 Adapt flame-related objects to UDMF 2021-12-27 18:52:46 +01:00
MascaraSnake
720df51b6e Adapt most flame jet settings to UDMF 2021-12-27 17:58:18 +01:00
MascaraSnake
3bab07d036 Adapt flickies to UDMF 2021-12-27 17:36:51 +01:00
MascaraSnake
8db84ffef9 Adapt boss waypoint to UDMF 2021-12-27 15:39:14 +01:00
MascaraSnake
06bbee50bf Adapt boss IDs and trigger tags to UDMF 2021-12-27 15:07:37 +01:00
lachablock
392e782893 Don't modify drawangle when taking damage in strafe mode 2021-12-27 23:35:01 +11:00
sphere
31eb2a7e77 Merge branch 'nobotbonus' into 'next'
Don't award end-of-level bonuses to Tailsbot

See merge request STJr/SRB2!1676
2021-12-27 11:49:13 +00:00
spherallic
1040141560 Fix enemy/boss/minecart explosions in death pits 2021-12-27 12:41:04 +01:00
MascaraSnake
a14eacd63a Bowser isn't a boss, so don't call A_BossDeath just to do that one thing it needs to do 2021-12-27 08:55:59 +01:00
MascaraSnake
c550de5dfa Adapt spikes to UDMF 2021-12-27 07:32:57 +01:00
MascaraSnake
36217c6468 Finish adapting slope vertices to UDMF 2021-12-26 21:33:20 +01:00
spherallic
b830fee2e3 Allow changing the master server address while hosting a netgame. 2021-12-26 21:30:36 +01:00
spherallic
bb514d227c Don't count music.dta as a main wad when using listwad 2021-12-26 21:12:39 +01:00
MascaraSnake
8535b595d6 Adapt some more player spawning stuff to UDMF 2021-12-26 21:11:24 +01:00
MascaraSnake
ea6fe56df6 Refactor A_BossDeath 2021-12-26 20:31:02 +01:00
MascaraSnake
3661fd5079 Adapt boss fly point to UDMF 2021-12-26 20:09:38 +01:00
sphere
6cb6cc5afb Merge branch 'fixlazytails' into 'next'
Set a default botleader if we don't have one (resolves #717)

Closes #717

See merge request STJr/SRB2!1683
2021-12-26 12:41:49 +00:00
katsy
243a797efe Set a default botleader if we don't have one (resolves #717) 2021-12-26 12:41:49 +00:00
MascaraSnake
baa99150d0 Adapt Fang waypoint to UDMF 2021-12-25 09:58:00 +01:00
katsy
9b10473e0d add invert flashpal constant 2021-12-24 19:36:26 -06:00
sphere
2615528f45 Merge branch 'pterabyte-mash' into 'next'
CR_PTERABYTE tweaks (Closes #304)

Closes #304

See merge request STJr/SRB2!1380
2021-12-24 13:29:13 +00:00
lachablock
2975b22aed Merge remote-tracking branch 'origin/next' into server-bots 2021-12-22 19:46:33 +11:00
lachablock
1eb1ad2677 Fix compile warning 2021-12-22 19:46:16 +11:00
MascaraSnake
fe8c1d1331 Adapt Pyre Fly to UDMF 2021-12-21 22:00:42 +01:00
MascaraSnake
5eb2448a40 Adapt Pterabytes to UDMF 2021-12-21 21:57:35 +01:00
MascaraSnake
a5ac10733a Adapt Hive Elemental to UDMF 2021-12-21 21:51:37 +01:00