Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
toaster
67e01ad66e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
...
# Conflicts:
# src/m_menu.c
2020-05-11 15:00:31 +01:00
Lachlan Wright
7df8c24a9b
Merge branch 'patch_music' into 'next'
...
patch_music.pk3
See merge request STJr/SRB2!812
2020-05-10 12:51:49 -04:00
Sally Coolatta
4ae81ff236
Add menu for selecting cup & other options
2020-05-09 20:03:14 -04:00
Sally Coolatta
4a3262da41
Initial GP commit
...
Has a rudimentary option in the menu, which spawns the specific bots & spawns you on Green Hills in singleplayer.
2020-05-09 03:42:51 -04:00
Hannu Hanhi
cfafe90e78
Render stats cleanup
2020-05-02 23:14:08 +03:00
Hannu Hanhi
1350b89a06
More render stats for software mode, renamed and relocated some render stats variables
2020-05-02 23:13:53 +03:00
Hannu Hanhi
1a741f8883
Move some render stats variables to better locations, add I_FinishUpdate timing
2020-05-02 23:13:32 +03:00
Hannu Hanhi
e5531714df
Render stats
2020-05-02 23:13:08 +03:00
James R
18ced99463
Put some mutex on CONS_Printf etc. hahaha
2020-04-28 13:08:43 -07:00
Louis-Antoine
41253ee689
Call rand() a few times after calling srand()
2020-04-27 14:22:45 +02:00
James R
29bf51bc99
Make mod update, room list and server list multithreaded
...
This took fucking ages and it still fails sometimes in edge cases, but I
don't give a FUCK right now.
2020-04-26 19:46:35 -07:00
James R
6613b19220
Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked
2020-04-26 01:16:27 -07:00
James R
eb0ba37dce
Merge remote-tracking branch 'origin/master' into HEAD
2020-04-24 22:10:59 -07:00
Wolfy
5b7ce81809
FUCKING-
2020-04-22 02:00:44 -05:00
Wolfy
17236595e4
ASHNAL
2020-04-22 01:31:55 -05:00
Ashnal
abc17c9448
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05: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
28b1e8de1c
Merge remote-tracking branch 'origin/master' into next
2020-04-18 17:20:33 -07:00
Sally Cochenour
96d69785bf
Merge branch 'master' into pet-robo
2020-04-18 01:18:22 -04:00
Steel Titanium
71f21dd81b
Fix compile errors
2020-04-13 23:07:38 -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
fickleheart
1844aa1445
Make a separate function instead of clogging up IdentifyVersion
2020-04-09 20:56:27 -05:00
fickleheart
8001511b7c
Make chdir usage consistent with other source usage
2020-04-09 20:52:23 -05:00
fickleheart
4db9ceca03
Merge remote-tracking branch 'upstream/master' into netgame-urls
2020-04-09 20:48:52 -05:00
James R
0596dbd137
Merge branch 'execcfg-fixes' into 'master'
...
ExecCfg fixes
See merge request STJr/SRB2!821
2020-04-09 21:24:12 -04: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
James R
4a3a4c0801
This won't be needed
2020-03-31 15:50:39 -07:00
James R
e4094bc2a9
Remove some redundant code
2020-03-31 15:26:22 -07:00
James R
735dd26dc6
Put downloads in addons/downloads instead of DOWNLOAD
2020-03-31 15:23:24 -07:00
Sally Cochenour
9e2c119b56
Merge branch 'master' into pet-robo
2020-03-29 20:44:13 -04:00
Sal
eb9144338a
Merge branch 'logs-port' into 'master'
...
2.2 directory structure and log files port
See merge request KartKrew/Kart!224
2020-03-28 22:16:50 -04:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04: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
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
James R
d46c6dc384
Kill trailing whitespace
2020-03-21 17:37:33 -07:00
James R
310a9cd09c
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 17:22:57 -07:00
Sal
bda7dc9ddf
Merge branch 'colors-yet-again' into 'master'
...
Another round of small color tweaks
See merge request KartKrew/Kart!208
2020-03-21 19:03:27 -04:00
fickleheart
ee754b211f
Define SERVER_URL_PROTOCOL const for easy reconfiguration
2020-03-21 07:47:29 -05:00
fickleheart
8219268f2e
Add support for srb2:// URL handler (server links)
2020-03-21 01:36:39 -05:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01: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
Steel Titanium
3d623577fb
Merge branch 'master' into next
2020-03-02 15:26:01 -05: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
LJ Sonic
e0f3a5b8f5
Merge branch 'lua-io' into 'next'
...
Support for Lua's I/O library
See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
SwitchKaze
9508b23d85
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-29 23:41:16 -05:00
SwitchKaze
044e19e328
Prohibit modification of built-in colors
...
In addition, fixes a bug where loading a custom color using command line params exhibits strange behavior.
2020-02-29 23:14:49 -05:00
fickleheart
782c710246
Fix menu enterwipes being overridden?
2020-02-24 18:00:52 -06:00
fickleheart
d3218a2431
Fix ExecCfg not working on files added via command line
2020-02-24 11:44:45 -06:00
