Commit graph

9265 commits

Author SHA1 Message Date
Nev3r
4fcdf23bc6 Merge branch 'virtres' of https://git.magicalgirl.moe/STJr/SRB2/ into virtres
# Conflicts:
#	src/p_setup.c
2019-12-11 14:44:42 +01:00
Nev3r
576ad30c24 Remove wrappers and dupes for map lump reading, as they are no longer used. 2019-12-11 14:40:31 +01:00
Nev3r
b9f99792db P_MakeMapMD5() now uses virtres. 2019-12-11 14:20:08 +01:00
Nev3r
22392eaa5f Use virtres in P_SpawnSpecials(). Whether accessing the lump again here is right or not is also a different question. 2019-12-11 14:04:09 +01:00
Nev3r
ea6becb876 'prepare' mapthings using virtres in P_LevelInitStuff(). Whether 'preparing' them or not is actually necessary is another matter. 2019-12-11 13:54:15 +01:00
Nev3r
03dab2ae5e P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not. 2019-12-11 13:22:07 +01:00
Nev3r
ffb11a6bed P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not. 2019-12-11 12:48:41 +01:00
Nev3r
23c0c8f68e Added 'virtual resource' mechanism for temporary memory loaded lump lists. If you can come up with a better name then I'm all ears. 2019-12-11 11:44:46 +01:00
Nev3r
a57ead226e Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now. 2019-12-11 11:10:31 +01:00
Nev3r
be3234a4e8 Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead. 2019-12-11 10:13:52 +01:00
fickleheart
0a480f1df6 Fix RVZ camera stuff 2019-12-11 01:26:43 -06:00
GoldenTails
5b61af47b0 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
10ac6ac8bb Run camera movement in the camera options menu
It's really nice to see adjustments reflected in real time.
2019-12-10 23:18:46 -06:00
fickleheart
f886eb3a3c Add option to always turn with input while locked
Uhhh also camera options scrolls now.
2019-12-10 22:01:17 -06:00
fickleheart
4425c58e0f Turn camera with strafe keys in camlock while charging spindash 2019-12-10 21:34:57 -06:00
fickleheart
46e3b6799f Change defaults and factors of simplecam options 2019-12-10 21:24:43 -06:00
fickleheart
2ecf0f97bc Make input turn speed tween by lateral momentum, not total 2019-12-10 21:14:50 -06:00
Jaime Passos
b28e4d9552 Update m_menu.c 2019-12-10 23:40:15 -03:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Jaime Passos
bd51f26807 Tilted water 2019-12-10 17:01:19 -03:00
Nev3r
3214ad0b3a Fix NiGHTS bumpers height. 2019-12-10 18:53:49 +01:00
Steel Titanium
ab50f1255d appveyor: Forgot to change version to 2.2.0 2019-12-10 12:53:15 -05:00
Nev3r
842afa8d67 Move mobj spawn Z calculating to a separate function. 2019-12-10 18:03:15 +01:00
fickleheart
6e7e75ba45 TODO 2019-12-10 09:08:30 -06:00
fickleheart
80cbcbd77d Don't flood directionchar commands!!! 2019-12-10 08:17:41 -06:00
fickleheart
8ce189dcba Give spindash turn a separate slider 2019-12-10 08:07:41 -06:00
fickleheart
7f23ae547f Suspend directionchar while holding cam reset
This should make it completely clear that thok will face
the camera while it's held.
2019-12-10 07:58:50 -06:00
fickleheart
4a63a5f7af Disable thok camera snap 2019-12-10 07:54:27 -06:00
Nev3r
940c36ef24 Separate Emerald Hunt emerald spawning into another function. 2019-12-10 14:21:08 +01:00
fickleheart
d5571c51c4 I'm hilarious 2019-12-09 22:45:34 -06:00
fickleheart
d88bc63ee8 Draw crosshair in Simple mode while holding cam reset
I think this gives extra indication that abilities face toward
the camera now.
2019-12-09 22:12:19 -06:00
fickleheart
d43b34c477 Disable all new camera behavior if playstyle is not Simple 2019-12-09 22:09:58 -06:00
fickleheart
0775ddbcf9 Replace direction toggles with a playstyle selection
It's kinda ugly right now...
2019-12-09 22:06:50 -06:00
fickleheart
26ab979bdb Port deadzone configuration from Kart
I don't feel like getting out my gamepad, so I'll trust
that this works.
2019-12-09 20:39:05 -06:00
fickleheart
7456afa8a4 Fix smoothing into input-based camera rotation 2019-12-09 20:31:19 -06:00
fickleheart
8beca250df Scale down turn values (and increase defaults to compensate)
This allows more granularity in menu sliders while limiting the
maximums to reasonable amounts.
2019-12-09 20:26:12 -06:00
fickleheart
8d66e90810 Lock camera behind player when holding cam reset
This also disables abilitydirection movement temporarily.
2019-12-09 20:21:32 -06:00
James R
7553046a52 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
Nev3r
3e9e57b3b3 Removed seemingly redundant (and incorrect) mapthing Z load code.
The proper code seems to sit inside P_SpawnMapThing() and the SpawnHoop functions. Time will tell if I've actually commited an atrocity.
2019-12-09 14:05:22 +01:00
Nev3r
d27a5d7992 Move the axis spawning code out of the mapthing read function, and read the mapthing z in the mapthing read function. 2019-12-09 13:26:31 +01:00
fickleheart
5da76f8802 Fix abilitydirection camera breaking minecarts 2019-12-08 20:47:11 -06:00
Jaime Passos
af292bc2c5 Die, Apple! 2019-12-08 22:31:59 -03:00
Jaime Passos
042f14236b Speed up level loading
Don't flush every texture just because the palette MAY have changed
2019-12-08 22:28:13 -03:00
Jaime Passos
4ccc854a90 Die 2019-12-08 22:12:56 -03:00
fickleheart
9b4792c1bf Make input turn slow down when moving slowly 2019-12-08 18:26:20 -06:00
Jaime Passos
768293fb0b Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer 2019-12-08 21:10:48 -03:00
Jaime Passos
4bb8532714 Translate the French 2019-12-08 21:10:14 -03:00
fickleheart
95d0d26a42 Default to no turn-facing since it looks like controller drift 2019-12-08 15:54:37 -06:00
fickleheart
eaef39c974 Shift camera sideways toward player angle 2019-12-08 15:54:16 -06:00
fickleheart
c272cf5ecb Don't do thok camera snap in replays 2019-12-08 15:49:10 -06:00