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
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
Alam Ed Arias
ee75abf8ff
Merge branch 'master' into next
2016-01-31 20:15:22 -05:00
Alam Ed Arias
937c8f936b
appveyor: updated to GCC 5.3
2016-01-31 20:15:10 -05:00
RedEnchilada
8505ad4d14
Merge remote-tracking branch 'public/next'
2016-01-31 13:06:55 -06:00
Monster Iestyn
2e58f6c4d9
Fixed that odd bug where PolyObjects sometimes leave a vertex or two in their control sectors
...
Turns out the seg-searching code falsely assumed it'd find frontfacing segs first, who knew?
2016-01-31 13:05:30 -06:00
Monster Iestyn
2d94b2a85f
keys.h doesn't need to be included twice here lol
2016-01-31 17:10:57 +00:00
Monster Iestyn
deb958a796
Remove unused "INVERSECOLORMAP" macro
2016-01-31 17:06:03 +00:00
Monster Iestyn
9e29b69a29
Remove unused "firstnewseg" variable
2016-01-31 16:49:04 +00:00
Monster Iestyn
8b56cd76c7
doomtype.h tweaks
...
some of the mess in here really bothers me
(cherry-picking this commit of mine from next since it only fixes a small oversight with compiling and adds a comment)
2016-01-31 15:08:16 +00:00
Inuyasha
cd4442d971
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-29 18:30:58 -08:00
Inuyasha
e49f531ba1
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-01-29 18:27:33 -08:00
Alam Ed Arias
82bfce7683
Merge remote-tracking branch 'magicgirl/master'
2016-01-29 20:29:28 -05:00
Inuyasha
93d1f9920e
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-29 16:03:52 -08:00
Inuyasha
e6f0a4be18
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-01-29 16:01:57 -08:00
Inuyasha
f500986692
use RGB for screen texture, not RGBA
...
the screen texture does not need an alpha channel.
the fact that it had one made OGL copy the topmost pixel of the screen texture's alpha channel.
which, naturally results in the screen becoming partially transparent and letting you see the working texture in the background.
2016-01-29 16:01:05 -08:00
Alam Ed Arias
deca16f923
appveyor: let use short commits
2016-01-29 18:38:41 -05:00
Monster Iestyn
7d603c320b
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into diagonal-spring-rings-tweak
2016-01-29 19:40:04 +00:00
Alam Ed Arias
0f83c2aeb5
appveyor: 7z, not 7
2016-01-29 12:53:39 -05:00
Alam Ed Arias
b3ee8591f2
appveyor: ok, let set the var in after build step
2016-01-29 12:36:48 -05:00
Alam Ed Arias
01f2f4d444
appveyor: move naming of 7z to env block
2016-01-29 12:08:41 -05:00
Alam Ed Arias
3895202861
appveyor: let include the commit id
2016-01-29 12:00:05 -05:00
Alam Ed Arias
343c8a9498
appveyor: or not, let try this naming
2016-01-29 11:55:00 -05:00
Alam Ed Arias
ba1cb80ff7
appveyor: name each 7z by version"
2016-01-29 11:47:35 -05:00
Alam Ed Arias
5582d715d4
appveyor: let have the build bot have the right username
2016-01-29 11:39:16 -05:00
Alam Ed Arias
4b8167d823
appveyor: let push a 7z in the after build step
2016-01-29 11:27:33 -05:00
Alam Ed Arias
d7925104b9
appveyor: push build to FTP server
2016-01-29 11:09:46 -05:00
Alam Ed Arias
94d36fbe5b
apveyor: no debug dump
2016-01-29 02:07:36 -05:00
Alam Ed Arias
62702edebe
appveyor: I hope I do not need to debug this build xml again
2016-01-29 02:01:35 -05:00
Alam Ed Arias
0e483fc17b
appveyor: or not?
2016-01-29 01:55:39 -05:00
Alam Ed Arias
ca34268a13
appveyor: let instal the SDL2 and SDL2_mixer to the Mingw toolchain
2016-01-29 01:52:55 -05:00
Alam Ed Arias
f30dae2162
appveyor: need a copy of sed
2016-01-29 01:33:37 -05:00
Alam Ed Arias
13866a5b7e
appveyor: fixup SDL2_MIXER_MOVE
2016-01-29 01:23:26 -05:00
Alam Ed Arias
c7503b35b8
appveyor: need to see what the depend step is not working
2016-01-29 01:05:41 -05:00
Alam Ed Arias
0728bc6de2
appveyor: errormode for all
2016-01-29 00:58:40 -05:00
Alam Ed Arias
b5af756c22
appveyor: let stop build the whole mess
2016-01-29 00:53:34 -05:00
Alam Ed Arias
e8cf4cdaac
SDL2: compile SDL with SDL_main for Win32
2016-01-29 00:33:11 -05:00
