Alam Ed Arias
709489cab8
Merge branch 'master' into next
2020-01-16 12:08:36 -05:00
lachwright
28c466a0a5
Reset pmomz after transfer to momz
2020-01-16 22:56:01 +08:00
James R
55cc978f40
Merge branch 'extra-life-jingle' into 'master'
...
Optionally use a sound for 1-Up
See merge request STJr/SRB2!668
2020-01-15 23:38:21 -05:00
James R
1489b4bcdd
It's FALLTHRU not fallthru
...
It took a week and me staying up until 2AM to look at the damn manpage and
figure out THIS is why I was getting an error about 'if (tutorialmode)' falling
through. But I still don't know why it didn't trigger on the MT_TNTBARREL case.
Oh well.
2020-01-15 02:14:20 -08:00
fickleheart
c25e969676
wip viewroll stuff
2020-01-14 23:29:56 -06:00
Tatsuru
0fa638eaf5
Logistical problems
2020-01-13 19:12:02 -03:00
James R
34b42507d1
Merge branch 'targetproblem' into 'next'
...
Homing Targetting Issues
See merge request STJr/SRB2!671
2020-01-12 15:43:08 -05:00
Tatsuru
4221f08a7c
toaster guidance
2020-01-11 21:35:19 -03:00
Tatsuru
5d33ca42cf
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
Monster Iestyn
c7ab065b0a
Merge branch 'master' into next
2020-01-11 18:38:09 +00:00
toaster
926cbc4141
Make P_HomingAttack and P_LookForEnemies consistent, preventing targeting TNT barrels just launching you in place.
2020-01-11 14:41:37 +00:00
James R
e1303a2b5c
Merge branch 'orbital-flickering' into 'master'
...
Don't give player translucency when looking down with the orbital camera
See merge request STJr/SRB2!659
2020-01-10 16:02:44 -05:00
James R
a16c444166
Merge branch 'playerthink-hook' into 'next'
...
PlayerThink Hook
See merge request STJr/SRB2!557
2020-01-10 15:58:30 -05:00
James R
1113a13621
1upsound always plays a sound instead of jingle
2020-01-10 12:55:03 -08:00
James R
2459ca255f
Factor z distance into camera translucency
2020-01-10 00:04:17 -08:00
Alam Ed Arias
71c2ee3850
whitespace cleanup
2020-01-09 16:19:12 -05:00
James R
0f8c736188
Don't make player transparent if the orbital camera is looking straight down
2020-01-08 20:49:38 -08:00
Zachary McAlpin
11d21dd950
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2020-01-08 18:52:56 -06:00
fickleheart
f8a3e3b898
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
James R
69dd8acf7f
Merge branch 'sstailscarry-fix' into 'next'
...
Fix MP Special Stages crashing if a player is being carried when it ends
See merge request STJr/SRB2!615
2020-01-01 21:49:01 -05:00
Zachary McAlpin
dc51ba6b64
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2020-01-01 17:11:19 -06:00
James R
48c83be89e
Merge branch 'respawndelaygametyperule' into 'next'
...
Gametype ruleset changes
See merge request STJr/SRB2!585
2020-01-01 17:49:53 -05:00
Zachary McAlpin
7123abd493
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2020-01-01 13:31:07 -06:00
Tatsuru
caf47019ce
Or is it better like this?
2019-12-31 20:20:30 -03:00
Tatsuru
83467a7b3d
The dumbass forgot NiGHTS mode is also a carry power
2019-12-31 20:13:16 -03:00
Tatsuru
6e330348bc
Fix MP Special Stages crashing if a player is being carried when it ends
2019-12-31 19:38:11 -03:00
James R
f77188ef0f
Merge branch 'metal-fume-opacity' into 'next'
...
Make Metal Sonic's jet fume opaque when re-emerging from water
See merge request STJr/SRB2!612
2019-12-31 17:16:14 -05:00
fickleheart
b22de48c03
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart
8bc58807aa
Software FOV ported from kart
...
also fixes high software FOVs having buggy walls
2019-12-31 11:22:05 -06:00
lachwright
e5e96cb271
Make elemental crop circle flames obey player gravity
2019-12-31 18:06:40 +08:00
lachwright
10b71d40b8
Make Metal Sonic's jet fume opaque when re-emerging from water
2019-12-31 17:26:35 +08:00
James R
8e61b1003a
Merge branch 'dashspeed-fix' into 'next'
...
Cap dashspeed between mindash and maxdash before revving.
See merge request STJr/SRB2!565
2019-12-31 01:31:43 -05:00
fickleheart
85e2e92ee0
Fix spying on simple mode players having dumb camera angles
2019-12-30 15:44:52 -06:00
fickleheart
a51f2500e0
Update playstyle menu handling to use analog/directionchar combo
2019-12-30 15:15:37 -06:00
fickleheart
c3d14064e2
Convert simple movement to directionchar+analog
...
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
2019-12-30 15:05:24 -06:00
fickleheart
e0f35d207f
Convert analog/directionchar cvars into 2-long arrays
2019-12-30 14:01:14 -06:00
fickleheart
085c39128f
Save separate camera settings for standard/simple modes
2019-12-30 12:10:38 -06:00
fickleheart
7fa9eed573
Fix camera reset snap in simple controls
2019-12-30 11:22:54 -06:00
fickleheart
a9b80bf1f0
Merge branch 'master' into newcontrols
...
# Conflicts:
# src/d_netcmd.c
# src/g_game.c
# src/g_game.h
# src/m_menu.c
2019-12-30 10:47:09 -06:00
Zachary McAlpin
745cced08e
Execute LUAh_PlayerThink(player) at the end if the player has a valid mobj_t object
2019-12-28 17:40:47 -06:00
Zachary McAlpin
5a9b80b5d5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2019-12-28 17:32:27 -06:00
GoldenTails
f62579811b
Fixed messed up comparison.
2019-12-27 23:51:13 -06:00
Jaime Passos
3b341245f1
Same deal, but for starposts.
2019-12-27 17:14:56 -03:00
Jaime Passos
1f96f70173
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 17:08:20 -03:00
Jaime Passos
f0d58368f9
look for GTR_LIVES rule instead of coop/competition gametype
2019-12-27 12:29:21 -03:00
Jaime Passos
f8eed7171a
add G_CompetitionGametype(void)
2019-12-27 12:28:00 -03:00
Jaime Passos
1d0d404922
check if the gametype allows spectators to allow jump key respawn
2019-12-27 12:17:38 -03:00
Jaime Passos
51404130af
Respawn delay gametype rule
2019-12-27 01:44:27 -03:00
James R
1dac3d174e
Merge remote-tracking branch 'origin/master' into next
2019-12-26 15:35:53 -08:00
Zachary McAlpin
9fe20aa1a3
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2019-12-26 17:29:54 -06:00
Jaime Passos
c0390f5186
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
GoldenTails
25f8f2706b
Also cap dashspeed to at most maxdash.
2019-12-24 13:55:19 -06:00
Jaime Passos
89b4a558a8
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
Jaime Passos
a657392d39
ViewpointSwitch improvements.
2019-12-23 20:22:57 -03:00
GoldenTails
a5a8d0c77b
Cap dashspeed to at least mindash before revving.
2019-12-23 14:01:37 -06:00
Zachary McAlpin
0f895706f4
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2019-12-22 18:55:58 -06:00
Steel Titanium
de1d25cf08
Fix super theme ending early if invincibility expired
2019-12-20 23:45:32 -05:00
James R
70336933bd
Merge branch 'elemental-tweak' into 'next'
...
Don't uncurl from spin if Elemental Stomp is used
See merge request STJr/SRB2!555
2019-12-20 17:32:59 -05:00
Zachary McAlpin
124a0754a6
Revert "Added CalculateCamera Hook"
...
This reverts commit 9f82cdb401
2019-12-19 17:21:55 -06:00
Zachary McAlpin
652e53c629
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features
2019-12-19 17:20:31 -06:00
Zachary McAlpin
9f82cdb401
Added CalculateCamera Hook
2019-12-19 16:41:25 -06:00
Zachary McAlpin
e82b317451
Revert "Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition"
...
This reverts commit 3fc1069082
2019-12-19 15:07:34 -06:00
Zachary McAlpin
c1815bfe11
Revert "Don't execute LUAh_PlayerThink(player) for respawning bots"
...
This reverts commit fc70164f93
2019-12-19 15:07:28 -06:00
Jaime Passos
0accadf02f
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
Jaime Passos
be5fd1a0db
TeamSwitch hook for Lua
2019-12-18 23:40:58 -03:00
Steel Titanium
96cf03b716
Don't uncurl from spin if Elemental Stomp is used
2019-12-18 21:28:34 -05:00
Jaime Passos
83732f38a9
GTR_PITYSHIELD
2019-12-18 12:09:44 -03:00
Jaime Passos
299f2bd8cd
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
Jaime Passos
ea5e0d28ed
More gametype rules yay!!
2019-12-18 01:54:45 -03:00
James R
4029167a57
Merge branch 'fix-divby0-spindash-crash' into 'next'
...
Fix a divide by zero crash when mindash and maxdash were the same.
See merge request STJr/SRB2!539
2019-12-17 20:42:56 -05:00
Zachary McAlpin
3fc1069082
Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition
2019-12-17 19:20:46 -06:00
Zachary McAlpin
fc70164f93
Don't execute LUAh_PlayerThink(player) for respawning bots
2019-12-17 18:41:26 -06:00
Jaime Passos
c6f36fc470
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -03:00
fickleheart
1f88c70d6a
Fix RVZ autocam AGAIN
2019-12-15 13:33:21 -06:00
GoldenTails
23b3f5a649
Fix a divide by zero crash when mindash and maxdash were the same.
...
Props to rumia1 for finding this and Lach for figuring out this was a divide by zero error.
2019-12-15 04:09:56 -06:00
Zachary McAlpin
fce6ea0384
Fixed mistake with #endif placement
2019-12-14 19:32:49 -06:00
Zachary McAlpin
ee9e72f48b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features
2019-12-14 17:59:21 -06:00
Zachary McAlpin
87b816e408
Added PlayerThink hook
2019-12-14 15:28:24 -06:00
fickleheart
fdc3347e22
More turn-to-angle changes
2019-12-13 20:19:38 -06:00
fickleheart
f82f1513ba
Tweaks to camera shifting
2019-12-13 20:17:31 -06:00
fickleheart
bc4b1e1abe
Allow switching lockon targets with turn buttons
2019-12-12 23:52:13 -06:00
fickleheart
d14fa39d7a
Expand options for aim assist
...
This will need a lot of testing to ensure each type
works properly.
2019-12-12 23:03:51 -06:00
fickleheart
a188cd5db8
Add boss target assist and finally organize camera options
2019-12-12 00:48:15 -06:00
fickleheart
f1b5a2b2d3
Move Z-targeting behavior to Center View
2019-12-11 21:09:23 -06:00
fickleheart
f74d7163e6
Fix RVZ camera stuff
2019-12-11 01:26:43 -06:00
GoldenTails
07316fc5bd
Stop characters from being able to activate their abilities when doing a shield ability!
...
Fixes #61 .
2019-12-10 23:55:52 -06:00
fickleheart
08ab15b1b9
Disable thok camera snap
2019-12-10 07:54:27 -06:00
fickleheart
b5f7f5f732
Replace direction toggles with a playstyle selection
...
It's kinda ugly right now...
2019-12-09 22:06:50 -06:00
fickleheart
e4626e9396
Lock camera behind player when holding cam reset
...
This also disables abilitydirection movement temporarily.
2019-12-09 20:21:32 -06:00
James R
4f9e227830
Cvar and menu option to let user increase turn speed
...
cam_turnmultiplier and cam2_turnmultiplier.
"Camera Speed" has been renamed to "Camera Spacial Speed" in the menu. "Camera
Turning Speed" is now an option.
2019-12-09 16:30:03 -08:00
fickleheart
e92d7eca8e
Shift camera sideways toward player angle
2019-12-08 15:54:16 -06:00
fickleheart
4784eb68fa
Don't do thok camera snap in replays
2019-12-08 15:49:10 -06:00
fickleheart
575b5027e8
Don't snap thok if the player is holding a camera control
2019-12-08 15:22:51 -06:00
fickleheart
36fa94a22c
Automatically rotate camera to reflect player actions
2019-12-08 14:35:50 -06:00
MascaraSnake
a3549cc8f2
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
MascaraSnake
f3fd5a50cb
Merge branch 'signpost-cleanup' into 'master'
...
Signpost fixes
See merge request STJr/SRB2Internal!602
2019-12-06 15:58:46 -05:00
Steel Titanium
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
lachwright
cffc6a0e46
Fix diagonal input acceleration and glide directioning in analog mode
2019-12-05 15:59:16 +08:00
lachwright
28fbdab3d4
Make signpost camera distance consistent in analog mode & don't target signpost in 2D mode
2019-12-05 12:58:44 +08:00
lachwright
8ddfdf2d0f
Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode
2019-12-05 12:36:25 +08:00
