James R
9056ca0525
Merge remote-tracking branch 'origin/master' into http-mserv
2020-05-12 17:50:32 -07:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Alam Ed Arias
2a116ac847
Tested to be compile with Mingw64 9.1.0
...
(cherry picked from commit 5a79a446dfc3632de3e27567afd65d9782510739)
2020-05-11 18:43:24 -07: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
Sally Coolatta
b4f8d708a4
Merge branch 'master' into new-menus
2020-05-09 17:04:10 -04:00
Hannu Hanhi
c5c45a1fb0
Implement I_GetTimeMicros without affecting I_GetTime behaviour details
2020-05-02 23:14:20 +03:00
Hannu Hanhi
e5531714df
Render stats
2020-05-02 23:13:08 +03:00
James R
a1502046cf
Merge remote-tracking branch 'origin/master' into resume
2020-04-30 09:32:40 -07:00
Zachary McAlpin
ebadb85e00
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-28 18:31:15 -05:00
James R
f29e5ebf26
Wait for threads before SDL_Quit (lol)
2020-04-27 18:03:10 -07:00
James R
3a54cbd7a1
Create cond if it doesn't exist when signaling
2020-04-27 18:01:27 -07:00
Steel Titanium
28e51c2d9e
Support for http downloads
...
(cherry picked from commit 5e0eca9fe9 )
(cherry picked just the libcurl stuff)
2020-04-26 20:01:15 -07:00
Steel Titanium
3a4a8cd948
Fix window icon being reset when switching renderers on non-Windows platforms
2020-04-26 18:46:43 -04:00
Sally Cochenour
f2aa2bb541
'sal-lighting' code ports from v2
2020-04-25 20:56:50 -04:00
James R
eb0ba37dce
Merge remote-tracking branch 'origin/master' into HEAD
2020-04-24 22:10:59 -07:00
Wolfy
98183fef6f
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_main.c
# src/hardware/r_opengl/r_opengl.c
2020-04-24 18:10:25 -05:00
Louis-Antoine
71d445a59e
Fix mouse being grabbed in intermission and cutscenes
2020-04-24 18:33:35 +02:00
Hannu Hanhi
74b846a6e3
Sky dome from SRB2
2020-04-22 00:18:58 +03:00
wolfs
fb0e699aec
Merge branch 'fixsignalhandler-resurrection' into 'awful-mix'
...
2.2 signal handler
See merge request SinnamonLat/Kart-Public!11
2020-04-20 22:42:59 -04:00
James R
a4ef8dd401
Multithreading in my SRB2???
2020-04-17 20:05:29 -07:00
wolfs
4a264ffba9
Merge branch 'http-downloads' into 'awful-mix'
...
Support for http downloads
See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
Wolfy
5e4ec61d82
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
Hannu Hanhi
6bf90fc441
Batching!
2020-04-12 03:09:07 +03:00
Zachary McAlpin
b6a2c21db7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-09 20:12:11 -05: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
Steel Titanium
5e0eca9fe9
Support for http downloads
2020-04-07 18:22:29 -04:00
Sally Cochenour
896f752d94
Fix the compile errors I got
...
- void out link variable in non-unix to prevent unused variable error
- change n's type to size_t from int to prevent unsigned signed comparison
2020-03-29 08:39:15 -04:00
James R
61be09e6bf
Merge remote-tracking branch 'origin/master' into gifs-port
2020-03-28 21:00:39 -07:00
Zachary McAlpin
61447c20be
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Jaime Passos
21a3067936
Fix M_PathParts instead
...
(cherry picked from commit 244f0b228fefb69fb59c1f7f70d4815c0388a634)
2020-03-24 15:49:29 -07:00
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