stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 11:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
6813 commits 172 branches 41 tags 285 MiB
Commit graph

6813 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
9908c001f7 Merge branch 'polyobj-netgame-crash-fix' into 'master' 
PolyObj netgame crash fix

See merge request STJr/SRB2Internal!217
 2019-04-05 07:29:47 -04:00
Monster Iestyn
212be85655 added "checkmobjs" boolean to both Polyobj_moveXY and Polyobj_rotate, so we can disable interaction with mobjs for netgames 2019-04-05 12:03:03 +01:00
Nev3r
1d401d8481 Merge branch '144-scrolltweaks' into 'master' 
Resolve "Let scrollers and wind/current affect front sector if untagged, and use texture offsets as parameters if different from 0"

Closes #144

See merge request STJr/SRB2Internal!213
 2019-04-05 06:41:11 -04:00
Nev3r
b1421c5708 Merge branch 'polyrotdisplacement' into 'master' 
Implement displacement-based polyobject rotation.

See merge request STJr/SRB2Internal!216
 2019-04-05 06:30:45 -04:00
Nev3r
fec991dedb Implement displacement-based polyobject rotation. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-05 11:50:59 +02:00
Monster Iestyn
07a66e5355 Merge branch 'public_next' 2019-04-02 15:49:15 +01:00
Monster Iestyn
ab0fe6b164 Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
Nev3r
6d95f3ceb2 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
42d25f67ca Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes 2019-03-31 12:29:55 -07:00
Nev3r
2966c99fd8 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
Monster Iestyn
7ae6d5ee8c Merge branch 'public_next' 
# Conflicts:
#	src/doomstat.h
#	src/g_game.c
 2019-03-28 14:19:02 +00:00
Alam Ed Arias
c9cee39745 Merge branch 'master' into next 2019-03-27 19:03:36 -04:00
Alam Ed Arias
4d34841a53 CircleCI: use libpng-dev 2019-03-27 18:51:20 -04:00
Alam Ed Arias
e6c6f048e4 CircleCI: Debian Jessie is dead, long live Debian Stretch 2019-03-27 18:23:03 -04:00
James R
917edf720d Don't close console when starting title screen 2019-03-26 13:05:19 -07:00
James R
9a350eb879 Don't close console when changing map 2019-03-26 13:04:11 -07:00
James R
69d7e98f34 Remove redundant CON_ClearHUD calls 2019-03-26 12:59:13 -07:00
James R
e8071e66e4 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
b9b36a44a8 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
587586f4bb Scroll console immediately upon pressing PageUp 2019-03-26 12:05:23 -07:00
Monster Iestyn
a01a0a3dc3 Merge branch 'master' into next 2019-03-26 13:46:15 +00:00
Monster Iestyn
9ef98471a4 Merge branch 'buildbot' into 'master' 
Buildbot changes

See merge request STJr/SRB2!477
 2019-03-26 09:44:56 -04:00
Monster Iestyn
8e78369f83 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
7758b28164 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
67874180b2 Merge branch 'gametype-strings-backport' into 'next' 
Gametype strings backport

See merge request STJr/SRB2!473
 2019-03-26 09:42:52 -04:00
James R
d00cc7cddb Prevent just anyone from skipping credits but allow admins 
exitlevel works too
 2019-03-25 16:19:40 -07:00
Monster Iestyn
8c1c0875a2 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
73fa35baf0 TravisCI: use stock sdl2_mixer for prebuild bottle 2019-03-25 16:59:47 -04:00
Alam Ed Arias
fd284f232e travisCI: add sdl2_mixer from mazmazz's srb2 tap 2019-03-25 16:43:33 -04:00
Alam Ed Arias
9de5055d7f TravisCI: install deps on sdl2_mixer 2019-03-25 16:30:02 -04:00
Alam Ed Arias
ec0afaf6c9 TravisCI: try updating homebew 2019-03-25 16:02:30 -04:00
Alam Ed Arias
3472bf857c TravisCI: build custom sdl2_mixer build 2019-03-25 15:51:13 -04:00
Alam Ed Arias
594c906376 use default osx image 2019-03-25 15:48:33 -04:00
Alam Ed Arias
3ab0f675ec TravisCI: move homebrew packages for all mac builds 2019-03-25 15:44:33 -04:00
Alam Ed Arias
a8681a5b72 CircleCI: rebuild depend file with BLUA 2019-03-25 15:34:25 -04:00
Alam Ed Arias
fe22fdc5a3 P_SuperDamage() is too big for inlining 2019-03-25 15:30:25 -04:00
Alam Ed Arias
c4e8a60112 CircleCI: also test compiling without BLUA support 2019-03-25 15:21:52 -04:00
Alam Ed Arias
9a8d36b822 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
147221cf6e R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them. 2019-03-25 18:54:47 +00:00
Monster Iestyn
7441dd7d9b Merge branch 'master' into next 2019-03-25 18:08:36 +00:00
Nev3r
b5a1030722 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
ed0f8fd967 Actually allow connecting to "localhost" 
Because IPv6 doesn't seem to work anyway.
 2019-03-20 20:37:00 -07:00
James R
f139ffd1dc Let localhost connections 2019-03-20 20:37:00 -07:00
Monster Iestyn
ecb6322a52 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
828691a7ac 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
1c55daef2a CMake: have funny check for empty CMAKE_SIZEOF_VOID_P 2019-03-19 09:10:25 -04:00
Alam Ed Arias
49dddf54ab CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac? 2019-03-19 00:04:14 -04:00
Alam Ed Arias
6142becb4d Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check" 
This reverts commit d03c53930b.
 2019-03-18 23:58:31 -04:00
Monster Iestyn
2fb569857a 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
d03c53930b Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check 2019-03-18 16:50:17 -04:00