Commit graph

1313 commits

Author SHA1 Message Date
Jaime Passos
f74adb0ad9 Fix logfiles crashing Windoze
(cherry picked from commit 3bb7fd4cbf2bb92f5548cafad00b80cb366395a4)
2020-03-24 15:49:29 -07:00
James R
7ef8e81713 Correct usage of logdir
(cherry picked from commit b7b4945c36fb95f406a365d64f109cfc83ad4d63)
2020-03-24 15:49:09 -07:00
James R
d1de8cc2eb Overwrite an already existing symlink
(cherry picked from commit f2c2836301d4dc59242d09f08a5473341c4d692c)
2020-03-24 15:49:08 -07:00
James R
10a9a05cd8 symlink latest-log.txt on nix, copy to the real log file everywhere else
(cherry picked from commit 25525a6aae84581ac03ca3089950ad4ff25b8512)
2020-03-24 15:49:08 -07:00
James R
294dfbacc5 Create directories from -logfile too
(cherry picked from commit 98cb238d36e0f85d9d4b4d2cff59c720e1630bdd)
2020-03-24 15:49:08 -07:00
James R
b4f93fea8e Let an asbolute path work with -logfile
(cherry picked from commit 5fbe77cdda7ec52bc2ca10ab9253df8dc56d2317)
2020-03-24 15:49:08 -07:00
James R
45a2e22abc -logdir lets the user change the log directory
(cherry picked from commit 457e986b7514c0e9fa921c1961344012443ac164)
2020-03-24 15:49:07 -07:00
James R
599452af7b Change default log filename to not use a space
bleh

(cherry picked from commit c285000c5668ab82545ec9ee4989aabf65e2585e)
2020-03-24 15:49:07 -07:00
James R
ccde660cdf -logfile to let the user change the log file name
(cherry picked from commit d9d13764e6840e036c095c6d87838a4dfede80f4)
2020-03-24 15:49:07 -07:00
toaster
5653a72141 * Resolve compiling issues with logmessages.
* Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)

(cherry picked from commit 113568095a609c662e33e67f311c94e28be127d9)
2020-03-24 15:43:07 -07:00
Steel Titanium
e9110b660c Better directory structure
(cherry picked from commit 8ee0a9309b289a1a3d1a7260a44a43c776180686)

# Conflicts:
#	src/m_menu.c
#	src/m_menu.h
#	src/m_misc.h
2020-03-24 15:36:44 -07:00
Jaime Passos
1a759a4904 GIF recording
(cherry picked from commit d467d2b2295a9660631774b9edb29555cc5c30fe)
2020-03-23 17:10:33 -07:00
James R
dd1715aa15 Optionally only resync Invincibility and Grow music 2020-03-21 22:28:55 -07:00
James R
e9c0e65e0e Only resync music if in a level 2020-03-21 22:28:54 -07:00
James R
d1dce97d15 Don't resync if it's disabled 2020-03-21 22:28:54 -07:00
James R
530cac8673 Hey it's audio- ....resynching... 2020-03-21 22:28:54 -07: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
Zachary McAlpin
72b9fc014b Call LUAh_GameQuit in I_GetEvent in if the event is SDL_Quit and if you are in a playing session
Time for the ultimate testing to see if I get any undefined reference compiling errors
2020-03-15 10:47:55 -05:00
Zachary McAlpin
2959e3d299 Revert "Let's just call LUAh_GameQuit in I_Quit anyways"
This reverts commit c76dfdf3c2.
2020-03-15 10:33:24 -05:00
Zachary McAlpin
c76dfdf3c2 Let's just call LUAh_GameQuit in I_Quit anyways 2020-03-15 00:39:46 -05:00
Zachary McAlpin
e5a5b4af42 Revert "Call `LUAh_GameQuit` in 2 places."
This reverts commit 917ba7e505.
2020-03-15 00:08:57 -05:00
Zachary McAlpin
917ba7e505 Call `LUAh_GameQuit` in 2 places. 2020-03-15 00:53:05 -04:00
fickleheart
33a9e5aa83 Merge remote-tracking branch 'upstream/master' into shaders-222
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
#	src/i_video.h
#	src/r_main.c
#	src/r_main.h
#	src/screen.c
#	src/sdl/i_video.c
#	src/sdl/ogl_sdl.c
#	src/w_wad.c
2020-03-14 12:52:15 -05:00
Monster Iestyn
12468abff5 update Makefile, CMakeLists.txt and MSVC project files 2020-03-08 19:48:23 +00:00
Jaime Passos
81a57d5fac Merge remote-tracking branch 'origin/next' into pictureformats 2020-03-07 20:43:16 -03: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
James R
a511d9358a Terrible code to show the ping counter for honest servers 2020-02-23 23:07:57 -08: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
b0ce2e088f Merge remote-tracking branch 'origin/next' into pictureformats 2020-02-19 02:25:36 -03:00
Jaime Passos
0813f59bd7 Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-19 00:55:46 -03: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
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