Jaime Passos
37679bb44e
Organise
2019-12-11 13:26:28 -03:00
Jaime Passos
16dafe52ae
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into wipes2
2019-12-11 13:14:11 -03:00
Jaime Passos
9340557d2d
Update f_wipe.c
2019-12-11 13:09:27 -03:00
Jaime Passos
43946d9826
Merge remote-tracking branch 'origin/master' into wipes2
2019-12-11 12:57:59 -03:00
Nev3r
edfe053cc3
Treat warnings as errors; comment out unused function.
2019-12-11 16:37:41 +01:00
Jaime Passos
be13f463f0
Update r_plane.c
2019-12-11 12:36:54 -03:00
Nev3r
d34fd4b755
Epic oversight in upside-down spawn offset.
2019-12-11 15:48:44 +01:00
Jaime Passos
dedd5527da
Restore portal culling code that went gone by pure accident
2019-12-11 11:35:34 -03:00
Nev3r
222336ac0b
Oversight, do not free the data yet vres_Free() does it already at the end.
2019-12-11 15:16:56 +01:00
Nev3r
4d3ec6db41
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
a87a9e6ff6
Remove wrappers and dupes for map lump reading, as they are no longer used.
2019-12-11 14:40:31 +01:00
Nev3r
9952bae5ee
P_MakeMapMD5() now uses virtres.
2019-12-11 14:20:08 +01:00
Nev3r
14ad3b938e
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
4d86dc11a6
'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
bf5a2c68d5
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
f7c69f0c1c
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
854d50f479
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
d2cbdd4fb1
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
584348b91e
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
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
2ab83bac60
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
69b623e086
Add option to always turn with input while locked
...
Uhhh also camera options scrolls now.
2019-12-10 22:01:17 -06:00
fickleheart
cdf5287fcc
Turn camera with strafe keys in camlock while charging spindash
2019-12-10 21:34:57 -06:00
fickleheart
a89f8e91f7
Change defaults and factors of simplecam options
2019-12-10 21:24:43 -06:00
fickleheart
054d51dac6
Make input turn speed tween by lateral momentum, not total
2019-12-10 21:14:50 -06:00
Jaime Passos
f531a8971f
Update m_menu.c
2019-12-10 23:40:15 -03:00
Jaime Passos
9248f12d55
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Jaime Passos
f51253a0a8
Tilted water
2019-12-10 17:01:19 -03:00
Nev3r
ca6a7ffbb3
Fix NiGHTS bumpers height.
2019-12-10 18:53:49 +01:00
Steel Titanium
9ab00049dc
appveyor: Forgot to change version to 2.2.0
2019-12-10 12:53:15 -05:00
Nev3r
8466dc5813
Move mobj spawn Z calculating to a separate function.
2019-12-10 18:03:15 +01:00
fickleheart
2b70b4bf36
TODO
2019-12-10 09:08:30 -06:00
fickleheart
72cf5d9927
Don't flood directionchar commands!!!
2019-12-10 08:17:41 -06:00
fickleheart
194e77a6f0
Give spindash turn a separate slider
2019-12-10 08:07:41 -06:00
fickleheart
e1d4e2edcb
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
08ab15b1b9
Disable thok camera snap
2019-12-10 07:54:27 -06:00
Nev3r
3dfa526eea
Separate Emerald Hunt emerald spawning into another function.
2019-12-10 14:21:08 +01:00
fickleheart
2fa1e75016
I'm hilarious
2019-12-09 22:45:34 -06:00
fickleheart
a3961efc43
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
2a9819947e
Disable all new camera behavior if playstyle is not Simple
2019-12-09 22:09:58 -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
834a3bf334
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
3735134948
Fix smoothing into input-based camera rotation
2019-12-09 20:31:19 -06:00
fickleheart
27996ada04
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
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
Nev3r
6fe6db8e18
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
8ea7dd418a
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
c99b137298
Fix abilitydirection camera breaking minecarts
2019-12-08 20:47:11 -06:00
