James R
7c9824dc56
Multiply the default radius of 384 by mobjscale, but not user set radiuses
2020-05-04 17:54:43 -07:00
James R
e2d4ddcec2
SOC: DefaultWaypointRadius in the level header picardy
2020-05-04 17:39:11 -07:00
MascaraSnake
af8bd89558
Adapt basic PolyObject setup to UDMF
2020-05-04 22:40:49 +02:00
MascaraSnake
8c22834b46
Merge branch 'next' into udmf-next
2020-05-04 20:32:56 +02:00
lachwright
f796379198
Reset pmomz after transfer to momz
2020-05-05 00:27:53 +08:00
Latapostrophe
59452ae026
Merge branch 'v2-master' into followme-internal
2020-05-04 12:52:47 +02:00
Sally Coolatta
2dfa20f758
Merge branch 'master' into pet-robo
2020-05-03 23:08:00 -04:00
Sally Coolatta
48ba151d98
Rather than showing random added skins, show random other players in the server on the signpost!
2020-05-03 20:58:12 -04:00
Latapostrophe
63485c3dbe
Merge branch 'v2-master' into followme-internal
2020-05-03 22:37:26 +02:00
MascaraSnake
4e6a0c0ae9
Revert some very incorrect refactoring
2020-05-02 15:33:15 +02:00
MascaraSnake
5a6d3753c0
Refactor P_PushableCheckBustables
2020-05-02 15:30:56 +02:00
MascaraSnake
cd9f6a2b7e
P_PlayerZMovement: Move PolyObject handling code into its own function
2020-05-02 13:49:16 +02:00
MascaraSnake
1cee43f945
Merge branch 'remove-polyobjects' into movement-refactor
2020-05-02 13:37:13 +02:00
MascaraSnake
147a1a8a0a
P_PlayerZMovement: Move checks for Mario blocks into their own function
2020-05-02 13:34:24 +02:00
MascaraSnake
1929b62133
P_PlayerMobjThinker: Move check for floatbob platforms into its own function
2020-05-02 13:08:13 +02:00
MascaraSnake
d037a12e54
P_PlayerMobjThinker: Move crumbling platforms check into its own function
2020-05-02 12:50:09 +02:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
lachwright
1568114d13
Dashmode fixes:
...
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
Sally Coolatta
1fcfdd5bae
Bot hints
...
Thing type 2004, adds a map-defined point for bots to gravitate towards or away from.
Angle: Changes radius, defaults to a 32 radius (or 64x64 area) without.
Ambush: When off, makes bots steer towards. When on, makes bots steer away.
Parameter: Changes how much the bot steers away/towards this point. If 0, defaults to 2.
(also, made bots ignore strong offroad if they could take a shortcut)
2020-04-30 14:15:10 -04:00
Nev3r
dbf2b9c0f0
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/p_floor.c
# src/p_mobj.c
# src/p_spec.c
# src/r_segs.c
2020-04-25 10:47:45 +02:00
MascaraSnake
d2e21afaf1
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
2020-04-24 21:15:53 +02:00
Monster Iestyn
f26e8f3df7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Sally Cochenour
372544d28f
Merge branch 'master' into pet-robo
2020-04-22 21:54:40 -04:00
sphere
7955c96fa1
Restore carelessly removed const keywords.
2020-04-22 23:38:10 +02:00
sphere
0868930d3b
Make emerald hunt shards spawn at correct heights, and add Float option.
2020-04-22 18:58:40 +02:00
Nev3r
3c6ad3a9a8
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/doomdata.h
# src/p_setup.c
2020-04-22 09:11:17 +02:00
Nev3r
3358413479
Merge branch 'udmf-pitch-and-roll' into 'udmf-next'
...
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
See merge request STJr/SRB2!882
2020-04-21 12:27:26 -04:00
Nev3r
c00f995b7f
Move the scale setting code behind the MapthingSpawn hook.
2020-04-19 16:00:57 +02:00
Nev3r
5632120a74
Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike.
2020-04-19 15:18:36 +02:00
Nev3r
da165d2d22
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
Nev3r
a11f94e45b
Fix cage issue with boss 4.
2020-04-19 13:13:53 +02:00
MascaraSnake
93eb0ee1c8
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
Nev3r
c997624224
Rewrote a bit of the boss 4 code, which still requires working dynamic global tag lists.
2020-04-17 23:43:26 +02:00
Nev3r
71ab943298
Remove presumably the remaining old tag references in the gamelogic.
2020-04-17 22:28:41 +02:00
Nev3r
df87feaba7
Carry over a considerable case regarding accessing the old tag vars.
2020-04-17 18:15:25 +02:00
Nev3r
6ab06fc89c
Skybox spawning now uses the taglists.
2020-04-17 10:05:50 +02:00
Sally Cochenour
e941749f4c
Move all of the item destroy sector code to one place
2020-04-15 22:45:03 -04:00
Nev3r
23ed07e08e
Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result.
2020-04-14 23:59:22 +02:00
Nev3r
860c44d953
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
Sally Cochenour
fafdb257b8
Actually, this should be left alone too
2020-04-02 15:15:34 -04:00
Sally Cochenour
3ae0cd03fb
Scale waypoint radius with mapobjectscale
...
Fixes Marble Garden's bots
2020-04-02 15:15:00 -04:00
Sally Cochenour
29613dba90
Merge branch 'master' into pet-robo
2020-03-31 10:47:03 -04:00
Sally Cochenour
69a67376b3
Oni's suggestions
...
- Only look for players who can pick up the item. Serves as a subtle tell for other players holding onto items, and lets you see the canon color more often
- Held eggman item uses black instead of player color
- Fix karma items not animating
2020-03-30 07:43:22 -04:00
Sally Cochenour
266ad99374
Add new item sprites
2020-03-30 06:57:42 -04:00
Sally Cochenour
9e2c119b56
Merge branch 'master' into pet-robo
2020-03-29 20:44:13 -04:00
Latapostrophe
4c1459cd4e
Chaos Conflicts
2020-03-29 12:14:27 +02:00
Latapostrophe
8960152a7c
Merge branch 'v2-master' into spb-waypoints
2020-03-28 15:12:38 +01:00
Sally Cochenour
e5ae9d1513
Merge branch 'master' into pet-robo
2020-03-28 08:43:40 -04:00
Sally Cochenour
bee6bbf619
Firework frames for fire shield
2020-03-28 03:56:39 -04:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04:00