Lachlan Wright
0060bac482
Merge branch 'more-stats' into 'next'
...
Add tic and UI times to render stats
See merge request STJr/SRB2!1125
2020-09-25 08:54:01 -04:00
Lachlan Wright
923e3d4888
Merge branch 'gl-shearing-fix-2' into 'next'
...
Fix cv_glshearing 2 in first person
See merge request STJr/SRB2!1114
2020-09-25 08:51:57 -04:00
James R
f0c024e9bd
Remove inverse slope option, merge quaketilt and slopeview into tilting cvar
2020-09-24 20:05:40 -07:00
James R
c5df256d9e
Make fucking with the window optional
2020-09-24 16:49:34 -07:00
James R
176657fe54
Make rolling quake optional
2020-09-24 16:49:34 -07:00
James R
300d25116f
Revise cvars, inverseslope is now the default
2020-09-24 16:49:33 -07:00
James R
c82ac33c0c
Rumble rumble
2020-09-24 16:49:33 -07:00
James R
a8fe25dd41
QUAAAAAAAAKE
2020-09-24 16:49:33 -07:00
James R
65d5fd0784
GONNAHURL HARDCODE
2020-09-24 16:49:33 -07:00
James R
031665cdfc
View morph splitscreen support!
...
There are some issues I ran into:
- Rotation is jittery (not introduced by this commit)
- 2P is wack, I don't care
2020-09-23 17:50:47 -07:00
James R
997d142cb5
SPLITSCREEN FOV
...
Object tracking is off, but it was off before so I don't know if I actually
broke it. Minor refactoring in HWR_RenderPlayerView and HWR_RenderSkyboxView.
2020-09-23 17:50:47 -07:00
James R
80cd5403c7
Fix splitscreen fov
2020-09-23 17:50:47 -07:00
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Hannu Hanhi
baaf19249b
Add tic and ui times to render stats
2020-08-23 20:09:55 +03:00
FlykeSpice
2424418390
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
Sally Coolatta
a251c3909b
Lots of little fixes
...
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
2020-08-16 00:29:04 -04:00
Sally Coolatta
dfd733eb80
Up to screen.o
...
Lots of renderer files I didn't need to touch at all here :)
2020-08-15 00:55:30 -04:00
Jaime Passos
cb3660331a
Refactor renderer switching
2020-08-14 22:27:16 -03:00
Jaime Passos
1e99f94de5
Fix cv_glshearing 2 in first person
2020-08-14 20:31:30 -03:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
135e9b9797
f_finale now compiles
2020-08-11 23:13:25 -04:00
Sally Coolatta
c96bd5f64a
Many removals
...
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
2020-08-10 21:45:51 -04:00
Sally Coolatta
37ab195a85
Merge r_main.c
2020-08-10 15:02:32 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
6bf6b16ff7
Merge r_main.c/h
2020-08-08 16:58:48 -04:00
Jaime Passos
a7f3dd7eff
Refactor patch loading
2020-08-08 05:16:47 -03:00
Sal
21dfe49bf8
Merge branch 'antigrav-respawn' into 'master'
...
Antigravity fixes, round 2
See merge request KartKrew/Kart!305
2020-07-31 21:55:38 -04:00
Latapostrophe
b62ef5a51d
Kill flipcam again but nothing else associated with it.
2020-07-26 21:15:32 +02:00
Latapostrophe
90cde7379c
Revert "Push flipcam down the nearest staircase"
...
This reverts commit 06d70c1f8e .
2020-07-26 20:27:22 +02:00
Hannu Hanhi
470d19727b
Use 64-bit R_PointToAngle in OpenGL culling to fix some big room issues
2020-07-25 21:50:24 +03:00
Latapostrophe
06d70c1f8e
Push flipcam down the nearest staircase
2020-07-24 16:17:07 +02:00
Jaime Passos
10189ecdc0
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-21 22:25:00 -03:00
Sally Coolatta
ef2579f2b3
Merge branch 'master' into draw-flags
2020-07-20 13:38:48 -04:00
Jaime Passos
c385eca5d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
Jaime Passos
615c7121ed
gr_ -> gl_
2020-07-06 01:15:08 -03:00
Sally Coolatta
3e36e15628
Merge master
2020-06-08 00:52:37 -04:00
Hannu Hanhi
6961bba693
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
Sally Coolatta
0dd19f4f50
Merge branch 'master' into new-menus
2020-05-16 04:37:44 -04:00
Sally Coolatta
8be2d12b99
Merge remote-tracking branch 'public/master'
2020-05-16 00:08:53 -04:00
Sal
a20a89f5c7
Merge branch 'now-we-spin-in-spinout-only' into 'master'
...
No more first person hyper spin
See merge request KartKrew/Kart-Public!160
2020-05-15 19:28:38 -04:00
Jaime Passos
668b9bc684
Fix missing sprite column
2020-05-15 16:17:31 -03:00
Jaime Passos
c69a4f9ced
Merge remote-tracking branch 'origin/next' into pictureformats
2020-05-15 01:34:54 -03:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f8d708a4
Merge branch 'master' into new-menus
2020-05-09 17:04:10 -04:00
Hannu Hanhi
1350b89a06
More render stats for software mode, renamed and relocated some render stats variables
2020-05-02 23:13:53 +03:00
Hannu Hanhi
1a741f8883
Move some render stats variables to better locations, add I_FinishUpdate timing
2020-05-02 23:13:32 +03:00
Sally Cochenour
f2aa2bb541
'sal-lighting' code ports from v2
2020-04-25 20:56:50 -04:00