Commit graph

1327 commits

Author SHA1 Message Date
Jaime Passos
43abd53c55 Fix what !785 tried to fix, but correctly 2020-02-17 21:58:32 -03:00
Jaime Passos
fd23294cc4 Rename stuff around 2020-02-17 21:11:56 -03:00
Jaime Passos
043057532c Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-17 12:28:16 -03:00
Jaime Passos
f189e0425f add -nogl parm 2020-02-17 12:14:51 -03:00
Jaime Passos
abd7c3e503 Don't center the window when changing renderers 2020-02-17 01:15:18 -03:00
Jaime Passos
21cdca5d6d Don't call HWR_Switch twice 2020-02-17 01:15:11 -03:00
Jaime Passos
df19b64edd Remove redundant check 2020-02-17 01:15:04 -03:00
Jaime Passos
e16173a82d Always load the GL library! 2020-02-17 01:13:13 -03:00
Jaime Passos
88e99fed57 Only initialise OpenGL if you actually intend to use it. 2020-02-17 01:12:53 -03:00
Jaime Passos
edb7d20290 Missing comment 2020-02-17 01:08:55 -03:00
Jaime Passos
1d92fa38f6 Fallback to Software if the renderer version doesn't match 2020-02-17 01:08:41 -03:00
Jaime Passos
5c1b3baf18 Fix -OGLlib 2020-02-17 01:08:15 -03:00
Jaime Passos
1c48480944 Clear setrenderneeded after calling VID_CheckRenderer 2020-02-17 00:36:10 -03:00
Monster Iestyn
0a4a879b96 Updated version number to 2.2.1, increment MODVERSION.
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
2020-02-05 19:55:40 +00:00
Jaime Passos
e56273f909 Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00
Jaime Passos
85f016e4d8 port pfnUpdateTexture 2020-01-28 00:16:38 -03:00
Jaime Passos
444d50c5f8 Fix -OGLlib 2020-01-27 01:57:55 -03:00
Jaime Passos
5d3d031db3 Fix the gl_leveltime problem, I guess.
This is probably superfluous.
2020-01-23 21:25:54 -03:00
Louis-Antoine
4777829d45 Fix mouse in controls setup menu 2020-01-18 20:18:20 +01:00
Sally Cochenour
f1207ab4fe Fix errors 2020-01-07 19:30:09 -05:00
Jaime Passos
96340ac80c Move texture stuff to its own file 2020-01-07 12:35:10 -03:00
Sally Cochenour
d2e3c832da Merge next 2020-01-07 07:35:39 -05:00
Jaime Passos
4e0810e8a3 Picture formats test 2020-01-06 18:22:23 -03: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
Louis-Antoine
7d67be582b Fix mouse being grabbed even when not used 2020-01-05 18:39:16 +01:00
Louis-Antoine
54b4a53f92 Add a "alwaysgrabmouse" console variable 2020-01-03 00:25:58 +01:00
Louis-Antoine
1864526f72 Revert "Ungrab mouse when watching a record"
This reverts commit bd25e7b4ac.
2020-01-02 20:29:51 +01: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
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
James R
4f8775d560 Fix NOMIXER compiling 2019-12-30 20:08:29 -08: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
Sally Cochenour
31304eda3e Merge branch 'next' into oglshaderport 2019-12-28 13:58:41 -05:00
Alam Ed Arias
848a144956 fread and fwrite use size_t, not int 2019-12-27 13:08:26 -05:00
Alam Ed Arias
7201e165a4 we only need link on unix systems 2019-12-27 13:05:15 -05:00
James R
8311380146 Merge branch 'time' into 'master'
haha log files

See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
Sally Cochenour
931b44519d Merge next 2019-12-25 14:41:31 -05: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
Jaime Passos
f55b4bf6ad Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
James R
cb9db74044 Merge branch 'gl_gifs' into 'master'
OpenGL GIF movie recording

See merge request STJr/SRB2!549
2019-12-24 14:44:44 -05:00
James R
469e5a7c9b Fix NOPNG compiling 2019-12-24 11:37:37 -08:00
James R
699407dbb0 I'm an idiot 2019-12-24 11:14:21 -08:00
James R
984281e85e Merge remote-tracking branch 'origin/master' into time 2019-12-24 11:02:31 -08:00
James R
df02a22697 Correct usage of logdir 2019-12-24 01:59:05 -08:00
James R
5d0c19af37 Overwrite an already existing symlink 2019-12-24 01:55:47 -08:00
James R
7db16e230b Merge branch 'fixsignalhandler' into 'master'
Handle signals correctly on linux

See merge request STJr/SRB2!530
2019-12-24 02:54:44 -05:00
James R
908266f583 symlink latest-log.txt on nix, copy to the real log file everywhere else 2019-12-23 18:20:04 -08:00