toaster
|
e5bc0583e5
|
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
|
357ad68599
|
Merge branch 'patch_music' into 'next'
patch_music.pk3
See merge request STJr/SRB2!812
|
2020-05-10 12:51:49 -04:00 |
|
Hannu Hanhi
|
724e093ce8
|
Render stats cleanup
|
2020-05-02 23:14:08 +03:00 |
|
Hannu Hanhi
|
7e8543a408
|
More render stats for software mode, renamed and relocated some render stats variables
|
2020-05-02 23:13:53 +03:00 |
|
Hannu Hanhi
|
8dcc2fe20d
|
Move some render stats variables to better locations, add I_FinishUpdate timing
|
2020-05-02 23:13:32 +03:00 |
|
Hannu Hanhi
|
64a153fdee
|
Render stats
|
2020-05-02 23:13:08 +03:00 |
|
Louis-Antoine
|
c7cd53d5b2
|
Call rand() a few times after calling srand()
|
2020-04-27 14:22:45 +02:00 |
|
James R
|
fe9b933b97
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2020-04-24 22:10:59 -07:00 |
|
James R
|
536fb1ef2a
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-18 17:20:33 -07:00 |
|
fickleheart
|
be07a23e52
|
Make a separate function instead of clogging up IdentifyVersion
|
2020-04-09 20:56:27 -05:00 |
|
fickleheart
|
6845aca6e5
|
Make chdir usage consistent with other source usage
|
2020-04-09 20:52:23 -05:00 |
|
fickleheart
|
614449298e
|
Merge remote-tracking branch 'upstream/master' into netgame-urls
|
2020-04-09 20:48:52 -05:00 |
|
James R
|
e457b71e7e
|
Merge branch 'execcfg-fixes' into 'master'
ExecCfg fixes
See merge request STJr/SRB2!821
|
2020-04-09 21:24:12 -04:00 |
|
James R
|
aca39d6210
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-09 17:04:04 -07:00 |
|
James R
|
2dfe276a73
|
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 |
|
fickleheart
|
f32ab5918e
|
Define SERVER_URL_PROTOCOL const for easy reconfiguration
|
2020-03-21 07:47:29 -05:00 |
|
fickleheart
|
feb18208cb
|
Add support for srb2:// URL handler (server links)
|
2020-03-21 01:36:39 -05:00 |
|
Louis-Antoine
|
e3cbdf8fab
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
fickleheart
|
b9d7b3e5c5
|
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
|
10d08fc8bb
|
Merge branch 'master' into next
|
2020-03-02 15:26:01 -05:00 |
|
SteelT
|
7d14796954
|
Merge branch 'fix-ogllib' into 'master'
Fix -OGLlib
See merge request STJr/SRB2!794
|
2020-03-02 15:21:50 -05:00 |
|
LJ Sonic
|
60cd6fe986
|
Merge branch 'next' into 'resend-gamestate'
# Conflicts:
# src/d_clisrv.c
|
2020-03-01 12:35:53 -05:00 |
|
LJ Sonic
|
2cace6e147
|
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
|
21b28b6295
|
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
|
2020-02-29 23:41:16 -05:00 |
|
SwitchKaze
|
3106a92e8b
|
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
|
29d8389461
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
|
2020-02-29 13:43:47 +01:00 |
|
fickleheart
|
de789add8a
|
Fix menu enterwipes being overridden?
|
2020-02-24 18:00:52 -06:00 |
|
fickleheart
|
f8408f3c99
|
Fix ExecCfg not working on files added via command line
|
2020-02-24 11:44:45 -06:00 |
|
James R
|
711c8ed6b4
|
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
|
4244480d63
|
Add patch_music.pk3
|
2020-02-22 14:43:41 -08:00 |
|
Steel Titanium
|
03e38e9486
|
Enable use of the patch file
|
2020-02-22 16:42:24 -05:00 |
|
Steel Titanium
|
76f26cda24
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
Louis-Antoine
|
ec5b88e79f
|
Fix weird comment style
|
2020-02-21 17:17:39 +01:00 |
|
James R
|
2df4717f18
|
Fix NO_LUA compiling
|
2020-02-20 17:20:50 -08:00 |
|
Monster Iestyn
|
5c33ff0458
|
clarify the situation a bit more in the comments
|
2020-02-20 20:38:01 +00:00 |
|
Monster Iestyn
|
903cc311a7
|
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
|
7060083db5
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Louis-Antoine
|
12959ff4a9
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
|
2020-02-19 22:40:54 +01:00 |
|
Jaime Passos
|
adee6c3910
|
I forgot to save :]
|
2020-02-19 00:56:14 -03:00 |
|
Jaime Passos
|
8bd5193ee0
|
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
|
2020-02-19 00:55:46 -03:00 |
|
Steel Titanium
|
281d40d6d2
|
Merge branch 'master' into next
|
2020-02-18 22:03:08 -05:00 |
|
James R
|
c1a91cdc2e
|
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
|
8054f341a1
|
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
|
bd7b2fcb93
|
setrenderneeded is already cleared earlier
|
2020-02-17 22:33:36 -03:00 |
|
James R
|
b78fc670d0
|
Don't let console open with menu keys while the menu is open
|
2020-02-17 17:10:29 -08:00 |
|
James R
|
b2733eba73
|
Draw console in the Record/NiGHTS Attack menus
(cherry picked from commit 4efd915d28)
|
2020-02-17 16:37:29 -08:00 |
|
James R
|
a9a0601c84
|
Revert "Revert "Let the console open in menus""
This reverts commit 705cf9fd40.
|
2020-02-17 16:37:13 -08:00 |
|
Jaime Passos
|
00bdb41640
|
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
|
2020-02-17 12:28:16 -03:00 |
|
Jaime Passos
|
cac5f9d171
|
add -nogl parm
|
2020-02-17 12:14:51 -03:00 |
|
Jaime Passos
|
9e83e2751d
|
Clear setrenderneeded after calling VID_CheckRenderer
|
2020-02-17 00:36:10 -03:00 |
|
fickleheart
|
c4b390bc76
|
Merge remote-tracking branch 'upstream/master' into viewroll
|
2020-02-16 21:32:57 -06:00 |
|
James R
|
472d533d79
|
Merge remote-tracking branch 'origin/next' into public_next
|
2020-02-16 17:38:03 -08:00 |
|
James R
|
e245354c80
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-16 17:35:59 -08:00 |
|
James R
|
705cf9fd40
|
Revert "Let the console open in menus"
This reverts commit ef3d462eb7.
|
2020-02-16 17:14:54 -08:00 |
|
Steel Titanium
|
b44358df63
|
Update file hash yet again
|
2020-02-16 18:54:51 -05:00 |
|
Steel Titanium
|
3a82864ce9
|
Update comment
|
2020-02-16 11:34:02 -05:00 |
|
Steel Titanium
|
4281de3b89
|
Update file hashes
|
2020-02-09 21:29:46 -05:00 |
|
Jaime Passos
|
81a2a9e912
|
fix crash
|
2020-02-08 20:38:37 -03:00 |
|
Jaime Passos
|
9bc0592e56
|
don't free pu_cache.
|
2020-02-08 18:23:37 -03:00 |
|
Jaime Passos
|
b38f336dc5
|
why does this still exist?
|
2020-02-08 18:19:27 -03:00 |
|
James R
|
57492347ed
|
Don't I_Error on startup files only if a file was added twice
|
2020-02-01 19:32:08 -08:00 |
|
Louis-Antoine
|
d02c4c0cc7
|
Add "resendgamestate" command
|
2020-01-31 15:57:04 +01:00 |
|
fickleheart
|
bea7ad2185
|
Merge remote-tracking branch 'upstream/next' into viewroll
|
2020-01-26 18:01:58 -06:00 |
|
Monster Iestyn
|
ef53672deb
|
Merge branch 'master' into next
# Conflicts:
# src/g_game.c
|
2020-01-26 19:23:05 +00:00 |
|
Louis-Antoine
|
e8760fe5dd
|
Update Lua I/O support to 2.2
|
2020-01-22 23:08:57 +01:00 |
|
James R
|
f297f4ff56
|
Sonic is dead again
|
2020-01-21 12:24:24 -08:00 |
|
James R
|
c347254e80
|
Reorder Sonic's ass so the OpenGL wipe doesn't see garbage
|
2020-01-21 12:23:34 -08:00 |
|
fickleheart
|
d63aa1031e
|
Merge remote-tracking branch 'upstream/next' into viewroll
|
2020-01-17 18:27:15 -06:00 |
|
Alam Ed Arias
|
709489cab8
|
Merge branch 'master' into next
|
2020-01-16 12:08:36 -05:00 |
|
James R
|
36b9549b23
|
Merge branch 'locale-liberation' into 'master'
Locale liberation
Closes #113
See merge request STJr/SRB2!677
|
2020-01-15 23:38:40 -05:00 |
|
fickleheart
|
c25e969676
|
wip viewroll stuff
|
2020-01-14 23:29:56 -06:00 |
|
James R
|
2b95ea0135
|
Merge remote-tracking branch 'origin/master' into next
|
2020-01-12 14:17:52 -08:00 |
|
Monster Iestyn
|
9c8988ab57
|
Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff!
|
2020-01-11 18:48:47 +00:00 |
|
James R
|
ef3d462eb7
|
Let the console open in menus
|
2020-01-09 22:42:00 -08:00 |
|
fickleheart
|
f8a3e3b898
|
Merge remote-tracking branch 'origin/next' into next-newcontrols
|
2020-01-04 09:57:09 -06:00 |
|
fickleheart
|
f0e6a56b6b
|
Merge branch 'newcontrols' into next-newcontrols
|
2020-01-04 09:56:24 -06:00 |
|
James R
|
0c40a466d8
|
Merge remote-tracking branch 'origin/master' into next
|
2020-01-01 15:39:05 -08:00 |
|
James R
|
01be810aee
|
Merge branch 'warp-by-name' into 'master'
Properly fix the issue that !528 tried to; let the -warp parameter work with map name
See merge request STJr/SRB2!596
|
2020-01-01 17:51:21 -05:00 |
|
fickleheart
|
b22de48c03
|
Merge branch 'next' into next-newcontrols
# Conflicts:
# src/g_game.c
# src/p_setup.c
|
2019-12-31 12:58:36 -06:00 |
|
Jaime Passos
|
181a366d4a
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 18:39:31 -03:00 |
|
James R
|
fc8c0f8a9a
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 13:16:53 -08:00 |
|
fickleheart
|
e0f35d207f
|
Convert analog/directionchar cvars into 2-long arrays
|
2019-12-30 14:01:14 -06:00 |
|
James R
|
404f3c13e4
|
If we move the -warp code down, map searching can be used
|
2019-12-29 02:31:48 -08:00 |
|
Jaime Passos
|
e63f77ea1a
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-28 21:39:38 -03:00 |
|
Jaime Passos
|
2166571920
|
Add GTR_CUTSCENES. And I ran out of rule slots. Cool.
|
2019-12-28 20:33:28 -03:00 |
|
MascaraSnake
|
319ed09c00
|
Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions
|
2019-12-28 11:30:39 +01:00 |
|
Jaime Passos
|
03a3b02301
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-25 05:43:46 -03:00 |
|
Jaime Passos
|
3622829504
|
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
|
2019-12-24 17:55:46 -03:00 |
|
James R
|
75a5142aad
|
Merge branch 'wipes2' into 'master'
Wipe styles cleanup
See merge request STJr/SRB2!525
|
2019-12-24 14:47:14 -05:00 |
|
James R
|
1df31f2e98
|
Merge branch 'soundtest-fix' into 'master'
Init MUSICDEFs regardless of music state
See merge request STJr/SRB2!532
|
2019-12-24 14:44:08 -05:00 |
|
James R
|
9defd997c3
|
Merge branch 'fixsignalhandler' into 'master'
Handle signals correctly on linux
See merge request STJr/SRB2!530
|
2019-12-24 02:54:44 -05:00 |
|
Jaime Passos
|
7807424633
|
NUMGAMETYPES vs gametypecount
|
2019-12-18 12:30:01 -03:00 |
|
Jaime Passos
|
7bfdc2caa0
|
Gametype rules draft, mind the debug command
|
2019-12-18 01:25:57 -03:00 |
|
Jaime Passos
|
e359f802fd
|
Update comments
|
2019-12-17 16:14:26 -03:00 |
|
Jaime Passos
|
cc54163210
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-17 16:12:44 -03:00 |
|
James R
|
35053adfb2
|
Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place
|
2019-12-12 21:30:35 -08:00 |
|
Steel Titanium
|
eb787c2b59
|
Move S_InitMusicDefs call outside of the check.
As far as I know, this is competely safe.
|
2019-12-12 16:32:40 -05:00 |
|
Jaime Passos
|
bf520b9e33
|
Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
2019-12-12 17:30:19 -03:00 |
|
Jaime Passos
|
43946d9826
|
Merge remote-tracking branch 'origin/master' into wipes2
|
2019-12-11 12:57:59 -03:00 |
|
Jaime Passos
|
9248f12d55
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-10 23:01:10 -03:00 |
|