stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-27 19:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
16139 commits 175 branches 42 tags 316 MiB
Commit graph

1612 commits

Author SHA1 Message Date
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
Radicalicious
ea03ab9db0 Merge remote-tracking branch 'stjr/next' into expose-thrust-funcs-to-lua 2021-12-03 21:58:28 -06:00
Radicalicious
cbb8269dec Merge remote-tracking branch 'stjr/next' into thokking-hell 2021-12-03 21:46:58 -06:00
SMS Alfredo
a1e59adedb The thing 2021-12-03 14:41:08 -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
Jaime Ita Passos
2aa9bb59ef Memory management fixes 
Date:      Mon Aug 9 15:57:07 2021 -0300
 2021-08-09 15:57:35 -03: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
Radicalicious
4129140b4a Update p_user.c 2021-06-20 21:01:40 -04:00
Radicalicious
bde1b08cbe Update p_user.c 2021-06-18 02:50:08 -04:00
Radicalicious
87bcdb8643 Update p_user.c 2021-06-18 00:57:33 -04: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
Radicalicious
1a5f0d94f3 Expose P_ThrustEvenIn2D and P_VectorInstaThrust 2021-05-01 14:05:01 -04: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
Sally Coolatta
3dd04b90c6 Fix jet fume crash when dashmode is above DASHMODE_MAX 
I would like to use higher dashmode values for extra leniency, the jet fume kicks and screams when this happens.
 2021-04-05 16:59:02 -04:00
lachablock
000e865f80 Revise spinheight/gap entry conditions (again), let's keep things WAY simpler: 
- PF_NOJUMPDAMAGE no longer affects height at all (you're welcome katsy).
- Characters with SF_NOJUMPSPIN will only use spinheight when panim is PA_ROLL. They cannot enter gaps when jumping with spinheight, unless also spinning or gliding.
- All other characters use spinheight when panim is PA_JUMP or PA_ROLL. They can enter gaps when jumping with spinheight.
 2021-03-25 21:42:25 +11:00
lachablock
6ea9653681 Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks 2021-03-25 21:41:09 +11:00
lachablock
f99d89742a Revise conditions under which players use spinheight and enter gaps: 
- players with SF_NOJUMPDAMAGE but *not* SF_NOJUMPSPIN now always use spinheight while jumping (i.e. even with PF_NOJUMPDAMAGE), as long as their panim is PA_JUMP or PA_ROLL
- players with SF_NOJUMPSPIN no longer use spinheight while jumping (but,)
- PA_ROLL is now an acceptable condition for using spinheight (but not for entering gaps, e.g. S3K shields will shrink the hitbox but not allow gap entry on their own)
- flying players now only use spinheight if they do not have SF_NOJUMPSPIN (you're welcome, EggpackRE)
- players with neither SF_NOJUMPSPIN nor SF_NOJUMPDAMAGE use the same conditions as in 2.2.9 prerelease, i.e. use spinheight and can enter gaps unless they have PF_NOJUMPDAMAGE
 2021-03-25 15:57:35 +11:00
lachablock
0405b3922c Do not let nonspin characters enter sectors they could not enter if standing at full height 2021-03-23 15:09:04 +11:00
lachablock
5ed5984cc5 Make more player abilities and all shieldabilities remove PF_SPINNING on use 2021-03-23 15:03:12 +11:00
lachablock
04c0217774 Revert "Remove PF_SPINNING upon use of any jump ability, so that directionchar works properly" 
This reverts commit 4f18f6d3cf.
 2021-03-23 14:50:05 +11:00
lachablock
4f18f6d3cf Remove PF_SPINNING upon use of any jump ability, so that directionchar works properly 2021-03-18 14:48:15 +11:00
Lachlan Wright
fc1bc94d9a Merge branch 'fix-flipped-bounce' into 'next' 
Fix CA_BOUNCE height when flipped (Fixes #428)

Closes #428

See merge request STJr/SRB2!1373
 2021-03-01 17:49:54 -05:00
Lachlan Wright
49c68d279d Merge branch 'marathon-pause-fix' into 'next' 
Disable pausing during score screens in marathon mode

See merge request STJr/SRB2!1416
 2021-03-01 16:51:28 -05:00
Lachlan Wright
77feee73c3 Revert "Merge branch 'player-speed' into 'next'" 
This reverts merge request !1309
 2021-02-27 03:38:13 +00:00
Riku Salminen
8bcc71c629 Disable pausing during score screens in marathon mode 2021-02-26 15:43:53 +02:00
lachwright
cf389179e8 Rollout rock improvements: 
- No longer struggles to start to accelerating at certain angles
- Carrying a player onto a rollout rock no longer leaves them in their ride state
- Changed dispoffset might alleviate some sorting issues
- Changes the player's camera angle when sprung horizontally
- Works better in reverse gravity
 2021-02-15 01:11:03 +11:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
James R
5b287f9cce Merge branch 'fix-doublejump-divby0' into 'next' 
Fix a divby0 when you have specific character stats.

See merge request STJr/SRB2!1374
 2021-01-31 01:17:41 -05:00
LJ Sonic
83947d4428 Merge branch 'redundant-hypot' into 'next' 
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
 2021-01-25 18:08:25 -05:00
Shane Ellis
ca00e2d508 correction to nights bot clause 2021-01-24 12:46:03 -05:00
Shane Ellis
2e528216ac Updated references to player->bot 2021-01-23 10:15:33 -05:00
Shane Ellis
6103d7a51e Update p_user.c 2021-01-15 17:41:16 -05:00
Shane Ellis
759ff44dfd Revert "Add conditions for new player bot type" 
This reverts commit b995e3cb75
 2021-01-15 22:32:02 +00:00
Shane Ellis
b995e3cb75 Add conditions for new player bot type 2021-01-15 16:48:19 -05:00
Zippy_Zolton
216f227539 12 2021-01-13 12:03:02 -06:00
lachwright
a117ec9859 oops that doesn't work in reverse gravity 2021-01-14 04:34:43 +11:00
lachwright
149535634e Keep Metal's jet fume at a consistent height during dashmode 2021-01-14 04:24:48 +11:00
lachwright
d2be3110bd Have Metal Sonic use spinheight while dashing 2021-01-13 22:28:38 +11:00
Zippy_Zolton
129ac4633c Increased launch height 2021-01-11 13:25:42 -06:00
Zippy_Zolton
1917155adf PF_THOKKED 2021-01-11 00:19:56 -06:00
Zippy_Zolton
058b681660 P_SetObjectMomz 2021-01-10 22:01:41 -06:00
Zippy_Zolton
8e9073f11f CR_PTERABYTE tweaks 2021-01-10 21:55:25 -06:00
Zippy_Zolton
8aac7454b8 Make Armageddon Shield instantly kill Egg Guards 2021-01-10 17:20:07 -06:00
GoldenTails
59bc197f32 Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT. 2021-01-10 10:01:31 -06:00
Zwip-Zwap Zapony
679bf5f999 Fix CA_BOUNCE when flipped 
Fix P_DoAbilityBounce() always using "max",
instead of "min" while upside-down and "max" while not
 2021-01-08 16:25:10 +01:00
katsy
54d79415d5 add carry type to fans 2020-12-31 02:21:14 -06:00
GoldenTails
50d46e1fa6 Set the target of a spawned ghost to where it came from. 2020-12-27 00:21:09 -06:00
James R
84e9020eed Merge branch 'shieldless' into 'next' 
Add new skin flag SF_NOSHIELDABILITY

See merge request STJr/SRB2!1331
 2020-12-15 21:00:53 -05:00
James R
14c6d93c0c Merge branch 'team-elementalfire' into 'next' 
Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312
 2020-12-15 20:47:45 -05:00
katsy
721170f5a0 lol 2020-12-14 05:32:51 -06:00
katsy
da7cdd92ff Merge remote-tracking branch 'stjr/next' into dashaction 2020-12-14 05:10:01 -06:00
katsy
4521827e2c you too 2020-12-14 04:06:28 -05:00
katsy
2bebaf12d0 add checks for new flag, make emergency jump call shieldspecial 2020-12-14 04:03:14 -05:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
9649a9fbae Merge branch 'player-speed' into 'next' 
Make player->speed and other things use R_PointToDist2

See merge request STJr/SRB2!1309
 2020-12-12 17:38:02 -05:00
James R
7b6675178e Merge branch 'oldguards' into 'next' 
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
 2020-12-12 17:34:04 -05:00
James R
c8cc9c7a6f Remove trailing whitespace 2020-12-12 02:40:46 -08:00
James R
e55d842d7f Kill SEENAMES 2020-12-12 02:11:23 -08:00
Zippy_Zolton
f2095b57fd Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
katsy
f79ded7c0b scale minimum dashmode thok on actionspd, not normalspeed 2020-12-10 20:52:06 -05:00
Zippy_Zolton
317c107064 Make player->speed use R_PointToDist2 2020-12-10 16:09:43 -06:00
James R
5a0d3981f1 Merge branch 'super-giverings' into 'next' 
Make P_DoSuperTransformation (with giverings) only set 50 rings if you have less than 50

See merge request STJr/SRB2!1278
 2020-12-10 15:27:01 -05:00
James R
ef6f69ee22 Merge branch 'CR_BRUH' into 'next' 
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game

See merge request STJr/SRB2!1274
 2020-12-10 15:20:11 -05:00
James R
ee48fa2de3 Merge branch 'mario1up' into 'next' 
Fix normal one-up sound playing in Mario mode

See merge request STJr/SRB2!1272
 2020-12-10 15:15:08 -05:00
James R
9a77cf6306 Merge branch 'lastlineshit' into 'next' 
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability

See merge request STJr/SRB2!1271
 2020-12-10 15:14:16 -05:00
James R
857113b60e Merge branch 'crunchyroll' into 'next' 
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice

See merge request STJr/SRB2!1267
 2020-12-10 15:07:01 -05:00
James R
c841750868 Merge branch 'no-spin-jump' into 'next' 
Fix a Few Spin Related Bugs (Closes #286 and #360)

Closes #286 and #360

See merge request STJr/SRB2!1256
 2020-12-10 15:02:29 -05:00
katsy
ffd20ee753 Revert "ensure the new flag is cleared properly" 
This reverts commit 3dbb44e7b1
 2020-12-06 07:44:49 +00:00
katsy
3dbb44e7b1 ensure the new flag is cleared properly 2020-12-05 23:17:01 -05:00
Nev3r
30ab512c3c Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 
# Conflicts:
#	src/dehacked.c
 2020-12-01 18:56:42 +01:00
Zippy_Zolton
69248cc684 thanks zap 2020-11-30 16:39:24 -06:00
Zippy_Zolton
20d1811983 oops 2020-11-30 12:05:45 -06:00
Zippy_Zolton
da1a3029a9 overhaul 2020-11-30 12:04:35 -06:00
Zippy_Zolton
412f3fc42b P_GivePlayerRings 2020-11-29 17:39:54 -06:00
Zippy_Zolton
f913d60a9f Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it 2020-11-29 17:16:57 -06:00
SMS Alfredo
95dfb93a11 Allow non-player objects to apply the CR_PLAYER carry type without crashing the game 2020-11-28 22:03:02 -06:00
Zippy_Zolton
db6b0c6aa0 Fix normal one-up sound playing in Mario mode 2020-11-25 21:46:45 -06:00
SMS Alfredo
5c71fe0710 Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability 2020-11-25 14:31:24 -06:00
lachwright
87968c946b Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice 2020-11-24 14:56:22 +11:00
SMS Alfredo
fe066b3ef2 ...snickerdoodles 2020-11-23 09:23:02 -06:00
SMS Alfredo
ea7e06a616 Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE 2020-11-23 09:21:00 -06:00
SMS Alfredo
7b05ffd92d Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING" 
This reverts commit ad9bf6085f.
 2020-11-23 09:18:05 -06:00
SMS Alfredo
7bbd563b73 Remove unneeded S_PLAY_ROLL check 2020-11-22 23:23:35 -06:00
James R
30792e7820 Merge branch 'flame-orb' into 'next' 
Flame Shield & Thunder Shield Adjustment (Closes #363)

Closes #363

See merge request STJr/SRB2!1220
 2020-11-22 17:31:23 -05:00
Jaime Ita Passos
5e890ee6f8 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
SMS Alfredo
01a03a4daa lmao formatting 2020-11-18 12:03:48 -06:00
SMS Alfredo
09644d69c0 Don't force S_PLAY_SPIN when landing with PF_SPINNING if you have certain PA flags 2020-11-18 12:01:06 -06:00
SMS Alfredo
ad9bf6085f Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING 2020-11-18 11:28:31 -06:00
SMS Alfredo
fb40a28365 Do deh thing 2020-11-17 11:47:33 -06:00
Nev3r
70512f11ff Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray 
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
 2020-11-13 13:23:14 +01:00
Nev3r
7dd83285b8 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 2020-11-12 14:30:24 +01:00
Nev3r
fb9432ae57 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 2020-11-10 11:46:53 +01:00
James R
33cfd2c72a Merge branch 'mobjghost-rollangle' into 'next' 
Ghost mobj matches rollangle (Closes #362)

Closes #362

See merge request STJr/SRB2!1211
 2020-11-01 22:49:50 -05:00
Zippy_Zolton
6c00a96755 thunder shield :D 2020-10-29 12:32:42 -05:00
Zippy_Zolton
4e56caa196 Flame Shield Changes 2020-10-28 01:23:05 -05:00
Nev3r
3d2d44bfff Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 
# Conflicts:
#	src/p_user.c
 2020-10-27 22:23:30 +01:00
Nev3r
ad9e3411a1 Rename bustable type BT_SPIN to BT_SPINBUST to avoid conflicts with next. 2020-10-27 22:13:10 +01:00
Nev3r
c62ef355ef Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
 2020-10-27 20:48:25 +01:00
Zippy_Zolton
5d4032fd00 Ghost mobj matches rollangle 2020-10-24 12:38:30 -05:00
Zippy_Zolton
c0571b5fbf g 2020-10-23 01:09:12 -05:00
Zippy_Zolton
a4459b6693 Dash state for Tails overlay 2020-10-23 00:47:47 -05:00
James R
7f65023891 Merge branch 'bustflags' into 'next' 
Bustable Wall and Floor flags.

See merge request STJr/SRB2!1163
 2020-10-18 16:42:15 -04:00
lachwright
6a73e81227 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
Jaime Passos
cc97e22e2f Changes to sprite rendering: 
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
 2020-10-12 00:13:22 -03:00
James R
15008f31a7 Merge branch 'sanity-meter-empty' into 'next' 
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
 2020-10-08 22:02:25 -04:00
James R
dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Snu
afcadb3232 Remove all instances of PF_CANBUSTFLOORS 2020-09-29 20:16:06 +01:00
Snu
cd4f755e53 Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively. 2020-09-29 13:52:35 +01:00
Snu
75042d781f Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls. 2020-09-29 13:47:48 +01:00
Snu
90fbb752fa Add functionality to PF_CANBREAKFLOORS 2020-09-29 12:58:36 +01:00
Snu
d07422bda1 Change breaking walls requirement from CA_GLIDEANDCLIMB to SF_CANBREAKWALLS. 2020-09-29 10:32:45 +01:00
lachwright
2bb5b42960 Allow JumpSpin abilities to be used with non-ability shields 2020-09-16 16:50:10 +09:30
Bartu İnce
7e9bc0d103 no message 2020-09-08 03:03:48 +03:00
Nev3r
b15c760dc2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 2020-08-15 13:44:59 +02:00
James R
3e8cf5ab06 Merge branch 'bt_spin' into 'next' 
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
 2020-08-09 21:03:17 -04:00
Nev3r
586dc0b631 Merge branch 'next' into udmf-fofs-mkii 2020-07-30 12:39:25 +02:00
Nev3r
c65ada7dd7 Merge branch 'next' into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
 2020-07-29 13:55:14 +02:00
James R
c944d3adf4 Merge branch 'fix-nights-fullbright' into 'next' 
NiGHTS fullbright fixes

See merge request STJr/SRB2!1080
 2020-07-22 22:15:07 -04:00
lachwright
242e128aa0 Fix Super Sonic exploiting CA_FLOAT abilities 2020-07-21 03:50:26 +08:00
lachwright
cea3f64c88 Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
Nev3r
d1db5ebf56 Merge branch 'udmf-next' into udmf-fofs-mkii 2020-07-13 09:34:32 +02:00
James R
42b0ab1851 Merge branch 'p-xymovement-lua-exposure' into 'next' 
Expose several movement-related functions to Lua.

See merge request STJr/SRB2!884
 2020-07-12 19:11:47 -04:00
James R
b9a24001d8 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
GoldenTails
ada06910dc Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails
1f1589384a Replace PF_USEDOWN with PF_SPINDOWN 2020-07-11 21:59:54 -05:00
GoldenTails
465ad1a7bc Replace all occurances of BT_USE with BT_SPIN (2.3?) 
I'd use `next-major` but it doesn't exist lol
 2020-07-11 21:59:54 -05:00
Nev3r
4013c0e0a1 Merge branch 'udmf-next' into udmf-multitag 2020-07-11 08:47:58 +02:00
Nev3r
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
Snu
be8f0853ef Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul 
Updated to 2.2.5
 2020-07-10 17:08:53 +01:00
Snu
d392c59935 Changed Bubble Shield functionality 2020-07-10 05:59:10 +01:00
Jaime Passos
5c5d907251 gr_ -> gl_ 2020-07-06 01:15:08 -03:00
LJ Sonic
9c1bee694b Merge branch 'knuxtweaks' into 'next' 
Knuckles tweaks

See merge request STJr/SRB2!1030
 2020-07-04 16:37:35 -04:00
LJ Sonic
6c61baa818 Merge branch 'fix-oldbrak-missiles2' into 'next' 
Take 2: Fix Old Brak missiles + add pw_ignorelatch

See merge request STJr/SRB2!1006
 2020-07-04 16:28:48 -04:00
lachwright
17daf2faa2 Reduce speed cut when gliding underwater 2020-07-04 19:17:38 +08:00
lachwright
527e682931 Add sightcheck boolean to P_RadiusAttack 
Also now destroys Egg Guard shields, and circumstantially Minuses
 2020-07-04 18:27:06 +08:00
Lachlan
e2bdb56f97 Merge remote-tracking branch 'origin/next' into more-platform-fixes 2020-07-04 05:25:38 +08:00
Lachlan
e44d93f76b Fix skiddust positional scaling 2020-07-04 04:30:57 +08:00
Lachlan
84000a0add P_Earthquake: Use P_RadiusAttack in favor of thinker iteration 2020-07-04 04:00:28 +08:00
Lachlan
7e72009a87 Fix buildbot warning 2020-07-04 03:21:48 +08:00
lachwright
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
lachwright
3ebc17ac3a Merge branch 'next' into knuxtweaks 2020-07-02 13:08:04 +08:00
James R
067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
kaysrishaq
682791a024 brak missile fix, pw_ignorelatch, small Recycler fix 2020-06-18 17:09:29 -04:00
lachwright
e403de7459 Merge branch 'next' into more-platform-fixes 2020-06-17 01:53:19 +08:00
lachwright
29738fcdd0 Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain 2020-06-17 01:46:36 +08:00
lachwright
38e2c999c5 Platform fixes 2020-06-14 12:17:30 +08:00
MascaraSnake
9dbfa28dbc Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_linedefs.cfg
#	src/p_setup.c
 2020-06-09 09:50:02 +02:00
Steel Titanium
62d73968e2 Merge branch 'next' into sal-oglshaderport 2020-06-08 19:36:23 -04:00
Lachlan Wright
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
Lachlan Wright
614a98bd9d Merge branch 'dashmode-fixes' into 'next' 
Dashmode fixes

See merge request STJr/SRB2!909
 2020-06-08 05:25:30 -04:00
Hannu Hanhi
da98ea242e Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
Louis-Antoine
9be188ff02 Minor edit 2020-06-02 10:31:56 +02:00
LJ Sonic
e2b860dc28 Merge branch 'next' into 'fix-spawn-desynch' 
# Conflicts:
#   src/p_map.c
 2020-06-01 08:15:02 -04:00
MascaraSnake
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
lachwright
b874da5229 Ensure followmobj ghost exists before applying fuse 2020-05-30 18:26:11 +08:00
lachwright
51b640ad5a Feedback so far indicates the old booster effect is preferred 2020-05-30 18:21:39 +08:00
lachwright
ae5d5b9546 Merge branch 'next' into dashmode-fixes 2020-05-30 18:13:21 +08:00
Louis-Antoine
67eef5a37f Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
SwitchKaze
b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
MascaraSnake
ff37975892 Merge branch 'next' into movement-refactor 
# Conflicts:
#	src/p_map.c
 2020-05-19 09:50:23 +02:00
MascaraSnake
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
Louis-Antoine
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
Louis-Antoine
a06c4a8c98 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
MascaraSnake
9cd9d2e0d7 Merge branch 'carry-dust-devil' into 'next' 
Add carry types to Dust devils

See merge request STJr/SRB2!886
 2020-05-15 02:50:29 -04:00
ZipperQR
6a9543b1c2 no message 2020-05-14 03:35:46 +03:00
MascaraSnake
02c2aeb46a Merge branch 'udmf-next' into udmf-fofs-mkii 2020-05-13 16:23:36 +02:00
MascaraSnake
36843cbfd6 Merge branch 'next' into waypoints 2020-05-12 23:51:32 +02:00
MascaraSnake
d708789c3a Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly 2020-05-12 23:50:30 +02:00
Louis-Antoine
0c4f983eb5 Fix crash with rollout rock 2020-05-11 23:48:35 +02:00
James R
7257fc730a Remove instances of HAVE_BLUA that actually disable Lua now 2020-05-10 19:59:56 -07:00
lachwright
215ff828f8 Merge branch 'master' into next 2020-05-11 01:29:10 +08:00
Jaime Passos
39c5ab4e17 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
Lachlan
426925c5fc Play the 1-up sound when 1upsound is set to sound 2020-05-08 04:07:00 +08:00
Zipper
87f7100d2e Update p_user.c 2020-05-06 09:30:15 -04:00
MascaraSnake
1aafc2f463 Replace "bouncy FOF" sector type with "make FOF bouncy" linedef type 2020-05-03 12:44:30 +02:00
MascaraSnake
c68fea3d06 Merge branch 'movement-refactor' into udmf-fofs-mkii 2020-05-03 10:03:18 +02:00
MascaraSnake
d0d25025e1 Refactor P_CheckBouncySectors 2020-05-03 10:01:58 +02:00
Steel Titanium
887c25e047 Remove inline keyword from P_DoTwinSpin function 
The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error
 2020-05-02 17:39:55 -04:00
MascaraSnake
25219b614e Implement "Make FOF quicksand" linedef type 2020-05-02 22:07:42 +02:00
MascaraSnake
1f041496c7 Store bustable FOF data directly in ffloor_t instead of referring to master line 2020-05-02 21:19:55 +02:00
MascaraSnake
245d5be047 Merge branch 'movement-refactor' into udmf-fofs-mkii 
# Conflicts:
#	src/p_mobj.c
#	src/p_user.c
 2020-05-02 19:05:48 +02:00
MascaraSnake
d9ed914e14 Merge branch 'amyswings' into 'next' 
Restore jump-related pflags properly during twinspin

See merge request STJr/SRB2!908
 2020-05-02 10:03:49 -04:00
MascaraSnake
452fd100b8 Refactor P_CheckBustableBlocks 2020-05-02 15:50:18 +02:00
MascaraSnake
4dd25721f6 Merge branch 'movement-refactor' into udmf-fofs-mkii 2020-05-02 14:29:10 +02:00
MascaraSnake
485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
Zipper
dd645d88ea Update p_user.c 2020-05-01 08:25:37 -04:00
lachwright
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
lachwright
f9b831c00b Restore jump-related pflags properly during twinspin 2020-05-01 06:34:30 +08:00
MascaraSnake
e00531ed9c Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
#	src/p_spec.h
 2020-04-26 11:13:09 +02:00
Nev3r
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
James R
fe9b933b97 Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Monster Iestyn
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
Zipper
657ee8287e Update p_user.c 2020-04-22 07:59:08 -04:00
ZipperQR
64edd91dbd Dust devil support 2020-04-22 00:59:12 +03:00
Nev3r
5c605a8a39 Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
James R
abb338d650 Merge branch 'continue_tweaks' into 'next' 
A tangible mechanism to disable Continues

See merge request STJr/SRB2!865
 2020-04-18 20:15:04 -04:00
MascaraSnake
1d3aa7129a Add enums for textmap FOF values 2020-04-18 18:02:43 +02:00
MascaraSnake
8e5effa07b Merge branch 'udmf-argenums' into udmf-fofs-mkii 2020-04-18 17:23:02 +02:00
MascaraSnake
fd598f315e Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
Nev3r
b5eaad42fc Carry over a considerable case regarding accessing the old tag vars. 2020-04-17 18:15:25 +02:00
Nev3r
61c3e12d63 Make a commented out debug code account for taglists. 2020-04-17 10:41:26 +02:00
Nev3r
439fde3434 Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result. 2020-04-14 23:59:22 +02:00
MascaraSnake
5389344a32 Implement FOF type 257 2020-04-14 11:56:11 +02:00
MascaraSnake
e3b86d0c74 Implement FOF types 252-256 2020-04-14 11:45:37 +02:00
James R
b8d40a5783 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
James R
aad225932d Merge branch 'SF_NONIGHTSSUPER' into 'next' 
Skin flag for disabling super colors in NiGHTS

See merge request STJr/SRB2!782
 2020-04-09 19:47:20 -04:00
James R
673a842043 Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER 2020-04-09 16:47:52 -07:00
James R
1edc300d0c Merge branch 'lua-hook-cleanup' into 'next' 
Lua hook cleanup

See merge request STJr/SRB2!851
 2020-04-09 19:40:09 -04:00
toaster
da86c17ee1 Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally. 
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
 2020-03-26 20:16:44 +00:00
Monster Iestyn
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
Louis-Antoine
6f9422d380 Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
Louis-Antoine
892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Louis-Antoine
e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Louis-Antoine
c1b50397ce Fix compiler warning 2020-03-19 14:40:35 +01:00
fickleheart
05b2570ae7 Merge remote-tracking branch 'upstream/next' into lua-music 2020-03-18 22:43:07 -05:00
fickleheart
dd0d86120b > building SRB2 without Lua in 2020 2020-03-18 22:38:18 -05:00
fickleheart
e0badd1e5b Rename hook to ShouldJingleContinue 2020-03-18 22:35:21 -05:00
SteelT
bd058ecc4b Merge branch 'viewpointswitch-fix' into 'next' 
Fix incorrect newdisplayplayer in forced ViewpointSwitch

See merge request STJr/SRB2!814
 2020-03-18 15:34:18 -04:00
fickleheart
b9d7b3e5c5 Merge remote-tracking branch 'upstream/master' into shaders-222 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
#	src/i_video.h
#	src/r_main.c
#	src/r_main.h
#	src/screen.c
#	src/sdl/i_video.c
#	src/sdl/ogl_sdl.c
#	src/w_wad.c
 2020-03-14 12:52:15 -05:00
Monster Iestyn
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
Tatsuru
be338da3f6 I guess 2020-03-08 14:06:18 -03:00
SwitchKaze
21b28b6295 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-29 23:41:16 -05:00
Jaime Passos
7d77600e71 Make exitmove friendly, don't start empty intermission screens 2020-02-29 01:51:45 -03:00
Jaime Passos
4e7b47440f G_CoopGametype, for all the GT_COOP cases 2020-02-29 00:57:22 -03:00
Jaime Passos
fd062308fe Score adding and stealing should check the gametype's rules. 2020-02-28 23:41:10 -03:00
fickleheart
f2c968dea8 Add JingleStatus hook for carrying custom jingle tunes 
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
 2020-02-23 17:20:44 -06:00
Jaime Passos
b103a792c0 Let spectators decide where they spawn 
Also fixes some issues with tag gametypes
 2020-02-23 19:23:00 -03:00
fickleheart
40488096c0 Make P_PlayLivesJingle player optional in Lua 2020-02-23 15:40:59 -06:00
Jaime Passos
678935f26a Turn players IT if they join the game after the hide time in tag gametypes 
Except in gametypes with hide time stasis, because they can't change team.
 2020-02-23 17:02:50 -03:00
SwitchKaze
6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
Jaime Passos
0362f53e9b Fix incorrect newdisplayplayer in forced ViewpointSwitch 2020-02-23 12:14:52 -03:00
lachwright
4517377552 Start CA_GLIDEANDCLIMB swimming functionality 2020-02-23 15:38:11 +08:00
Tatsuru
ff8a62819b Oopsie 2 2020-02-22 22:36:44 -03:00
Tatsuru
4c00e33096 Oopsie 2020-02-22 21:14:05 -03:00
James Hale
56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
lachwright
365e63894f Merge branch 'next' into knuxtweaks 2020-02-21 16:28:17 +08:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
3022e38d15 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
 2020-02-19 17:46:18 -03:00
Tatsuru
80edefa56e Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
James R
92f65fd822 Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
James R
3fc9c7d298 Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER 2020-02-18 18:23:20 -08:00
Tatsuru
4a8de7cb55 Enough 2020-02-18 22:55:40 -03:00
Tatsuru
ec67e776dc Standards 2 2020-02-18 22:50:22 -03:00
Jaime Passos
00bdb41640 Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-17 12:28:16 -03:00
fickleheart
c4b390bc76 Merge remote-tracking branch 'upstream/master' into viewroll 2020-02-16 21:32:57 -06:00
James R
64b7a5e4d6 SF_NONIGHTSSUPER for disabling super colors in NiGHTS 2020-02-12 18:03:39 -08:00
fickleheart
a63e9fe002 Improvements to polyobjects carrying things: 
- Fixed loss of precision in rotate carry causing objects to slide off
- Adjusted player carrying logic to make platforms less slippery
- Finally obsoleted the player-specific rotate hack now that I found the
  actual problem :]
 2020-02-10 00:07:25 -06:00
lachwright
305559b3f4 Move climbing checks to a separate function 2020-02-02 23:07:45 +08:00
James R
52c1e73035 Merge branch 'platform-fixes' into 'next' 
Reset pmomz after applying it to momz

See merge request STJr/SRB2!747
 2020-02-01 21:41:49 -05:00
Jaime Passos
68f4d415fe Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00
lachwright
af7366058d Merge branch 'next' into knuxtweaks 2020-02-01 18:00:55 +08:00
lachwright
d2bfc673a9 Distance orbital camera appropriately when gr_shearing is enabled 2020-02-01 17:01:27 +08:00
lachwright
f5e49ace00 Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior 2020-02-01 14:49:48 +08:00
lachwright
ec02a90ebc Make flight controls less bullshit 2020-02-01 14:29:49 +08:00