Commit graph

8589 commits

Author SHA1 Message Date
lachwright
58d1bcf984 Apply skin's highresscale to continue screen 2020-01-07 13:56:54 +08:00
Steel Titanium
9a48bc65ec Update copyright statements for changed names 2020-01-06 17:16:27 -05:00
Alam Ed Arias
4ffe5d0670 cleanup whitespace 2020-01-05 21:49:07 -05:00
Jaime Passos
652a71abf6 Merge remote-tracking branch 'origin/master' into more-opengl-fixes 2020-01-05 22:04:51 -03:00
Jaime Passos
c47ab3b31f Fix chroma key 2020-01-05 22:04:19 -03:00
James R
3d3b4d183f 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
059a09d00e Fix mouse being grabbed even when not used
The other way around this time.
2020-01-06 00:40:28 +01:00
Louis-Antoine
93e878b8f0 Revert "Fix mouse being grabbed even when not used"
This reverts commit 7d67be582b.
2020-01-06 00:38:40 +01:00
James R
db591f85e3 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
9f68fa0798 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
a850a97300 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
e9e82b5ea0 Fix GetTextureUsed 2020-01-05 18:10:33 -03:00
Louis-Antoine
7d67be582b Fix mouse being grabbed even when not used 2020-01-05 18:39:16 +01:00
Jaime Passos
8cfc38813c 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
71f7130abe AA trees are not needed at all for rotated patches 2020-01-05 03:10:03 -03:00
LJ Sonic
1b1934637a 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
8d328d16c7 Fix major issue 2020-01-03 02:58:23 +01:00
James R
f1db264c25 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
f9d54b89c3 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
3ae44063f1 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
22c6440523 Use GCC 8.1 for x86_64 2020-01-02 15:45:13 -08:00
Louis-Antoine
ff47e36b43 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
54b4a53f92 Add a "alwaysgrabmouse" console variable 2020-01-03 00:25:58 +01:00
James R
3762b638c7 Remove Direct Draw from AppVeyor config 2020-01-02 14:58:09 -08:00
Louis-Antoine
1864526f72 Revert "Ungrab mouse when watching a record"
This reverts commit bd25e7b4ac.
2020-01-02 20:29:51 +01:00
James R
8720bbe044 Hahahahahahahahahahahahaha 2020-01-01 15:52:23 -08:00
Louis-Antoine
f750144c88 Minor code refactoring 2020-01-02 00:47:20 +01:00
Louis-Antoine
bd25e7b4ac Ungrab mouse when watching a record 2020-01-02 00:46:50 +01:00
Louis-Antoine
61a681ed02 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
Louis-Antoine
d4a2483c3e Grab mouse on game startup 2020-01-02 00:38:43 +01:00
James R
6ea83c74c3 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
b83dfa9e5a 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
b8f465408b 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
c32e481689 Don't Y-billboard papersprite models (?!?!??!??!?!?) 2020-01-01 18:00:01 -03:00
Jaime Passos
be2afe1e85 Rename functions 2020-01-01 17:46:26 -03:00
Jaime Passos
4630b8615c Remove unused parameter 2020-01-01 17:36:55 -03:00
Jaime Passos
c7db80a6fd Update copyrights 2020-01-01 17:30:07 -03:00
Jaime Passos
372bfe39f6 Fix transparent PNG conversion 2020-01-01 17:28:22 -03:00
Jaime Passos
7f178d3bb7 Fix broken model light lists in ACZ3 2020-01-01 15:55:18 -03:00
Louis-Antoine
30bc8af7e8 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
b756b45d16 Merge branch 'revert-938f81ba' 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
285a2ec05d Revert "Merge branch 'software-clownery' into 'master'"
This reverts merge request !578
2019-12-31 23:40:17 +00:00
Jaime Passos
86e8f35c44 Merge branch 'fixcoronalist' into 'master'
Fix broken corona list

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

See merge request STJr/SRB2!578
2019-12-31 12:49:44 -05:00
fickleheart
1419ec72d5 Software FOV ported from kart
also fixes high software FOVs having buggy walls
2019-12-31 11:22:05 -06:00
James R
ec72c69614 Make the menu option for renderer switching transparent under NOHW 2019-12-30 21:45:19 -08:00
James R
7616bf5734 IT_PAIR for when you want to define both sides of a menu item 2019-12-30 21:40:13 -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
73643dafaf Fix NOHW compiling 2019-12-30 20:18:08 -08:00
James R
4f8775d560 Fix NOMIXER compiling 2019-12-30 20:08:29 -08:00