James R
737ea51ace
Merge remote-tracking branch 'origin/the-scary-22-merge' into sloped-camera
2020-10-04 16:32:19 -07:00
James R
94415facfe
Merge branch 'windows-console-go-brrr' into 'next'
...
Fix #178
Closes #178
See merge request STJr/SRB2!1112
2020-10-02 20:23:20 -04:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
68bd632bac
You have entered the comedy area
2020-09-24 16:49:34 -07:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
James R
9ad0a0660c
Just SetCurrentDirectory to the exe's folder on windoze
2020-08-31 01:23:56 -07:00
Sally Coolatta
528ed46661
Remove default dirs on Windows
...
Cause more issues than fixes. Still around for Linux.
2020-08-31 00:06:47 -04:00
Sal
4b9188b626
Merge branch 'discord-rpc-support' into 'next'
...
Discord Rich Presence
See merge request KartKrew/Kart-Public!207
2020-08-30 21:48:44 -04:00
Sally Coolatta
61d6ee0982
Misc changes to how the program runs
...
- Call DRPC_Init at the end of D_SRB2Main instead of in the middle
- Call Discord_RunCallbacks in D_SRB2Loop instead of G_Ticker
- Fix errorcount nums in I_Error, an old leftover from when Discord_Shutdown was not handled by I_AddExitFunction
2020-08-27 18:50:36 -04:00
James R
e4a522353f
Say DEFAULTDIR not .srb2kart
2020-08-26 23:37:52 -07:00
James R
45af41ef0c
Check DEFAULTDIR for srb2.srb after cwd
2020-08-26 20:20:40 -07:00
James R
288a6c1431
Merge branch 'fix-file-downloading' into 'next'
...
Fix bug where SRB2 would check size of disk from current directory instead of srb2home
See merge request STJr/SRB2!1121
2020-08-19 18:16:22 -04:00
SteelT
7cd1b99fdb
Quit on error fix
2020-08-18 22:45:57 -04:00
GoldenTails
2a27628232
Fix bug where SRB2 would check size of current directory instead of srb2home
...
Hopefully that fixes that one bug with weird filesize issues too
2020-08-18 17:34:32 -05:00
James R
2492bfe335
Copy the saved wad directory to srb2path
2020-08-17 21:27:59 -07:00
James R
a29785aec3
Save srb2path to %LOCALAPPDATA%\SRB2Kart\lastwaddir, and chdir here if srb2.srb cannot be found
...
Windows code goes brrr
2020-08-17 20:11:32 -07:00
Sally Coolatta
b5a378f850
Merge remote-tracking branch 'public/master' into discord-rpc-support
2020-08-16 22:12:36 -04:00
Sally Coolatta
632df264a3
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-16 20:57:31 -04:00
Sally Coolatta
f12501dfb6
SDL files
2020-08-15 06:02:39 -04:00
James R
7be58ca3ee
Use AsciiChar to get the input from windows console window
2020-08-13 21:57:36 -07:00
Sally Coolatta
7b4d84c3f3
Merge remote-tracking branch 'public/master'
2020-08-12 18:55:43 -04:00
James R
fa18f819b0
Merge branch 'clipboard-crash-fix-2' into 'next'
...
Fix buffer overrun in I_ClipboardPaste (resolves #205 )
Closes #205
See merge request STJr/SRB2!1105
2020-08-09 21:06:18 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
James R
f9e74e8ba2
Merge branch 'kill-cd-support' into 'next'
...
Kill CD support
See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
Jaime Passos
ed068a7664
Fix buffer overrun in I_ClipboardPaste
2020-08-08 15:36:01 -03:00
Steel Titanium
913c07959e
Kill CD support
2020-08-07 17:06:19 -04:00
James R
84d9aa93c7
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-11 17:41:46 -07:00
Steel Titanium
29d6b5c758
Merge branch 'master' into next
2020-07-06 12:13:00 -04:00
Steel Titanium
06f76f07f4
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2020-06-17 18:15:07 -04:00
lachwright
62183201c9
Allow macOS builds to be launched through Steam
2020-06-12 01:19:06 +08:00
Steel Titanium
468a9b96b7
Fix no previous prototype for TimeFunction
2020-06-08 19:56:24 -04:00
Hannu Hanhi
6961bba693
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
LJ Sonic
05e8d12427
Merge branch 'next' into 'better-download'
...
# Conflicts:
# src/sdl/i_system.c
# src/win32/win_sys.c
2020-06-01 08:16:53 -04:00
SteelT
9ff6af856e
Resolve conflicts on the SDL interface files.
2020-05-29 16:17:26 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Louis-Antoine
362adf4576
Allow resuming the most recent file transfer
2020-05-19 11:28:24 +02:00
James R
37fc2496de
Wait for threads before SDL_Quit (lol)
2020-05-13 17:25:52 -07:00
James R
3312743a66
Multithreading in my SRB2???
2020-05-13 17:21:19 -07:00
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
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
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
f29e5ebf26
Wait for threads before SDL_Quit (lol)
2020-04-27 18:03:10 -07:00
Sally Cochenour
f2aa2bb541
'sal-lighting' code ports from v2
2020-04-25 20:56:50 -04:00
James R
a4ef8dd401
Multithreading in my SRB2???
2020-04-17 20:05:29 -07: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
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
