Monster Iestyn
fedbac6f64
Merge branch 'master' into next
2020-06-06 17:39:43 +01:00
Monster Iestyn
7dd0ba0f45
added liolib.c to the VC10 project files, since it was missing from them
2020-06-06 17:38:35 +01:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
MascaraSnake
7ea005fdc1
Merge branch 'fix-window-icon' into 'master'
...
Fix window icon being reset when switching renderers on non-Windows platforms
See merge request STJr/SRB2!898
2020-05-13 04:14:51 -04:00
James R
ffd88746da
Update version names, SUBVERSION, MODVERSION
2020-05-11 14:41:36 -07:00
Monster Iestyn
398770b952
Fix logging on Mac
...
These fixes were suggested by Sveciaost on #mac-users on Discord
2020-05-10 16:47:01 +01:00
Monster Iestyn
f218920395
Update version number to 2.2.3 in all the usual files, also updated MODVERSION
2020-05-10 16:02:23 +01:00
Steel Titanium
3a4a8cd948
Fix window icon being reset when switching renderers on non-Windows platforms
2020-04-26 18:46:43 -04:00
Louis-Antoine
71d445a59e
Fix mouse being grabbed in intermission and cutscenes
2020-04-24 18:33:35 +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
Monster Iestyn
ffb2674a6e
Merge branch 'next' into demos-refactor
...
# Conflicts:
# src/g_game.c
(also update g_demo.c)
2020-03-20 17:48:31 +00:00
Monster Iestyn
8ae098a1e3
update Makefile, CMakeLists.txt and MSVC project files
2020-03-19 20:13:39 +00:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Monster Iestyn
12468abff5
update Makefile, CMakeLists.txt and MSVC project files
2020-03-08 19:48:23 +00: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
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
Steel Titanium
c7778af7d6
Update version number to 2.2.2
2020-02-22 16:37:13 -05:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Jaime Passos
f8f812be34
Set the palette :)
2020-02-17 22:31:34 -03:00
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
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
Louis-Antoine
4777829d45
Fix mouse in controls setup menu
2020-01-18 20:18:20 +01: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
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