Commit graph

8545 commits

Author SHA1 Message Date
James R
5c60f8b529 Merge branch 'software-fov' into 'master'
Software FOV

See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
James R
feb0fc2ee9 Merge branch 'orbital-disappearing' into 'master'
Don't clip player MD2 when looking straight down with the orbital camera

See merge request STJr/SRB2!658
2020-01-10 00:33:14 -05:00
James R
66cf1be0d8 Don't clip player MD2 either! 2020-01-08 20:52:34 -08:00
James R
4d8c916ca1 Merge branch 'names-update' into 'master'
Update copyright statements for changed names

See merge request STJr/SRB2!644
2020-01-08 16:16:41 -05:00
James R
117d5ab66f Merge branch 'highresscale-continue' into 'master'
Apply skin's highresscale to continue screen

See merge request STJr/SRB2!645
2020-01-08 16:15:15 -05:00
James R
6870492cf2 Merge branch 'more-opengl-fixes' into 'master'
More OpenGL fixes plus masked PNG conversion

See merge request STJr/SRB2!619
2020-01-08 16:14:51 -05:00
lachwright
e069e149d9 Apply skin's highresscale to continue screen 2020-01-07 13:56:54 +08:00
Steel Titanium
808d731652 Update copyright statements for changed names 2020-01-06 17:16:27 -05:00
Alam Ed Arias
0fbc459243 cleanup whitespace 2020-01-05 21:49:07 -05:00
Jaime Passos
03245b28fd Merge remote-tracking branch 'origin/master' into more-opengl-fixes 2020-01-05 22:04:51 -03:00
Jaime Passos
9086b1851d Fix chroma key 2020-01-05 22:04:19 -03:00
James R
ea3c36eb13 Merge branch 'fix-mouse-grabbing' into 'master'
Fix mouse being grabbed even when not used

See merge request STJr/SRB2!639
2020-01-05 18:46:13 -05:00
Louis-Antoine
e847777a35 Fix mouse being grabbed even when not used
The other way around this time.
2020-01-06 00:40:28 +01:00
Louis-Antoine
88c8049c77 Revert "Fix mouse being grabbed even when not used"
This reverts commit 6c85c4e1d3.
2020-01-06 00:38:40 +01:00
James R
6af0249d01 Merge branch 'vgetcolorfixes' into 'master'
Fix usage of V_GetColor

See merge request STJr/SRB2!638
2020-01-05 17:12:21 -05:00
James R
fa690e2133 Merge branch 'appveyor-gcc-8.1' into 'master'
Use GCC 8.1 for AppVeyor 64-bit builds

See merge request STJr/SRB2!624
2020-01-05 17:12:06 -05:00
James R
e4f88d142e Merge branch 'connect-ip-textbox' into 'master'
Add clipboard functionality to the Connect via IP textbox.

See merge request STJr/SRB2!597
2020-01-05 17:06:45 -05:00
Jaime Passos
d93adbacbb Fix GetTextureUsed 2020-01-05 18:10:33 -03:00
Louis-Antoine
6c85c4e1d3 Fix mouse being grabbed even when not used 2020-01-05 18:39:16 +01:00
Jaime Passos
deee2a0d6f I was using V_GetColor in a lot of places I shouldn't have, making the game look wrong with a non-default colour profile.
Though, I left R_RainbowColormap alone.
2020-01-05 03:20:05 -03:00
Jaime Passos
6d754821fb AA trees are not needed at all for rotated patches 2020-01-05 03:10:03 -03:00
LJ Sonic
a3396d6bd7 Merge branch 'fix-major-issue' into 'master'
Fix major issue

See merge request STJr/SRB2!625
2020-01-02 21:03:18 -05:00
Louis-Antoine
b45ee059e3 Fix major issue 2020-01-03 02:58:23 +01:00
James R
859bef9fa2 Merge branch 'dd-is-dead' into 'master'
Remove Direct Draw from AppVeyor config

See merge request STJr/SRB2!622
2020-01-02 20:54:56 -05:00
LJ Sonic
ff8cb3ddb0 Merge branch 'do-not-save-netvars' into 'master'
Do not save netgame-synced console variables

See merge request STJr/SRB2!623
2020-01-02 20:50:00 -05:00
LJ Sonic
c6aec51d99 Merge branch 'ungrab-mouse-in-menus' into 'master'
Let the mouse move freely when a menu is open or game is paused

See merge request STJr/SRB2!617
2020-01-02 18:48:38 -05:00
James R
658b8dcfa9 Use GCC 8.1 for x86_64 2020-01-02 15:45:13 -08:00
Louis-Antoine
1845266bc8 Do not save netgame-synced console variables
This is a bad thing to do, because if you join a server,
your game will save the host's settings.
2020-01-03 00:40:49 +01:00
Louis-Antoine
49934007d7 Add a "alwaysgrabmouse" console variable 2020-01-03 00:25:58 +01:00
James R
945f50c273 Remove Direct Draw from AppVeyor config 2020-01-02 14:58:09 -08:00
Louis-Antoine
e0e5e83869 Revert "Ungrab mouse when watching a record"
This reverts commit 17636ccc01.
2020-01-02 20:29:51 +01:00
James R
b9cecea25c Hahahahahahahahahahahahaha 2020-01-01 15:52:23 -08:00
Louis-Antoine
3af00ac93e Minor code refactoring 2020-01-02 00:47:20 +01:00
Louis-Antoine
17636ccc01 Ungrab mouse when watching a record 2020-01-02 00:46:50 +01:00
Louis-Antoine
5bde4df439 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
Louis-Antoine
62397a36ec Grab mouse on game startup 2020-01-02 00:38:43 +01:00
James R
e9843590da Merge branch 'nohw-renderswitch' into 'master'
NOHW V.S. Renderer Switching

See merge request STJr/SRB2!609
2020-01-01 17:52:35 -05:00
James R
35fe2e7281 Merge branch 'quote-shenanigans' into 'master'
Stuff I Broke: Commands

See merge request STJr/SRB2!607
2020-01-01 17:52:21 -05:00
James R
01be810aee Merge branch 'warp-by-name' into 'master'
Properly fix the issue that !528 tried to; let the -warp parameter work with map name

See merge request STJr/SRB2!596
2020-01-01 17:51:21 -05:00
Jaime Passos
874d4d01ee Don't Y-billboard papersprite models (?!?!??!??!?!?) 2020-01-01 18:00:01 -03:00
Jaime Passos
03d4082f21 Rename functions 2020-01-01 17:46:26 -03:00
Jaime Passos
c7794d4ce0 Remove unused parameter 2020-01-01 17:36:55 -03:00
Jaime Passos
6d2f2e0865 Update copyrights 2020-01-01 17:30:07 -03:00
Jaime Passos
401c35b407 Fix transparent PNG conversion 2020-01-01 17:28:22 -03:00
Jaime Passos
98b7d8aaca Fix broken model light lists in ACZ3 2020-01-01 15:55:18 -03:00
Louis-Antoine
caadf6aa61 Let the mouse move freely when a menu is open or game is paused
That means you can now easily move your mouse out of SRB2's window
and switch between several windows easily by just pressing escape!

Any phase of the game that isn't actual gameplay counts as a menu,
which means you can also move the mouse in cutscenes,
at the title screen, server connection screen,
and even when the chat or console are open.
2020-01-01 13:29:07 +01:00
Jaime Passos
2728536589 Merge branch 'revert-09798876' into 'master'
Revert "Merge branch 'software-clownery' into 'master'"

See merge request STJr/SRB2!616
2019-12-31 18:42:53 -05:00
Jaime Passos
b41cd59e51 Revert "Merge branch 'software-clownery' into 'master'"
This reverts merge request !578
2019-12-31 23:40:17 +00:00
Jaime Passos
c460775cd7 Merge branch 'fixcoronalist' into 'master'
Fix broken corona list

See merge request STJr/SRB2!605
2019-12-31 14:25:49 -05:00
Nev3r
0979887600 Merge branch 'software-clownery' into 'master'
Software clownery

See merge request STJr/SRB2!578
2019-12-31 12:49:44 -05:00