11176 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alam Ed Arias	2dc9a4b34a	Merge branch 'master' into next	2016-02-07 21:22:28 -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
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