Commit Graph

490 Commits

Author SHA1 Message Date
mikeyd 5d32ccffcf fix pkgconfig path for Debian Jessie 2016-02-06 17:25:27 -05:00
Alam Ed Arias f9d23370b6 debian: the data package should be native 2016-02-06 17:10:55 -05:00
Alam Ed Arias 5c09c31584 Debian: only just make srb2 depend on srb2-data (2.1.14-1)) 2016-02-06 14:56:16 -05:00
Alam Ed Arias 5d5956b650 debian: depend on srb2-data 2.1.14, not 2.1.4 2016-02-06 14:42:02 -05:00
Alam Ed Arias bac39b1bc0 debian: untested update for Debian packages 2016-02-06 12:31:44 -05:00
Alam Ed Arias e9048aec48 travis: premake the cache folder 2016-02-05 23:22:06 -05:00
Alam Ed Arias 6d26a60cbe travis: cache 7z SFX 2016-02-05 23:19:38 -05:00
Alam Ed Arias 7c1f1d9c8e travis: compile with warnings as errors, skip absolute-value warnings 2016-02-05 22:54:50 -05:00
Alam Ed Arias 07fc74eaf5 clang: fixup a few clang warnings 2016-02-05 22:38:40 -05:00
Alam Ed Arias 68054a49e3 clang: cleanup 2016-02-05 22:32:14 -05:00
Alam Ed Arias f4886657c1 clang: fixup a few clang warnings 2016-02-05 22:12:12 -05:00
Alam Ed Arias 864baeda05 cmake: fixed up to handle Clang and AppleClang 2016-02-05 21:49:24 -05:00
Alam Ed Arias 4d5f16330a travis: just run make 2016-02-05 21:33:00 -05:00
Alam Ed Arias a979e37586 travis: no space on 7z command 2016-02-05 21:28:19 -05:00
Alam Ed Arias ae75e3ee61 travis: mkdir , not make and cache the cccahe 2016-02-05 21:21:28 -05:00
Alam Ed Arias e913ca0ca6 travis: use wget and create cache folder 2016-02-05 21:15:32 -05:00
Alam Ed Arias 59d111b17d travis: restore missing config? 2016-02-05 21:11:00 -05:00
Alam Ed Arias 152c106cbd travis: restore language 2016-02-05 21:09:14 -05:00
Alam Ed Arias b6cc13fd2e travis: drop test 2016-02-05 21:07:46 -05:00
Alam Ed Arias a743f155ac travis: addd libgme to list 2016-02-05 21:00:46 -05:00
Alam Ed Arias 5e5c73fe18 travis: add SRB2 2.1.14 files 2016-02-05 20:50:35 -05:00
Alam Ed Arias 0bd16a5a0c travis: drop osx 2016-02-05 19:30:03 -05:00
Alam Ed Arias 45b181f889 travis: switch to trusty for linux os 2016-02-05 19:26:59 -05:00
Alam Ed Arias 522d2049de travis: add cmake 3.x package 2016-02-05 19:08:02 -05:00
Alam Ed Arias 1444067560 travis: use the correct packages 2016-02-05 18:50:02 -05:00
Alam Ed Arias 0003cea547 travis-ci: we need sudo 2016-02-05 18:43:18 -05:00
Alam Ed Arias 69937b41d2 travis: simple build config 2016-02-05 18:39:06 -05:00
Alam Ed Arias 662d40511d travis: let start building with travis 2016-02-05 18:02:36 -05:00
Inuyasha c05c43cfee Merge branch 'monster-misc' into 'master'
Monster Iestyn's Miscellaneous (netplay-compatible) changes

Just cleaning up some unused or unnecessary things left in the source code, see the commits for exact changes made if you like.

May add more stuff to this branch later, there's no rush really.

See merge request !39
2016-02-03 21:06:57 -05:00
Monster Iestyn 0455b572dc Removed weird test for water planes in HWR_Subsector
It crashes when you try to test it anyway, lol
2016-02-03 17:58:44 -08:00
Alam Ed Arias 2b41a40076 appveyor: no quote? 2016-01-31 20:25:32 -05:00
Alam Ed Arias 937c8f936b appveyor: updated to GCC 5.3 2016-01-31 20:15:10 -05:00
Monster Iestyn 2d94b2a85f keys.h doesn't need to be included twice here lol 2016-01-31 17:10:57 +00:00
Monster Iestyn deb958a796 Remove unused "INVERSECOLORMAP" macro 2016-01-31 17:06:03 +00:00
Monster Iestyn 9e29b69a29 Remove unused "firstnewseg" variable 2016-01-31 16:49:04 +00:00
Monster Iestyn 8b56cd76c7 doomtype.h tweaks
some of the mess in here really bothers me

(cherry-picking this commit of mine from next since it only fixes a small oversight with compiling and adds a comment)
2016-01-31 15:08:16 +00:00
Alam Ed Arias 82bfce7683 Merge remote-tracking branch 'magicgirl/master' 2016-01-29 20:29:28 -05:00
Inuyasha f500986692 use RGB for screen texture, not RGBA
the screen texture does not need an alpha channel.
the fact that it had one made OGL copy the topmost pixel of the screen texture's alpha channel.
which, naturally results in the screen becoming partially transparent and letting you see the working texture in the background.
2016-01-29 16:01:05 -08:00
Alam Ed Arias deca16f923 appveyor: let use short commits 2016-01-29 18:38:41 -05:00
Alam Ed Arias 0f83c2aeb5 appveyor: 7z, not 7 2016-01-29 12:53:39 -05:00
Alam Ed Arias b3ee8591f2 appveyor: ok, let set the var in after build step 2016-01-29 12:36:48 -05:00
Alam Ed Arias 01f2f4d444 appveyor: move naming of 7z to env block 2016-01-29 12:08:41 -05:00
Alam Ed Arias 3895202861 appveyor: let include the commit id 2016-01-29 12:00:05 -05:00
Alam Ed Arias 343c8a9498 appveyor: or not, let try this naming 2016-01-29 11:55:00 -05:00
Alam Ed Arias ba1cb80ff7 appveyor: name each 7z by version" 2016-01-29 11:47:35 -05:00
Alam Ed Arias 5582d715d4 appveyor: let have the build bot have the right username 2016-01-29 11:39:16 -05:00
Alam Ed Arias 4b8167d823 appveyor: let push a 7z in the after build step 2016-01-29 11:27:33 -05:00
Alam Ed Arias d7925104b9 appveyor: push build to FTP server 2016-01-29 11:09:46 -05:00
Alam Ed Arias 94d36fbe5b apveyor: no debug dump 2016-01-29 02:07:36 -05:00
Alam Ed Arias 62702edebe appveyor: I hope I do not need to debug this build xml again 2016-01-29 02:01:35 -05:00