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
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
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
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
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
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
Radicalicious
86edb1e4ca
Fix player disappearing when drowning in painstate
2021-12-03 23:20:07 -06: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
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
Steel Titanium
a2667f4dc9
Merge branch 'master' into next
2021-05-11 20:08:44 -04:00
sphere
d915da6509
Merge branch 'dashaction' into 'next'
...
Scale minimum dashmode thok speed on actionspd, not normalspeed
See merge request STJr/SRB2!1311
2021-05-10 08:45:26 -04:00
Lach
5cab285b2c
Merge branch 'make-ghosts-target-origin' into 'next'
...
Set the target of a spawned ghost to where it came from.
Closes #517
See merge request STJr/SRB2!1358
2021-05-10 08:40:41 -04:00
lachablock
d2db204058
Fix rollout rock controls in 2D mode
2021-05-08 18:34:32 +10:00
lachablock
755cf6e952
Merge remote-tracking branch 'origin/next' into rollout-stuff
2021-05-08 13:03:18 +10:00
lachablock
3880263f1f
Add machine dashmode as a condition for gap passage.
...
(Also remove the sprite2 check, we don't need to be that stingy since PlayerHeight hooks allow greater control over that now!)
2021-05-08 12:27:29 +10:00
lachablock
47f465ccea
Merge remote-tracking branch 'origin/next' into dashmode-lowroad
2021-05-08 12:16:46 +10:00
LJ Sonic
d325c7e6d3
The year is 2021
2021-05-07 17:45:56 +02:00
katsy
d35a1811d6
clean up bouncy fof code
2021-04-16 04:49:33 -05:00
Lach
c99e53d735
Merge branch 'dashmode-crash' into 'next'
...
Fix jet fume crash when dashmode is above DASHMODE_MAX
See merge request STJr/SRB2!1450
2021-04-05 21:30:16 -04:00
