Commit graph

3239 commits

Author SHA1 Message Date
Sryder
913d5dd595 OpenGL sprite billboarding
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
2019-05-01 20:15:00 +01:00
Steel Titanium
877e149908 Don't enable UPnP support if NONET is defined. 2019-04-16 15:05:09 -04:00
James R
b28221bdb2 Don't count down wait timer when executing a command 2019-04-14 15:17:47 -07:00
Monster Iestyn
e501d9c6af Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a.
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)
2019-04-14 16:39:14 +01:00
Monster Iestyn
4f58d00eec Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
Nev3r
00e90db72a Merge branch 'less-obtuse-console-fixes' into 'master'
Console quality of life changes

See merge request STJr/SRB2!479
2019-03-31 16:15:05 -04:00
James R
aa82d67fca Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes 2019-03-31 12:29:55 -07:00
Nev3r
938e4477f6 Merge branch 'do-not-disturb-console' into 'master'
Keep console open in certain instances

See merge request STJr/SRB2!480
2019-03-31 05:54:11 -04:00
Alam Ed Arias
247c9429d2 Merge branch 'master' into next 2019-03-27 19:03:36 -04:00
Alam Ed Arias
8d51de4993 CircleCI: use libpng-dev 2019-03-27 18:51:20 -04:00
Alam Ed Arias
af1682d758 CircleCI: Debian Jessie is dead, long live Debian Stretch 2019-03-27 18:23:03 -04:00
James R
7ebf19fd00 Don't close console when starting title screen 2019-03-26 13:05:19 -07:00
James R
841daf940f Don't close console when changing map 2019-03-26 13:04:11 -07:00
James R
d7ad7a4f40 Remove redundant CON_ClearHUD calls 2019-03-26 12:59:13 -07:00
James R
f995e8c241 Resize console upon resolution change
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
2019-03-26 12:30:02 -07:00
jameds
a8aea17469 Keep color across wrapped lines
And this works by inserting the same color code on each wrapped line.
2019-03-26 12:07:11 -07:00
jameds
f6143dafb0 Scroll console immediately upon pressing PageUp 2019-03-26 12:05:23 -07:00
Monster Iestyn
7ef12f7dd7 Merge branch 'master' into next 2019-03-26 13:46:15 +00:00
Monster Iestyn
0194922509 Merge branch 'buildbot' into 'master'
Buildbot changes

See merge request STJr/SRB2!477
2019-03-26 09:44:56 -04:00
Monster Iestyn
a1c30e3b6a Merge branch 'dedicated-server-credits-fix' into 'master'
Dedicated server credits fix

See merge request STJr/SRB2!476
2019-03-26 09:44:21 -04:00
Monster Iestyn
8e51cad3d6 Merge branch 'mi-side-discolor-fix' into 'master'
MI's side discolor fix

See merge request STJr/SRB2!475
2019-03-26 09:43:20 -04:00
Monster Iestyn
e0ae13306a Merge branch 'gametype-strings-backport' into 'next'
Gametype strings backport

See merge request STJr/SRB2!473
2019-03-26 09:42:52 -04:00
Monster Iestyn
9da1033467 Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way 2019-03-25 21:35:04 +00:00
Alam Ed Arias
e8a527b6dc TravisCI: use stock sdl2_mixer for prebuild bottle 2019-03-25 16:59:47 -04:00
Alam Ed Arias
05d2dcca97 travisCI: add sdl2_mixer from mazmazz's srb2 tap 2019-03-25 16:43:33 -04:00
Alam Ed Arias
208a835479 TravisCI: install deps on sdl2_mixer 2019-03-25 16:30:02 -04:00
Alam Ed Arias
15dbe3730b TravisCI: try updating homebew 2019-03-25 16:02:30 -04:00
Alam Ed Arias
e47bf6274f TravisCI: build custom sdl2_mixer build 2019-03-25 15:51:13 -04:00
Alam Ed Arias
d69d834c6a use default osx image 2019-03-25 15:48:33 -04:00
Alam Ed Arias
45c641204b TravisCI: move homebrew packages for all mac builds 2019-03-25 15:44:33 -04:00
Alam Ed Arias
042b30c6e5 CircleCI: rebuild depend file with BLUA 2019-03-25 15:34:25 -04:00
Alam Ed Arias
17768854e0 P_SuperDamage() is too big for inlining 2019-03-25 15:30:25 -04:00
Alam Ed Arias
0fbca9a84b CircleCI: also test compiling without BLUA support 2019-03-25 15:21:52 -04:00
Alam Ed Arias
853855eb69 Travis-CI: use a new version of xcode and use homebrew add-on to install packages 2019-03-25 15:16:43 -04:00
Monster Iestyn
fa3349a117 R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them. 2019-03-25 18:54:47 +00:00
Monster Iestyn
7c36a2a99e Merge branch 'master' into next 2019-03-25 18:08:36 +00:00
Nev3r
64353bf373 Merge branch 'allow-localhost' into 'master'
Allow connecting to localhost / 127.0.0.1

See merge request STJr/SRB2!474
2019-03-23 05:16:44 -04:00
James R
6939dca52a Actually allow connecting to "localhost"
Because IPv6 doesn't seem to work anyway.
2019-03-20 20:37:00 -07:00
James R
25bd4a0876 Let localhost connections 2019-03-20 20:37:00 -07:00
Monster Iestyn
ce37e4c9c8 Merge branch 'sdl-noxinput-nohidapi' into 'master'
-noxinput and -nohidapi command line parameters.

See merge request STJr/SRB2!468
2019-03-20 17:33:04 -04:00
Monster Iestyn
fa6f9062fe Merge branch 'errorifpng' into 'master'
Error if the lump is a PNG lump

See merge request STJr/SRB2!466
2019-03-20 16:26:28 -04:00
Alam Ed Arias
94e29d1bb4 CMake: have funny check for empty CMAKE_SIZEOF_VOID_P 2019-03-19 09:10:25 -04:00
Alam Ed Arias
727d9cae23 CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac? 2019-03-19 00:04:14 -04:00
Alam Ed Arias
4cb71746a7 Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"
This reverts commit 7d14342a8f.
2019-03-18 23:58:31 -04:00
Monster Iestyn
5d059da843 Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
2019-03-18 22:00:23 +00:00
Alam Ed Arias
7d14342a8f Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check 2019-03-18 16:50:17 -04:00
Steel Titanium
4757031929 Remove the define. 2019-03-15 18:46:25 -04:00
Steel Titanium
4837c1742b Merge branch 'master' into errorifpng 2019-03-15 16:40:47 -04:00
Steel Titanium
adcc8fe0d8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command 2019-03-15 16:13:31 -04:00
Jimita
bced3656f2 Merge branch 'next' into flashpals-on-screenshots 2019-03-15 16:38:33 -03:00