1065 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alam Ed Arias	b29a176275	Merge branch 'next' into slope-fixes	2016-03-25 22:39:11 -04:00
Alam Ed Arias	8d3ded4020	Merge branch 'next' into portal-fix	2016-03-25 22:38:56 -04:00
Alam Ed Arias	c23d971bcb	Merge branch 'master' into next	2016-03-25 22:37:48 -04:00
Alam Ed Arias	a3c01ea6c2	Merge branch 'travis-ci'	2016-03-25 22:37:27 -04:00
Alam Ed Arias	0f853640e2	macosx: We need CoreFoudation for SDLMain	2016-03-25 22:23:47 -04:00
Alam Ed Arias	077781cc56	macosx: drop CoreFoundation linking	2016-03-25 22:11:39 -04:00
Alam Ed Arias	2c4a27c7c6	macosx: let fix linking to SDL frameworks	2016-03-25 22:07:34 -04:00
Alam Ed Arias	9bc6ce3d85	travis: steal SDL2 dmg for Mac build	2016-03-25 21:43:17 -04:00
Alam Ed Arias	7122908560	travis: matrix is not correct	2016-03-25 20:57:57 -04:00
Alam Ed Arias	fc1d71454b	travis: fixup xml	2016-03-25 20:56:04 -04:00
Alam Ed Arias	18f51b343b	build: more mac fixes	2016-03-25 20:37:14 -04:00
Alam Ed Arias	2165c68066	travis: add -Wno-unknown-warning-option	2016-03-25 20:25:52 -04:00
Alam Ed Arias	dadf8e1260	cmake: remove fixed HWRENDER define	2016-03-25 20:21:56 -04:00
Alam Ed Arias	0c9081f762	cmake: try to fixup mac build	2016-03-25 20:10:14 -04:00
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
Alam Ed Arias	de2d327da7	Merge branch 'next' into patch-scaling-flip-fix	2016-03-25 18:47:21 -04:00
Alam Ed Arias	169210138d	Merge branch 'next' into camera-fix	2016-03-25 18:45:57 -04:00
Alam Ed Arias	5945b8f16c	Merge branch 'next' into skybox-hotfix	2016-03-25 18:45:00 -04:00
Alam Ed Arias	42aa41c552	Merge branch 'next' into polyobj-teeter-fix	2016-03-25 18:44:30 -04:00
Alam Ed Arias	49b1c277af	Merge branch 'next' into portal-fix	2016-03-25 18:43:07 -04:00
Alam Ed Arias	62d93a349f	Merge branch 'next' into slope-fixes	2016-03-25 18:42:01 -04:00
Alam Ed Arias	a567ce8e8e	Merge branch 'master' into next	2016-03-25 16:40:13 -04:00
Monster Iestyn	3698c2583d	wrap prevention code now takes flipped patches into account	2016-03-25 20:04:49 +00:00
Monster Iestyn	76d71bda92	destend now scales the added-on patch width properly if needed	2016-03-25 19:43:17 +00:00
Monster Iestyn	ec5b272fa6	Unless I'm mistaken, scalesteps/heightsteps should be divided by stop-start, not stop-start+1. Revert this commit if that was intentional.	2016-03-19 23:19:05 +00:00
Monster Iestyn	28631c30b7	Fix maskedtextureheight being set outside of ESLOPE code	2016-03-19 22:25:49 +00:00
Monster Iestyn	a82c19adb1	Fix sprites displaying behind "closed doors" when slopes are present. ... For the record, thok barriers count as "closed doors" in SRB2 level contexts	2016-03-19 16:19:58 +00:00
Monster Iestyn	6623a9148e	Fix HOMs by actually bothering to check if either side of a seg has slopes for height-checking code	2016-03-18 23:58:58 +00:00
Monster Iestyn	e941687d4c	R_RenderMaskedSegRange now checks for slopes in the sector lightlist ... in other words, midtexture rendering should now correctly account for slopes from FOFs that could affect lighting/colormap	2016-03-18 20:33:16 +00:00
Monster Iestyn	5dd0e533b3	Removed unused "supdate" variable	2016-03-15 21:18:25 +00:00
Alam Ed Arias	c63b746714	Merge branch 'master' into next	2016-03-14 21:58:12 -04: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
Alam Ed Arias	6301deb2a5	Merge branch 'master' into next	2016-03-14 13:25:37 -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
Monster Iestyn	13f4ef2f34	Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into slope-fixes	2016-03-12 23:06:37 +00:00
Monster Iestyn	accab7da6a	Fixed precipitation not checking for slopes	2016-03-12 23:03:56 +00:00
Monster Iestyn	c67683eb0a	Fixed slope walls displaying sprites through them if they weren't completely above you ... Sadly this does not fix ALL sprite issues, but just some of them at the least	2016-03-12 19:59:32 +00:00
Monster Iestyn	d82c9a66db	Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into skybox-hotfix	2016-03-11 17:13:31 +00:00