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
6318 commits 172 branches 41 tags 285 MiB
Commit graph

6318 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Ed Arias
b8b605a9c7 Merge branch 'apng-conditional-disable' into 'master' 
Disable the APNG code if the version of libpng is greater than 1.4.

See merge request STJr/SRB2!457
 2019-01-20 17:00:50 -05:00
Sryder
b18a8dbc8d Disable the APNG code if the version of libpng is greater than 1.4. 
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
 2019-01-20 18:50:28 +00:00
james
356249dade Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
Jimita
424b2b1aaf
Merge branch 'next' into flashpals-on-screenshots 2019-01-16 05:59:05 -02:00
Steel Titanium
fad341b0e9 Fix skins overflow 2019-01-15 14:29:43 -05:00
fickleheart
7e026824a4 Fix rendering gaps on polys with upper/lower textures 2019-01-12 20:15:58 -05:00
Digiku
2e066876d4 Merge branch 'master-20190101' into 'master' 
Post-2.1.23 public next merge (20190101)

Closes #46, #47, #45, #43, and #37

See merge request STJr/SRB2Internal!209
 2019-01-11 18:09:30 -05:00
Monster Iestyn
f3796dc7f6 revert to LF_SAVEGAME system code, removing all traces of saveoverride 
(I believe Sal wanted us to do this anyway, so...)
 2019-01-08 17:14:21 +00:00
mazmazz
a050ed956a Fixed Addons Menu icons for search bar 2019-01-08 01:31:44 -05:00
mazmazz
47bd042a7e Misssed alwaysfreelook defaults (first person) 2019-01-08 01:29:12 -05:00
mazmazz
d5de5e9f49 Fix player.dta SIGNA0 overwriting regular end sign frame 2019-01-08 00:19:42 -05:00
mazmazz
e02fd489a7 GCC 7 fallthru bypasses (-Werror-implicit-fallthrough) 2019-01-07 23:06:47 -05:00
mazmazz
8ea8bf2587 Chat arrow offsets 2019-01-07 22:34:48 -05:00
mazmazz
5066e340f4 Update SRB2-CHAT nickname colors to 2.2 skincolors 2019-01-07 22:26:39 -05:00
mazmazz
e403d1bacc Correct addons menu back color 2019-01-07 21:58:42 -05:00
mazmazz
dfc427e81a Dummy out SRB2-CHAT console colors 
Pending translation to 2.2 palette indexes
 2019-01-07 21:54:38 -05:00
mazmazz
411b1b4f54 Addons menu merge fixes 2019-01-07 21:45:41 -05:00
mazmazz
a775a63dfd WIP hu_stuff merge fixes 2019-01-07 17:56:55 -05:00
mazmazz
875aee60a0 Menu merge fixes 2019-01-07 17:56:43 -05:00
mazmazz
b3f7b169b2 Merge errors for compile 2019-01-07 17:05:20 -05:00
Digiku
4f0be1b064 Update f_finale.c - Small credits update 2019-01-07 16:50:59 -05:00
mazmazz
7aa55f24f5 Resolve r_data.c colormap conflict 2019-01-07 15:29:37 -05:00
Nev3r
7d09149b04 Solved conflicts related to PK3s 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-01-07 19:00:31 +01:00
Monster Iestyn
9effa134d2 resolve the conflict in p_spec.c 2019-01-07 17:02:05 +00:00
Monster Iestyn
96ad8dd81a resolve conflict in r_main.c 2019-01-07 16:52:46 +00:00
Digiku
1c1331199d Update f_finale.c - Remove Torgo's real name by request 2019-01-07 03:41:25 -05:00
mazmazz
015e7b9862 Resolve p_setup and d_netcmd conflicts (20190101 public merge) 2019-01-07 03:07:24 -05:00
mazmazz
e18eb69a0b Resolved filesrch.c conflicts (20190101 public merge) 2019-01-07 02:54:26 -05:00
mazmazz
e9150b6645 Resolve m_menu.c conflicts (20190101 public merge) 2019-01-07 02:31:45 -05:00
Steel Titanium
7d1e59d4ba Some few changes 2019-01-05 23:42:25 -05:00
mazmazz
2592f42a17 Remove unnecessary version info call 2019-01-05 19:56:27 -05:00
mazmazz
20879f1f40 Remove zlib from release brew packages 
(it was never in the original travis script)
 2019-01-05 19:49:25 -05:00
mazmazz
17cde328c1 Use standard OSX brew bottles to speed up test buildbots 2019-01-05 19:43:37 -05:00
mazmazz
9ef7d2e6ba OS X set CFLAGS+="-march=core2" for compatible binaries with old Macs 2019-01-05 19:34:39 -05:00
mazmazz
0834dbc194 * Add homebrew tap mazmazz/srb2 
* Use sdl2_mixer from mazmazz/srb2 due to removed options from homebrew-core
* Use `brew install --build-bottle` to build compatible libraries for old Macs
 2019-01-05 19:20:58 -05:00
mazmazz
97f8448b72 Don't terminate in after_success because it halts the log abruptly 2019-01-05 10:17:33 -05:00
mazmazz
abaa8730a5 Revised comments 2019-01-05 09:54:45 -05:00
mazmazz
578a4fe80d Merge remote-tracking branch 'public-gl/master' into travis-deployer 2019-01-05 09:08:34 -05:00
mazmazz
db71ba71c9 Add libopenmpt to osx buildbot 2019-01-04 23:34:08 -05:00
mazmazz
6d985d3d4d Enable libopenmpt for circleCI 2019-01-04 21:34:07 -05:00
Marco Z
882355d24b Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC 2019-01-04 21:18:55 -05:00
mazmazz
2f16cf3c42 Enable libopenmpt for buildbots 2019-01-04 20:53:33 -05:00
Marco Z
09ed8bd046 Add LibGME to DD vc10 project 2019-01-04 20:43:45 -05:00
Marco Z
88c4a54cea Add GME to VC10 SRB2SDL project 2019-01-04 20:43:42 -05:00
Digiku
d5870e6f8a Merge branch 'changecontrol-text-overflow-fix' into 'master' 
Resolve buffer overflow crash when configuring System Menu and GIF controls

See merge request STJr/SRB2!445
 2019-01-04 19:39:17 -05:00
Digiku
c97dc5d3c4 Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
mazmazz
16ae83ba9c FindOPENMPT cmake 2019-01-04 19:22:48 -05:00
mazmazz
2ff946bebc Notes for Ubuntu backporting libopenmpt 2019-01-04 18:43:48 -05:00
mazmazz
87c015e340 MUS_MODPLUG fix 2019-01-04 18:39:09 -05:00
mazmazz
14a361cb6d Disable OpenMPT for buildbots, for now 2019-01-04 01:48:20 -05:00