Commit graph

312 commits

Author SHA1 Message Date
Sally Cochenour
889bb09e6c Merge branch 'namirays' into oglshaderport 2020-01-11 09:32:59 -05:00
James R
4652e87948 Merge branch 'software-fov' into 'master'
Software FOV

See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
fickleheart
084a8db5a9 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
Sally Cochenour
d2e3c832da Merge next 2020-01-07 07:35:39 -05:00
MascaraSnake
33c35230c2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
Jaime Passos
285a2ec05d Revert "Merge branch 'software-clownery' into 'master'"
This reverts merge request !578
2019-12-31 23:40:17 +00:00
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart
1419ec72d5 Software FOV ported from kart
also fixes high software FOVs having buggy walls
2019-12-31 11:22:05 -06:00
Jaime Passos
2bdd411736 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 23:21:42 -03:00
James R
14fb5dccc8 Merge branch 'renderswitch' into 'master'
Renderer switching

See merge request STJr/SRB2!550
2019-12-30 15:36:17 -05:00
fickleheart
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
fickleheart
f8599ffcb9 Save separate camera settings for standard/simple modes 2019-12-30 12:10:38 -06:00
Jaime Passos
2c247d8210 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 11:49:12 -03:00
Sally Cochenour
31304eda3e Merge branch 'next' into oglshaderport 2019-12-28 13:58:41 -05:00
Jaime Passos
b8e91a50a5 OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos
c8f9896e2d struct time 2019-12-26 16:25:04 -03:00
Sally Cochenour
add2497220 Port of Jimita's shader stuff + my lighting shader
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
2019-12-25 14:22:01 -05:00
James R
2b2d4c139f Merge remote-tracking branch 'origin/master' into turnmultiplier 2019-12-22 21:26:36 -08:00
Jaime Passos
11dc6801dc Update comments 2019-12-17 16:14:26 -03:00
Jaime Passos
1002c47407 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
James R
bc939a2211 Merge branch 'opengl-is-a-bad-renderer' into 'master'
OpenGL fixes

See merge request STJr/SRB2!519
2019-12-14 16:48:50 -05:00
Jaime Passos
b093a38ecd Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!! 2019-12-12 17:30:19 -03:00
Jaime Passos
463e2567fe Restore portal culling code that went gone by pure accident 2019-12-11 11:35:34 -03:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03: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
Jaime Passos
4ccc854a90 Die 2019-12-08 22:12:56 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
5afa5f12ee Disable the GL sprite shadows behind a #define.
Reasoning:
* They're horribly broken (they completely ignore slopes).
* A similar final demo GL-only feature (coronas) has been completely disabled.
* Nobody's going to bugfix them before release because not even the devteam's resident GL users use them.
* They look ugly.
2019-11-17 22:18:46 +00:00
Jaime Passos
845b82668b Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
Jaime Passos
f655865200 add gr_modelinterpolation 2019-11-04 12:21:53 -03:00
toaster
2a16cf539a Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
Jaime Passos
09c9714daf Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-10-06 17:40:41 -03:00
Jaime Passos
e95bd8add3 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Jaime Passos
fa9cef1cc0 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
Jaime Passos
5e1ebad9d3 sky barreling 2019-09-17 23:38:04 -03:00
Alam Ed Arias
aab58a4613 Revert "Merge branch 'gl_skydome' into 'master'"
This reverts merge request !326
2019-09-17 20:20:09 +00:00
Latapostrophe
0fb7f78571 camera checks to avoid crashes 2019-09-17 00:04:32 +02:00
Jaime Passos
0d11dd516a Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-09-15 16:24:24 -03:00
James R
7a70f882b1 Let first person camera work in demos 2019-09-15 00:32:01 -07:00
Jaime Passos
db1e38451e Fix titlemap* crash 2019-09-10 18:34:29 -03:00
Jaime Passos
2e93068618 Fix title screen crash 2019-09-10 18:33:06 -03:00
Jaime Passos
ce8b821691 Merge remote-tracking branch 'jimita/renderswitch' into renderswitch 2019-09-10 18:12:01 -03:00
James
0208de2d5b Lach has blessed us with a remade cam_adjust. 2019-09-10 10:11:03 -04:00
Jaime Passos
fe737c33f6 Comments 2019-09-09 19:27:08 -03:00
Jaime Passos
371e160940 I am the CEO of renderers 2019-09-09 16:20:17 -03:00
Jaime Passos
11077c2bac still making things better 2019-09-08 21:37:24 -03:00
Jaime Passos
61a16d43f5 more stuff. i hope i didnt mess this up. 2019-09-08 18:59:49 -03:00
Jaime Passos
1cb22d5e6b initial stuff 2019-09-08 18:44:40 -03:00
Jaime Passos
398b320aec initial stuff 2019-09-08 18:27:35 -03:00
Jaime Passos
6573e94e3a PRBoom sky dome 2019-09-03 02:12:17 -03:00