Sally Cochenour
f1207ab4fe
Fix errors
2020-01-07 19:30:09 -05:00
Sally Cochenour
d2e3c832da
Merge next
2020-01-07 07:35:39 -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
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
James R
ac0d7cbc96
Create directories from -logfile too
2019-12-23 17:43:42 -08:00
James R
1da751bdd3
Let an asbolute path work with -logfile
2019-12-23 17:40:43 -08:00
James R
aaf2ef21b3
-logdir lets the user change the log directory
2019-12-23 17:21:58 -08:00
James R
c0b01f5a07
Change default log filename to not use a space
...
bleh
2019-12-23 15:34:27 -08:00
James R
746b1dab68
-logfile to let the user change the log file name
2019-12-23 15:31:50 -08:00
Jaime Passos
98f903b311
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-19 17:09:47 -03:00
Alam Ed Arias
37a264c30e
Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer
2019-12-19 10:24:04 -05:00
Jaime Passos
81ed4b38fc
Fix missing "-" prefix on "-software" cmdline parm
2019-12-17 18:04:05 -03:00
Jaime Passos
1002c47407
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-17 16:12:44 -03:00
Jaime Passos
db7242c240
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-17 15:14:22 -03:00
Eidolon
de12308eb8
[cmake] Use same executable names as Makefile
2019-12-15 00:39:04 -06: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
James R
cbf3c24297
Handle log file in parent properly
2019-12-13 16:51:49 -08:00
James R
ff73055b56
Add this back for Windoodoo because I'm an idiot
2019-12-13 15:04:31 -08:00
Jaime Passos
b47cc01f50
Separate non-powers-of-two draw routines into its own file
2019-12-13 13:11:56 -03:00
James R
a9679eb440
Rename signal caught message to be more obvious
2019-12-12 22:01:16 -08:00
James R
e13853e9ba
Fix signal handler setup error reporting
2019-12-12 21:57:54 -08:00
James R
6f2324d8df
Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place
2019-12-12 21:30:35 -08:00
James R
648f5221c7
Kill child when wait fails, so I_Error exits both
2019-12-12 21:21:25 -08:00
James R
11910e844c
Fix idiot mistake
2019-12-12 21:20:51 -08:00
James R
5d9cd1c72a
Move everything to i_system.c
...
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-12 15:08:27 -08:00