Commit graph

381 commits

Author SHA1 Message Date
Sally Coolatta
e6a9e5a68e Merge branch 'master' into new-menus 2020-11-08 02:49:28 -05:00
Sally Coolatta
b3f4483ac2 Actually, lets just fix FixedHypot instead.
Now FixedHypot uses the code from R_PointToDist2, and R_PointToDist2 just calls FixedHypot.

Ultimately, this branch was intended to get rid of a redundant way to retrieve distance and replace it with the one that was actually good at its job. So consolidating FixedHypot and R_PointToDist2 together is just an extension of that.
2020-11-08 00:45:16 -05:00
James R
27fbf77922 Huge perfstats refactor
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
2020-11-07 01:32:59 -08:00
Jaime Passos
917f8bbb66 Plane optimization and cleanup 2020-11-04 23:46:34 -03:00
Jaime Passos
cdc4a6d86e Implement blend modes 2020-10-27 00:03:41 -03:00
James R
eec54356c3 Fix splitscreen fov being fucked on first R_ExecuteSetViewSize 2020-10-26 18:57:32 -07:00
Sally Coolatta
afbbfc9b1f Fix cvars
My wrist burns...
2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
James R
f34a761d48 Merge branch 'perfstats' into 'next'
Performance stats

See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
Jaime Passos
b4b4738c94 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
Jaime Passos
b44837324f Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
Hannu Hanhi
24ff748c58 Performance stats 2020-10-10 22:12:34 +03:00
Jaime Passos
b7d1c0b1e4 Make 3D floors cull areas below or above them to reduce overdraw (2) 2020-10-10 01:00:39 -03:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
James R
4240b30453 Apply quake rolling to opengl too, cv_actionmovie depends on cv_tilting
(cherry picked from commit b69162e92d972b58c59b73a19eed2ea234e464f3)
2020-10-04 20:59:08 -07:00
James R
737ea51ace Merge remote-tracking branch 'origin/the-scary-22-merge' into sloped-camera 2020-10-04 16:32:19 -07:00
Sally Coolatta
285ec3e08c Player death uses damage types
- Fixed last place elimination not working (again)
- Replaces squishing from level geometry with good old fashioned crush death
2020-09-25 16:31:10 -04:00
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