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
|
f0cf62672a
|
Merge branch 'next' into 'resend-gamestate'
# Conflicts:
# src/d_clisrv.c
|
2020-03-01 12:35:53 -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 |
|
Louis-Antoine
|
fc07604031
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
|
2020-02-29 13:43:47 +01: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 |
|
James R
|
4f40edaf01
|
Maybe localdisplayplayers is a bad idea
|
2020-02-23 23:21:20 -08:00 |
|
James R
|
f164320c88
|
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
|
2020-02-23 23:20:20 -08:00 |
|
James R
|
c69ca7381c
|
Merge branch 'console-in-menus-mk-ii' into 'master'
Console in menus again!
See merge request STJr/SRB2!797
|
2020-02-23 18:15:43 -05:00 |
|
James R
|
ac4cb796d0
|
Add patch_music.pk3
|
2020-02-22 14:43:41 -08:00 |
|
Steel Titanium
|
4f5694fa14
|
Enable use of the patch file
|
2020-02-22 16:42:24 -05:00 |
|
Steel Titanium
|
fc042e90f0
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
Louis-Antoine
|
325872de4e
|
Fix weird comment style
|
2020-02-21 17:17:39 +01:00 |
|
James R
|
168a1325f7
|
Fix NO_LUA compiling
|
2020-02-20 17:20:50 -08:00 |
|
Monster Iestyn
|
8eb80cbf75
|
clarify the situation a bit more in the comments
|
2020-02-20 20:38:01 +00:00 |
|
Monster Iestyn
|
7ee6ff2b03
|
move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified
|
2020-02-20 20:31:11 +00:00 |
|
James R
|
2274129f57
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Louis-Antoine
|
a09d46a092
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
|
2020-02-19 22:40:54 +01:00 |
|
Jaime Passos
|
96fbe55b69
|
I forgot to save :]
|
2020-02-19 00:56:14 -03:00 |
|
Jaime Passos
|
0813f59bd7
|
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
|
2020-02-19 00:55:46 -03:00 |
|
Steel Titanium
|
42f141d32f
|
Merge branch 'master' into next
|
2020-02-18 22:03:08 -05:00 |
|
James R
|
f39785672d
|
Merge branch 'setrenderneeded-fix' into 'master'
Clear setrenderneeded after calling VID_CheckRenderer
See merge request STJr/SRB2!793
|
2020-02-18 21:53:14 -05:00 |
|
James R
|
1bc6f2cd91
|
Merge branch 'startup-file-not-found' into 'master'
Fix the issue !678 did, but just don't exit if the file was added twice
See merge request STJr/SRB2!753
|
2020-02-18 21:50:11 -05:00 |
|
Jaime Passos
|
a922194282
|
setrenderneeded is already cleared earlier
|
2020-02-17 22:33:36 -03:00 |
|
James R
|
b9c2cab265
|
Don't let console open with menu keys while the menu is open
|
2020-02-17 17:10:29 -08:00 |
|
James R
|
c77e444df9
|
Draw console in the Record/NiGHTS Attack menus
(cherry picked from commit 4efd915d28d0f193528d141b04c5f88b84877f97)
|
2020-02-17 16:37:29 -08:00 |
|
James R
|
2d98b3f9eb
|
Revert "Revert "Let the console open in menus""
This reverts commit 73368b0c9a.
|
2020-02-17 16:37:13 -08: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
|
1c48480944
|
Clear setrenderneeded after calling VID_CheckRenderer
|
2020-02-17 00:36:10 -03:00 |
|
fickleheart
|
51ef6b3684
|
Merge remote-tracking branch 'upstream/master' into viewroll
|
2020-02-16 21:32:57 -06:00 |
|
James R
|
fe43dd8306
|
Merge remote-tracking branch 'origin/next' into public_next
|
2020-02-16 17:38:03 -08:00 |
|
James R
|
39a0e8b3e1
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-16 17:35:59 -08:00 |
|
James R
|
73368b0c9a
|
Revert "Let the console open in menus"
This reverts commit 3a9cc8db92.
|
2020-02-16 17:14:54 -08:00 |
|
Steel Titanium
|
6eff91c4fc
|
Update file hash yet again
|
2020-02-16 18:54:51 -05:00 |
|