SteelT
|
23f6dc63d6
|
Merge screen.c
|
2020-08-02 18:58:11 -04: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
|
45e2f03846
|
New colors
- Removed Salmon, Robo-Hood, Caribbean, and Azure.
- Added Skunk, Robin, Blueberry, and Blossom.
- Updated Lime, Algae, Violet and Magenta.
- Renamed old Blueberry to Midnight.
|
2020-05-11 23:46:37 -04:00 |
|
sphere
|
0490dc3e8e
|
Don't show the FPS counter during startup.
|
2020-05-11 01:33:34 +02:00 |
|
sphere
|
6b761c1486
|
Make showfps save to config, and add a compact option.
|
2020-05-08 15:40:50 +02:00 |
|
James R
|
81a01041e8
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-09 17:04:04 -07:00 |
|
James R
|
0b91ef071f
|
Merge branch 'sdlglcontext' into 'master'
Only initialise OpenGL if the user intends to load it (for real this time)
See merge request STJr/SRB2!796
|
2020-04-09 19:51:20 -04:00 |
|
Louis-Antoine
|
4e7605f0e2
|
Make SRB2 flat like Earth
|
2020-03-20 18:55:29 +01:00 |
|
James R
|
26794eef46
|
Draw mini ping counter in splitscreen
|
2020-03-18 19:42:13 -07:00 |
|
SteelT
|
800d277dec
|
Merge branch 'fix-ogllib' into 'master'
Fix -OGLlib
See merge request STJr/SRB2!794
|
2020-03-02 15:21:50 -05:00 |
|
James R
|
2274129f57
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Jaime Passos
|
fd23294cc4
|
Rename stuff around
|
2020-02-17 21:11:56 -03:00 |
|
Jaime Passos
|
f189e0425f
|
add -nogl parm
|
2020-02-17 12:14:51 -03:00 |
|
Jaime Passos
|
cc14910896
|
Only set OpenGL as the target renderer if it loaded successfully
|
2020-02-17 01:14:48 -03:00 |
|
Jaime Passos
|
5c1b3baf18
|
Fix -OGLlib
|
2020-02-17 01:08:15 -03:00 |
|
Jaime Passos
|
34e5b13acf
|
Don't stop the automap (just restart it instead.)
|
2020-01-26 23:12:28 -03:00 |
|
James R
|
ec72c69614
|
Make the menu option for renderer switching transparent under NOHW
|
2019-12-30 21:45:19 -08:00 |
|
James R
|
3b30fcc5fa
|
Don't let the user switch to OpenGL if NOHW
|
2019-12-30 20:29:41 -08:00 |
|
James R
|
3883d44bb5
|
Warn when going to OpenGL from the menu
|
2019-12-29 18:37:22 -08:00 |
|
Jaime Passos
|
518714a51a
|
Fix sprite rotation crashes.
|
2019-12-27 00:37:40 -03:00 |
|
James R
|
02104402ed
|
Save the renderer
|
2019-12-26 18:44:02 -08:00 |
|
James R
|
e3d08831f2
|
Make cv_renderer CV_NOLUA instead of hidden!!!
|
2019-12-26 18:15:52 -08:00 |
|
James R
|
0b87dd3554
|
Fix switching to software
Would show a black screen for me on Linux. My suspsicion is that
some things are not initialized with just VID_CheckRenderer.
|
2019-12-19 17:13:23 -03: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 |
|
Jaime Passos
|
96bfc1da8f
|
Merge remote-tracking branch 'origin/master' into ripple2
|
2019-12-14 19:36:54 -03:00 |
|
Jaime Passos
|
ea52225869
|
Remove SPANDRAWFUNC_MMX, as it's not needed anymore.
|
2019-12-13 19:02:36 -03:00 |
|
Jaime Passos
|
b47cc01f50
|
Separate non-powers-of-two draw routines into its own file
|
2019-12-13 13:11:56 -03:00 |
|
Jaime Passos
|
9a5876f9d3
|
stuff
|
2019-12-13 12:26:47 -03:00 |
|
Jaime Passos
|
6976b9bf01
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-10 23:01:10 -03:00 |
|
Steel Titanium
|
a5cdb0a4b3
|
Update copyright date on source files
|
2019-12-06 13:49:42 -05:00 |
|
Jaime Passos
|
2527e85108
|
fix showfps with st_translucency
|
2019-11-23 18:41:28 -03:00 |
|
James R
|
2b9a62a6bc
|
Shift showping display up a bit
|
2019-11-17 18:54:23 -08:00 |
|
James R
|
51a2b76970
|
Snapping for showping, so it doesn't jump way up on non-green
|
2019-11-17 18:52:05 -08:00 |
|
Steel Titanium
|
b1f39e836d
|
Better ping implementation.
|
2019-11-17 20:22:47 -05:00 |
|
Jaime Passos
|
d3fb98dfe4
|
Make cv_renderer a hidden command
Finally! Renderer switching IS SAVED!! 🎉 🎉 🎉 🎉 🎉 🎉
|
2019-11-12 21:44:43 -03:00 |
|
Jaime Passos
|
845b82668b
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-11-12 20:25:40 -03:00 |
|
toaster
|
b501e5b358
|
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
|
2019-11-01 15:48:50 +00:00 |
|
James R
|
32d450fbe7
|
Apply HUD translucency to ping and FPS counters
|
2019-10-22 21:54:09 -07:00 |
|
Jaime Passos
|
e95bd8add3
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-09-27 22:53:57 -03:00 |
|
Jaime Passos
|
ce8b821691
|
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
|
2019-09-10 18:12:01 -03:00 |
|
Jaime Passos
|
285ba4ee06
|
Enable usage of R_DrawSpan_8_MMX if drawing a flat with powers-of-two dimensions
|
2019-09-10 17:25:21 -03:00 |
|
Jaime Passos
|
2b6ae5081a
|
Attempt to fix warnings
|
2019-09-09 19:34:51 -03:00 |
|
Jaime Passos
|
fe737c33f6
|
Comments
|
2019-09-09 19:27:08 -03:00 |
|
Jaime Passos
|
073e33de21
|
yet even more cleanup here
|
2019-09-09 16:31:30 -03:00 |
|
Jaime Passos
|
11077c2bac
|
still making things better
|
2019-09-08 21:37:24 -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
|
b28af03b1c
|
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
|
2019-09-06 19:20:45 -03:00 |
|
James R
|
63abd92a0e
|
Apply HUD translucency to ping and FPS counters
|
2019-08-11 12:35:06 -07:00 |
|