spherallic
c92a371aa9
Clean up the start of P_CheckQuicksand
2022-10-08 10:58:09 +02:00
katsy
79e8e10e07
check for canbustwalls, not glide&climb
2022-10-04 16:22:07 -05:00
spherallic
9da90cef8e
Merge branch 'next' into gravityflipping
2022-09-30 21:27:32 +02:00
sphere
70161ff52e
Merge branch 'fancarry' into 'next'
...
Add carry type to fans (with fixed merge conflicts)
See merge request STJr/SRB2!1809
2022-09-30 13:07:19 +00:00
spherallic
bf466bfbd9
Fix P_InJumpFlipSector checking for outdated FOF flags
2022-09-29 19:32:53 +02:00
spherallic
f37d466343
Merge branch 'next' into gravityflipping
2022-09-29 19:27:00 +02:00
spherallic
2664fc700a
Check for sector special flag instead of special number
2022-09-16 23:05:24 +02:00
spherallic
612424e2e2
Merge branch 'next' into fancarry
2022-09-16 22:54:08 +02:00
spherallic
9499d16221
Fix quicksand in reverse gravity
2022-09-12 11:27:28 +02:00
spherallic
42fc6c877b
Remove hack in P_GetMobjGravity for spinfire, fix the underlying issue
2022-09-11 20:04:20 +02:00
spherallic
5e6185abe2
Fix Elemental stomp's flames while Gravity Boots are active
2022-09-11 18:28:17 +02:00
spherallic
8d06145377
Play gravity flip sound on jump in jumpflip sectors, reorganize code
2022-09-09 15:35:05 +02:00
spherallic
9fabddd4bb
Add sector type that flips gravity upon jumping
2022-09-08 16:56:35 +02:00
SMS Alfredo
e070880ec0
Do the thing
2022-08-25 15:29:54 -05:00
MascaraSnake
ec119eac2f
Merge branch 'next' into udmf-fof-flags
2022-07-31 13:27:03 +02:00
MascaraSnake
8d4baace53
Add Lua backwards compatibility for FOF flags
2022-07-31 12:04:42 +02:00
sphere
c65851d17c
Merge branch 'autobrake-fix' into 'next'
...
Make autobrake account for scale
See merge request STJr/SRB2!1782
2022-07-29 09:33:29 +00:00
Eidolon
805941a98f
Merge public next into uncappedrevengeance
...
This is to capture the UDMF merges and make the later code review
easier.
2022-05-03 14:45:14 -05:00
Eidolon
0503c853cc
Reset Metal fume interp state on appear
2022-04-27 18:19:00 -05:00
Eidolon
c79df7d58e
Interpolate afterimages further back
2022-04-26 20:56:35 -05:00
Eidolon
9f845622cd
Revert "P_InitAngle, to fix angle interpolation on spawning objects"
...
This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5.
2022-04-26 20:56:34 -05:00
Eidolon
5790168194
Convert P_TeleportMove use to origin funcs
2022-04-26 20:56:34 -05:00
Sally Coolatta
e4930535f3
P_InitAngle, to fix angle interpolation on spawning objects
2022-04-26 20:56:31 -05:00
aiire
c4bb90fb0c
do the thing
2022-04-21 16:55:57 +00:00
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
36bf8b1a77
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-04-19 22:33:53 +02:00
MascaraSnake
0b4bbacec0
Merge branch 'next' into udmf-fofs-mkii
2022-04-19 21:59:31 +02:00
sphere
2b9af0ff24
Merge branch 'unsteal-ideya-spheres' into 'next'
...
Fix Ideya Capture sometimes stealing extra spheres
See merge request STJr/SRB2!1768
2022-03-21 22:53:06 +00:00
sphere
e063084960
Merge branch 'myformerself' into 'next'
...
Make P_SpawnGhostMobj ghosts properly copy spritestuff2 (!1257 ) variables
See merge request STJr/SRB2!1741
2022-03-21 21:57:17 +00:00
Zwip-Zwap Zapony
7fdebdcdb9
Suggested optimization
2022-03-20 13:18:22 +01:00
Zwip-Zwap Zapony
bca90893d2
Fix Ideya Capture sometimes stealing extra spheres
...
Also clean up redundant "startingspheres" variable
2022-03-20 09:52:47 +01:00
MascaraSnake
a78e4e553c
Merge branch 'next' into udmf-fofs-mkii
2022-03-18 07:29:02 +01:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
sphere
d532546e46
Merge branch 'mt-null-spawning' into 'next'
...
Remove MT_NULL hacks
Closes #721
See merge request STJr/SRB2!1729
2022-02-19 20:24:34 +00:00
sphere
c79c6531e6
Merge branch 'server-bots' into 'next'
...
Improve bots (resolves #710 )
Closes #710
See merge request STJr/SRB2!1679
2022-02-19 20:24:12 +00:00
SMS Alfredo
2033b77b46
Actually do the thing
2022-02-11 00:33:49 -06:00
James R
6325185091
Add P_SetPower; remove mobj hack from line 434
2022-02-01 03:52:31 -08:00
James R
9dfa153e74
Use P_CheckMove
2022-02-01 03:52:28 -08:00
sphere
ff57a983d7
Merge branch 'facing-forwards' into 'next'
...
Don't modify drawangle when taking damage in strafe mode
See merge request STJr/SRB2!1689
2022-01-30 13:32:30 +00:00
lachablock
1a5995968c
Revert server-sidedness of bots
2022-01-19 00:48:25 +11: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
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
lachablock
70a1dd6db0
Merge remote-tracking branch 'origin/next' into server-bots
2022-01-13 09:52:38 +11:00
lachablock
8ed18a12a4
Merge remote-tracking branch 'origin/next' into server-bots
2022-01-11 20:04:22 +11:00
MascaraSnake
a46619684f
Disable NiGHTS objectplace, which serves no purpose anymore without writethings
2022-01-09 09:30:15 +01:00
MascaraSnake
ca1d844278
Merge branch 'blentran-update' into udmf-full
2022-01-04 19:36:20 +01:00
MascaraSnake
2b4d32b372
Turn solid lava into a damagetype
2021-12-31 12:15:01 +01:00
MascaraSnake
b3be8d1f44
Implement sector damagetype field
2021-12-31 08:53:00 +01:00
MascaraSnake
feaa4f1273
Replace most sector specials with sector special flags
2021-12-31 00:03:24 +01:00
MascaraSnake
e1393954c7
Make deprecated sector types inaccessible in UDMF
2021-12-30 21:27:09 +01:00
MascaraSnake
570a6ab395
Turn "intangible to camera" sector special into a sector flag
2021-12-30 20:37:57 +01:00
MascaraSnake
f30b97ba93
Adapt heat wave effect to UDMF
2021-12-30 14:48:40 +01:00
MascaraSnake
69797377c4
Adapt some parameter linedef types to UDMF
2021-12-29 23:03:37 +01:00
spherallic
17251895ea
Increase default camera height for both playstyles
2021-12-29 19:29:41 +01:00
spherallic
0a38fef147
Several changes to default control settings:
...
- Renamed Simple to Automatic, and made it the default
- Renamed Standard to Manual
- Changed some camera settings to make Automatic easier to control
- Changed most default gamepad controls, to fit Automatic playstyle
- Changed a few default keyboard controls
- Added default binds for custom actions 1-3
- Removed forced camera settings in the tutorial (to account for
upcoming tutorial update)
- Also lowered default sound/music volume a little bit
2021-12-29 19:29:36 +01:00
sphere
68547a503b
Merge branch 'botsforexit' into 'next'
...
Don't count bots in playersforexit
See merge request STJr/SRB2!1684
2021-12-29 09:59:54 +00:00
katsy
effcb948ad
Don't count bots in playersforexit
2021-12-29 09:59:54 +00:00
MascaraSnake
95248dc80f
Merge branch 'next' into udmf-thing-types
...
# Conflicts:
# src/p_mobj.c
2021-12-29 09:35:25 +01:00
lachablock
392e782893
Don't modify drawangle when taking damage in strafe mode
2021-12-27 23:35:01 +11: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
MascaraSnake
52c319167f
(Mostly) adapt the Ideya Drone to UDMF
2021-12-21 21:41:00 +01:00
MascaraSnake
2a2d70e7cf
Refactor some onconveyor stuff
2021-12-14 20:29:14 +01:00
lachablock
2794727201
Improve bot handling:
...
- bot ticcmds are generated and sent by the server only
- fix issue where server would not send all ticcmds to clients if bots were in the game
- fix bots still responding to P1's inputs while P1's controls are locked
- fix bot player's directional controls being rotated when controlled by P2
2021-12-12 18:52:27 +11:00
MascaraSnake
c9ed484129
Rewrite each time thinker
2021-12-07 07:17:58 +01:00
Radicalicious
86edb1e4ca
Fix player disappearing when drowning in painstate
2021-12-03 23:20:07 -06: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
sphere
33c43744b4
Merge branch 'what' into 'next'
...
Clean up bouncy fof code + fix bugs (closes #291 )
Closes #291
See merge request STJr/SRB2!1461
2021-12-02 17:29:43 +00:00
Tatsuru
1875c0dc79
Merge branch 'where-the-fuck-is-my-mobj-at' into 'next'
...
Add player mobj check to P_PlayerInPain (resolves #640 )
Closes #640
See merge request STJr/SRB2!1587
2021-09-12 22:06:54 +00:00
Tatsuru
9016b5cf7c
Merge branch 'playercontroldirection' into 'next'
...
Remove camera dependency from P_GetPlayerControlDirection
Closes #183
See merge request STJr/SRB2!1512
2021-09-12 20:27:42 +00:00
Tatsuru
6ed063dcce
Merge branch 'polish-lua-inputs' into 'next'
...
Polish the Lua input library
See merge request STJr/SRB2!1598
2021-09-11 14:59:41 +00:00
LJ Sonic
5340db5f67
Make gc_ constants uppercase
2021-08-15 16:15:28 +02:00
Radicalicious
d50e3bff70
ACTUALLY fix the issue.
2021-07-29 15:55:19 +00:00
Radicalicious
58db5a6904
Fix P_PlayerInPain crash.
2021-07-28 15:42:44 +00:00
lachablock
434b119ccf
Merge remote-tracking branch 'origin/next' into playercontroldirection
2021-07-28 11:55:12 +10:00
CobaltBW
bac4116130
Merge branch 'addplayer' of https://git.do.srb2.org/STJr/SRB2.git into addplayer-2021-7-15
2021-07-15 15:36:44 -07:00
CobaltBW
22f42efb61
Cleaned up leftover comments
2021-07-15 15:09:02 -07:00
Shane Ellis
dad361721f
comment cleanup
2021-06-30 01:32:24 -04:00
CobaltBW
4f04097066
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer
2021-06-29 14:32:46 -07:00
MascaraSnake
5df079c653
Backwards compatibility: Add back bouncy FOF sector type, but mark it as deprecated
2021-06-23 22:21:19 +02:00
MascaraSnake
23efeeed8e
Merge branch 'next' into udmf-fofs-mkii
2021-06-23 19:48:26 +02:00
James R
0f4eb4fab9
Merge conflicts 4d22b9f17
2021-06-07 18:13:56 -07:00
Shane Ellis
18c47afc76
Merge branch 'next' into 'addplayer'
...
# Conflicts:
# src/lua_baselib.c
# src/r_skins.c
2021-06-02 11:47:11 -04:00
sphere
70bcb6081f
Merge branch 'dashmode-lowroad' into 'next'
...
Have Metal Sonic use spinheight while dashing
See merge request STJr/SRB2!1382
2021-06-01 15:00:08 -04:00
sphere
65350e59c9
Merge branch 'rollout-stuff' into 'next'
...
Rollout rock improvements
Closes #445 , #221 , and #532
See merge request STJr/SRB2!1401
2021-05-31 16:12:17 -04:00
Radicalicious
3e91a8b2d4
Revert "Update p_user.c"
...
This reverts commit 92209bf246
2021-05-31 19:23:37 +00:00
Radicalicious
92209bf246
Update p_user.c
2021-05-31 15:09:54 -04:00
sphere
33d0438033
Merge branch 'fuckeggguard' into 'next'
...
Make Armageddon Shield instantly kill Egg Guards (Closes #225 )
Closes #225
See merge request STJr/SRB2!1378
2021-05-31 09:34:14 -04:00
katsy
6286fc8b05
add sliding flag to spinheight conditions
2021-05-26 02:37:46 -04:00
katsy
a1235e144d
allow sliders passage through spin gaps
2021-05-26 01:09:56 -05:00
lachablock
7c11bc8ac5
Remove camera dependency from P_GetPlayerControlDirection
2021-05-21 20:28:50 +10:00
