4b3d6f04f8
Expose P_PlayerZMovement to Lua.
...
Finishing off these changes; how a player moves vertically.
2020-07-12 18:02:50 -05:00
df1fd0c456
Expose P_SceneryZMovement to Lua.
...
Still more complex than P_RingZMovement.
2020-07-12 18:02:50 -05:00
4710e4f07c
Expose P_RingZMovement to Lua.
...
Ever wanted to move like a ring vertically?
2020-07-12 18:02:50 -05:00
6d3a2919a2
Expose P_ZMovement to Lua.
...
Because P_XYMovement wasn't enough.
2020-07-12 18:02:50 -05:00
27c25bfa1e
Expose P_SceneryXYMovement to Lua.
...
Ironically this seems slightly more advanced than P_RingXYMovement...
2020-07-12 18:02:50 -05:00
6ac3d62321
Expose P_RingXYMovement to Lua.
...
Ever wanted to move like a ring horizontally?
2020-07-12 18:02:50 -05:00
ad55f5f872
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_ceilng.c
# src/p_floor.c
# src/p_mobj.c
# src/p_mobj.h
# src/p_polyobj.c
# src/p_saveg.c
# src/p_setup.c
# src/p_spec.c
# src/p_spec.h
# src/p_user.c
# src/r_bsp.c
# src/r_defs.h
2020-07-10 18:18:07 +02:00
710097a0ca
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-10 11:47:16 +02:00
3226a5d699
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades
2020-07-09 05:56:11 +08:00
fd5b05cafc
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-06 11:13:27 +02:00
f03addc5a7
Merge remote-tracking branch 'origin/next' into knuxtweaks
2020-07-04 18:53:26 +08:00
98c657e703
Merge branch 'sf_nosupersprites' into 'next'
...
Add SF_NOSUPERSPRITES
See merge request STJr/SRB2!1000
2020-07-04 06:51:11 -04:00
527e682931
Add sightcheck boolean to P_RadiusAttack
...
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
3679df07aa
Merge branch 'dragonbomber-height' into 'next'
...
Fix Dragonbomber z positioning
See merge request STJr/SRB2!1004
2020-07-03 17:05:10 -04:00
8652bbc1a5
Knuckles changes:
...
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
3ebc17ac3a
Merge branch 'next' into knuxtweaks
2020-07-02 13:08:04 +08:00
ff8759e507
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
067d9b9a63
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
7b2e54b426
Fix Dragonbomber z positioning
2020-06-19 00:52:24 +08:00
edfd64877c
Add SF_NOSUPERSPRITES
2020-06-17 04:53:42 +08:00
4a0206b38d
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
2020-06-09 09:38:01 +02:00
191e2e094d
Merge branch 'fix-spawn-desynch' into 'next'
...
Fix desynch when a player spawns
See merge request STJr/SRB2!977
2020-06-08 05:25:41 -04:00
614a98bd9d
Merge branch 'dashmode-fixes' into 'next'
...
Dashmode fixes
See merge request STJr/SRB2!909
2020-06-08 05:25:30 -04:00
de7a806ec3
Merge branch 'nospinmovecut' into 'next'
...
Don't cut momentum if landing in a roll
See merge request STJr/SRB2!972
2020-06-07 13:24:19 -04:00
7e562a3ca5
Merge branch 'master' into next
2020-06-06 20:35:48 +01:00
f68a95016e
Merge branch 'next' into nospinmovecut
2020-06-07 02:45:26 +08:00
7340442839
P_XYMovement: initialise slopemom to all zeros
2020-06-03 20:47:49 +01:00
e2b860dc28
Merge branch 'next' into 'fix-spawn-desynch'
...
# Conflicts:
# src/p_map.c
2020-06-01 08:15:02 -04:00
8d7f4e3265
Merge branch 'movement-refactor' into 'next'
...
Clean up some movement code
See merge request STJr/SRB2!912
2020-06-01 07:21:41 -04:00
5136a4d41d
Don't cut momentum if landing in a roll
2020-05-30 19:07:16 +08:00
ae5d5b9546
Merge branch 'next' into dashmode-fixes
2020-05-30 18:13:21 +08:00
67eef5a37f
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
b37c73b008
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
46191cade7
Update to 2.2.4
2020-05-22 16:47:51 -05:00
ff37975892
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02:00
33a22331f8
Merge branch 'waypoints' into 'next'
...
Store waypoints at map load instead of iterating through the thinker list to find them
See merge request STJr/SRB2!938
2020-05-18 16:00:46 -04:00
d0abd6e86c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
a06c4a8c98
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
969c48fac8
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02:00
1ccda0b85c
Merge branch 'next' into udmf-next
2020-05-13 10:01:12 +02:00
36843cbfd6
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
d708789c3a
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
6b4ee94e38
Use camera angle, not mobj angle, when comparing Angle Anchor
2020-05-10 19:40:28 -07:00
39c5ab4e17
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
63cb58a10a
Update new GFZ3 laser
2020-05-06 09:03:03 +08:00
8c36b9efa5
Adapt basic PolyObject setup to UDMF
2020-05-04 22:40:49 +02:00
6e7373a475
Merge branch 'next' into udmf-next
2020-05-04 20:32:56 +02:00
122104815a
Revert some very incorrect refactoring
2020-05-02 15:33:15 +02:00
ddb4c2c97f
Refactor P_PushableCheckBustables
2020-05-02 15:30:56 +02:00
a67c8786ae
P_PlayerZMovement: Move PolyObject handling code into its own function
2020-05-02 13:49:16 +02:00
29192eff9a
Merge branch 'remove-polyobjects' into movement-refactor
2020-05-02 13:37:13 +02:00
afc6378868
P_PlayerZMovement: Move checks for Mario blocks into their own function
2020-05-02 13:34:24 +02:00
2605f29bd4
P_PlayerMobjThinker: Move check for floatbob platforms into its own function
2020-05-02 13:08:13 +02:00
19d77bfc53
P_PlayerMobjThinker: Move crumbling platforms check into its own function
2020-05-02 12:50:09 +02:00
485a4e5035
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
165b6c2435
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
9ebb4071ee
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
3170f2b8c3
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
2020-04-24 21:15:53 +02:00
d1d006a1a7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
67f511a55e
Restore carelessly removed const keywords.
2020-04-22 23:38:10 +02:00
25affe6948
Make emerald hunt shards spawn at correct heights, and add Float option.
2020-04-22 18:58:40 +02:00
de3ad9bc43
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/doomdata.h
# src/p_setup.c
2020-04-22 09:11:17 +02:00
3d9d9d74f6
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
beb42c9499
Move the scale setting code behind the MapthingSpawn hook.
2020-04-19 16:00:57 +02:00
7cf08e1a08
Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike.
2020-04-19 15:18:36 +02:00
ca10b38b9c
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
9ac60a62b3
Fix cage issue with boss 4.
2020-04-19 13:13:53 +02:00
fd598f315e
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
d775a42e93
Rewrote a bit of the boss 4 code, which still requires working dynamic global tag lists.
2020-04-17 23:43:26 +02:00
7904856e8e
Remove presumably the remaining old tag references in the gamelogic.
2020-04-17 22:28:41 +02:00
b5eaad42fc
Carry over a considerable case regarding accessing the old tag vars.
2020-04-17 18:15:25 +02:00
4fc07473fd
Skybox spawning now uses the taglists.
2020-04-17 10:05:50 +02:00
439fde3434
Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result.
2020-04-14 23:59:22 +02:00
4128f826b7
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
23b6679b3a
Merge branch 'buggle-trouble' into 'next'
...
P_HomingAttack related fixes
See merge request STJr/SRB2!836
2020-03-22 16:57:22 -04:00
6f9422d380
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
1580e14cbc
Merge branch 'next' into udmf-next
...
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
2020-03-21 20:04:31 +01:00
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
f4cb6e1f5e
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
776951c6a8
Never forget who your enemy is
2020-03-03 11:40:35 -03:00
21b28b6295
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-29 23:41:16 -05:00
4e7b47440f
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
fe93155578
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
2020-02-24 20:03:08 -03:00
6415e10216
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
4517377552
Start CA_GLIDEANDCLIMB swimming functionality
2020-02-23 15:38:11 +08:00
56b67a3b4f
Custom skincolors
2020-02-21 21:56:39 -05:00
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
c76a8e8a58
Standards
2020-02-18 22:46:16 -03:00
cae99654be
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
0fbff66e25
Let scripters see if player just launched from slope
2020-02-16 21:34:07 -06:00
bd90c20366
Turn the shadow scale if-else into a switch statement, for sake of editing and in case object types ever change 💦
2020-02-02 18:00:02 -08:00
5a524f21da
Merge branch 'starpost-config-additions' into 'next'
...
Starpost config additions
See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
cddc4e1500
Merge branch 'next' into platform-fixes
2020-01-26 04:34:57 +08:00
3775e6447e
Skyboxes: Remove obsolete modulo operation
2020-01-25 15:37:23 +01:00
d30b48cfd1
Fix lava removing fire shield
2020-01-25 14:04:16 +01:00
d947558576
Use tag instead of angle for skyboxes
2020-01-25 10:26:38 +01:00
GoldenTails