stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-25 04:00:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
11768 commits 173 branches 41 tags 295 MiB
Commit graph

11768 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Alam Ed Arias
f9d23370b6 debian: the data package should be native 2016-02-06 17:10:55 -05:00
Monster Iestyn
ae2b1e8ea1 Use <= instead of ==, so that sprites for second-tier portals and beyond still display 
thx Red for spotting this
 2016-02-06 21:06:52 +00: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
Monster Iestyn
166fafd717 Fixed div-by-zero crash relating to portals, drawsegs and midtextures 
Had to remove Red's scale hack in order to do so, because it utterly fails when the drawseg doesn't actually belong to the portal in the first place.
 2016-02-06 18:57:26 +00: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
Monster Iestyn
9973bedd5f Free the memory of all clipping arrays for each portal properly 
Not the actual fix I'm intending to make with this branch, but it's needed anyway
 2016-02-05 16:38:33 +00:00
Inuyasha
63a9c66317 Just a few more changes to TUNES, nothing special 2016-02-04 17:27:55 -08:00
Inuyasha
42fb7ed5aa clearly I don't care about Super forms much :v 2016-02-04 02:37:40 -08:00
Inuyasha
577afbc693 All internal music changes use new lump names 
... that all start with _ for reasons specified in the music topic
 2016-02-04 01:17:27 -08:00
Inuyasha
2b482324b4 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-02-03 18:11:51 -08:00
Inuyasha
5320424269 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-02-03 18:09:08 -08: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
Inuyasha
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
Inuyasha
e87a86dd67 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-02-03 18:03:02 -08:00
Inuyasha
f17be6641e Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-02-03 18:00:28 -08: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
236170ea37 Merge branch 'master' into next 2016-01-31 20:30:53 -05:00
Alam Ed Arias
2b41a40076 appveyor: no quote? 2016-01-31 20:25:32 -05:00