3ba827f33d
Merge branch 'master' into travis-ci
2016-02-07 00:39:25 -05:00
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
865676d341
loose the revision, pkgs switched to native format
2016-02-06 22:46:52 -05:00
c8ae630dfe
Fix desktop file
2016-02-06 22:29:01 -05:00
1082ae6ba5
Missing append, <facepalm.jpg>
2016-02-06 22:17:14 -05:00
3ae9892064
missing install section for new desktop/png file
2016-02-06 22:08:32 -05:00
40dff2c123
missing space for "proper" Debian formatting
2016-02-06 22:00:59 -05:00
d213791054
Rename srb2 to srb2.desktop
2016-02-06 18:13:14 -05:00
7768ec821a
add missing dirs
2016-02-06 18:08:53 -05:00
5c1dff7974
Next attempt at install banner/desktop shortcut
2016-02-06 17:41:53 -05:00
4f59bf5303
add artwork for BPM
2016-02-06 17:36:21 -05:00
c8e7cffa1d
try install of banner image
2016-02-06 17:33:27 -05:00
b6203d0412
Create srb2
2016-02-06 17:26:09 -05:00
5d32ccffcf
fix pkgconfig path for Debian Jessie
2016-02-06 17:25:27 -05:00
f9d23370b6
debian: the data package should be native
2016-02-06 17:10:55 -05:00
5c09c31584
Debian: only just make srb2 depend on srb2-data (2.1.14-1))
2016-02-06 14:56:16 -05:00
5d5956b650
debian: depend on srb2-data 2.1.14, not 2.1.4
2016-02-06 14:42:02 -05:00
bac39b1bc0
debian: untested update for Debian packages
2016-02-06 12:31:44 -05:00
e9048aec48
travis: premake the cache folder
2016-02-05 23:22:06 -05:00
6d26a60cbe
travis: cache 7z SFX
2016-02-05 23:19:38 -05:00
7c1f1d9c8e
travis: compile with warnings as errors, skip absolute-value warnings
2016-02-05 22:54:50 -05:00
07fc74eaf5
clang: fixup a few clang warnings
2016-02-05 22:38:40 -05:00
68054a49e3
clang: cleanup
2016-02-05 22:32:14 -05:00
f4886657c1
clang: fixup a few clang warnings
2016-02-05 22:12:12 -05:00
864baeda05
cmake: fixed up to handle Clang and AppleClang
2016-02-05 21:49:24 -05:00
4d5f16330a
travis: just run make
2016-02-05 21:33:00 -05:00
a979e37586
travis: no space on 7z command
2016-02-05 21:28:19 -05:00
ae75e3ee61
travis: mkdir , not make and cache the cccahe
2016-02-05 21:21:28 -05:00
e913ca0ca6
travis: use wget and create cache folder
2016-02-05 21:15:32 -05:00
59d111b17d
travis: restore missing config?
2016-02-05 21:11:00 -05:00
152c106cbd
travis: restore language
2016-02-05 21:09:14 -05:00
b6cc13fd2e
travis: drop test
2016-02-05 21:07:46 -05:00
a743f155ac
travis: addd libgme to list
2016-02-05 21:00:46 -05:00
5e5c73fe18
travis: add SRB2 2.1.14 files
2016-02-05 20:50:35 -05:00
0bd16a5a0c
travis: drop osx
2016-02-05 19:30:03 -05:00
45b181f889
travis: switch to trusty for linux os
2016-02-05 19:26:59 -05:00
522d2049de
travis: add cmake 3.x package
2016-02-05 19:08:02 -05:00
1444067560
travis: use the correct packages
2016-02-05 18:50:02 -05:00
0003cea547
travis-ci: we need sudo
2016-02-05 18:43:18 -05:00
69937b41d2
travis: simple build config
2016-02-05 18:39:06 -05:00
662d40511d
travis: let start building with travis
2016-02-05 18:02:36 -05:00
5320424269
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-03 18:09:08 -08:00
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
84fb4d108a
Merge branch 'diagonal-spring-rings-tweak' into 'next'
...
Diagonal spring rings tweak
If you didn't know before, those special placement ring lines for diagonal springs only use multiples of 45 for their angles in-game. In other words, they only face any of the 8 basic cardinal directions (N, S, E, W, NE, NW, etc). Considering that springs themselves don't follow the above behaviour, you can probably work out that's a bad thing.
This branch changes that of course, if you couldn't guess from context. Diagonal spring rings can now be placed with any angles like most thing types already could!
See merge request !37
2016-02-03 21:05:44 -05:00
f17be6641e
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-03 18:00:28 -08:00
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
236170ea37
Merge branch 'master' into next
2016-01-31 20:30:53 -05:00
2b41a40076
appveyor: no quote?
2016-01-31 20:25:32 -05:00
ee75abf8ff
Merge branch 'master' into next
2016-01-31 20:15:22 -05:00
937c8f936b
appveyor: updated to GCC 5.3
2016-01-31 20:15:10 -05:00
Alam Ed Arias