Alam Ed Arias
23c9892fea
travis-ci: fixup os list
2016-03-25 20:02:57 -04:00
Alam Ed Arias
9162e7da9d
travis-ci: move dist setting to top
2016-03-25 19:56:51 -04:00
Alam Ed Arias
dfa41ed878
travis-ci: drop libpng for osx
2016-03-25 19:56:05 -04:00
Alam Ed Arias
8d36a77e42
travis-ci: libpng, not libsdl
2016-03-25 19:53:13 -04:00
Alam Ed Arias
73dd5cd803
travis-ci: add brew packages
2016-03-25 19:48:39 -04:00
Alam Ed Arias
0953c9430b
travis-ci: try osx building
2016-03-25 19:16:35 -04:00
Monster Iestyn
5dd0e533b3
Removed unused "supdate" variable
2016-03-15 21:18:25 +00:00
Alam Ed Arias
19e82bc866
Merge remote-tracking branch 'origin/master'
2016-03-14 21:57:49 -04:00
Alam Ed Arias
c4e54d52e7
comptime.bat: restore echo off
2016-03-14 21:54:53 -04:00
wolfy852
bbe93a6d31
comptime.bat: Put @echo off back in
2016-03-14 20:36:37 -05:00
Alam Ed Arias
873fa10fe1
comptime.bat: Windows 8.1 sucks
2016-03-14 17:48:33 -04:00
Inuyasha
2f21c24d77
Makefile can run comptime.bat from src\ too
2016-03-14 12:44:40 -04:00
Inuyasha
7e174290d7
SVN needs the revision prefixed with 'r'
2016-03-14 12:44:16 -04:00
Inuyasha
2ecdd9e6f9
Branch and revision information in builds
...
Also makes comptime.bat work with git if able.
Development builds will now show the branch and the SHA1 hash of the revision. Also been tested to work with subversion, where it displays "Subversion r####". You know, just in case.
2016-03-14 12:43:08 -04:00
Alam Ed Arias
f5b56f2a07
fixup
2016-03-14 12:28:22 -04:00
Alam Ed Arias
f9949a3026
dropping NOVERSION, you will not build SRB2 without a SCM
2016-03-14 12:24:51 -04:00
Alam Ed Arias
ee5190480d
Merge branch 'cmake-fix' into 'master'
...
Cmake fix
This branch SHOULD fix issue #14 , but I haven't been able to check for myself without any GME stuff to test in-game with.
See merge request !58
2016-03-10 18:00:51 -05:00
Alam Ed Arias
ab4179dfb0
Merge branch 'travis-ci'
2016-03-10 16:46:57 -05:00
Alam Ed Arias
509516f59f
travis: enable apt and ccache cache
2016-03-10 16:38:06 -05:00
Alam Ed Arias
fbbc028ff2
Merge branch 'master' into cmake-fix
2016-03-07 16:17:38 -05:00
Alam Ed Arias
c7b18207f5
travis: do not error on making cache folder, if it already restored from cache
2016-03-07 16:06:04 -05:00
Monster Iestyn
4ab2c336e7
Possibly fixed the issues with LibGME mentioned in issue #14 .
...
Not even the HAVE_LIBGME macro was defined apparently, huh.
2016-03-06 19:32:07 +00:00
Inuyasha
e2b3adc04f
Randy Heit -> Randi Heit
2016-02-28 18:21:37 -08:00
Alam Ed Arias
41f8b25c36
travis: add verbose and server-response to wget
2016-02-26 01:48:11 -05:00
Alam Ed Arias
9b55244dc3
travis: use SRB2-v2114-assets.7z
2016-02-26 01:39:08 -05:00
Alam Ed Arias
8a369d969b
whitespace clean
2016-02-25 18:31:40 -05:00
Inuyasha
aa4414d706
Merge branch 'sdlmix-master' into 'master'
...
cpuaffinity/sdl_mixer changes
Hopefully this will alleviate SDL2 sound issues.
If not, hopefully this will give us info on what the hell is going on.
See merge request !51
2016-02-25 18:12:10 -05:00
Inuyasha
8cc6261c15
Merge branch 'monster-misc-2' into 'master'
...
Monster misc 2
Just some clean-up in doomdef.h, nothing important or majorly game-breaking really. It's all stuff that apparently hasn't been used by the game itself in many years by now.
...
inb4 I find something else obsolete to kill later and make monster misc branch no. 3
See merge request !52
2016-02-25 18:10:48 -05:00
Inuyasha
6dda71bef7
I guess this is becoming the "try to make SDL_mixer work" branch
...
Move InitSubSystem calls into proper places,
don't use AUDIO_S16LSB (bad according to SDL_mixer docs)
Add error checking
2016-02-22 23:08:35 -08:00
Inuyasha
b258b9b503
remove cpuaffinity code from SDL
...
still exists in DD (while it exists) but no longer saves.
No reason whatsoever for affinity to be settable by the game itself.
2016-02-22 23:08:34 -08:00
Monster Iestyn
db18ad6b7f
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2.git into monster-misc-2
2016-02-09 19:54:49 +00:00
Monster Iestyn
700c9c2e70
Merge branch 'md2_colourchange' into 'master'
...
Colour Changing MD2s
What it says it is, I haven't touched it in quite a while, but I have checked and it seems to be working.
See merge request !30
2016-02-09 13:03:52 -05:00
Monster Iestyn
66175d87b8
removed unused macros from doomdef.h
2016-02-08 20:10:32 +00:00
Alam Ed Arias
985b9a11cc
Merge branch 'travis-ci' into 'master'
...
Travis-CI builds
Merge support to build SRB2 for Linux system via Travis-Ci
This will build SRB2 with GCC and Clang to make sure we do not break Linux/GNU builds
See merge request !41
2016-02-07 21:57:26 -05:00
Yukita Mayako
914c6c9d98
Whitespace cleanup.
2016-02-07 21:45:16 -05:00
Alam Ed Arias
6b626f1b27
build: cmake is messly
2016-02-07 20:53:27 -05:00
Alam Ed Arias
3ba827f33d
Merge branch 'master' into travis-ci
2016-02-07 00:39:25 -05:00
Alam Arias
f9d56f65a8
Merge pull request #47 from ProfessorKaos64/brewmaster
...
Update pkg to be fully compatible with Debian Jesse, add desktop file/artwork
2016-02-07 00:36:04 -05:00
mikeyd
865676d341
loose the revision, pkgs switched to native format
2016-02-06 22:46:52 -05:00
mikeyd
c8ae630dfe
Fix desktop file
2016-02-06 22:29:01 -05:00
mikeyd
1082ae6ba5
Missing append, <facepalm.jpg>
2016-02-06 22:17:14 -05:00
mikeyd
3ae9892064
missing install section for new desktop/png file
2016-02-06 22:08:32 -05:00
mikeyd
40dff2c123
missing space for "proper" Debian formatting
2016-02-06 22:00:59 -05:00
mikeyd
d213791054
Rename srb2 to srb2.desktop
2016-02-06 18:13:14 -05:00
mikeyd
7768ec821a
add missing dirs
2016-02-06 18:08:53 -05:00
mikeyd
5c1dff7974
Next attempt at install banner/desktop shortcut
2016-02-06 17:41:53 -05:00
ProfessorKaos64
4f59bf5303
add artwork for BPM
2016-02-06 17:36:21 -05:00
mikeyd
c8e7cffa1d
try install of banner image
2016-02-06 17:33:27 -05:00
mikeyd
b6203d0412
Create srb2
2016-02-06 17:26:09 -05:00
mikeyd
5d32ccffcf
fix pkgconfig path for Debian Jessie
2016-02-06 17:25:27 -05:00
