Commit Graph

820 Commits

Author SHA1 Message Date
Monster Iestyn d1b89c9320 Quick fix for another drawer lib function while I'm here, cough 2016-01-31 22:52:02 +00:00
Monster Iestyn 04528eb3e6 <Inuyasha> MonsterIestyn: what about render_none? 2016-01-31 22:15:17 +00:00
Monster Iestyn dafe0ccd11 Added v.width(), v.height() and v.renderer() to Lua's drawer/video library 2016-01-31 21:53:14 +00: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
Monster Iestyn cd198d6809 merge SOC_****, MAINCFG and OBJCTCFG searches into one big search for any of them
This makes it so that it doesn't matter what order you place SOC lumps within a WAD... relative to other SOC lumps at least, anyway
2016-01-30 17:19:05 +00:00
Monster Iestyn 5cae87430f Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into new-SOC-lump-names 2016-01-30 16:39:55 +00: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 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
Alam Ed Arias c47ff7b3c6 let make the main() entry point noreturns 2016-01-28 21:37:41 -05:00
Alam Ed Arias 050ce857c4 let not care for main() being noreturn 2016-01-28 21:31:18 -05:00
Alam Ed Arias 0d327c7c16 kill logical-not-parentheses warning in g_game.c
g_game.c: In function 'G_CheckDemoStatus':
g_game.c:5588:22: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
   if (!modeattacking == ATTACKING_RECORD)
                      ^
2016-01-28 21:15:51 -05:00
Alam Ed Arias 67b6d618a4 appveyor: build with/without the mixer and with/without OpenGL 2016-01-28 12:15:42 -05:00
Alam Ed Arias 4d0e1a8a1c appveyor: do not echo the full command 2016-01-28 12:12:04 -05:00
Alam Ed Arias 10e1aaaf85 appveyor: no need for DEPFLAGS 2016-01-28 12:08:08 -05:00
Alam Ed Arias 7fdb5cfcfb move disabled warning out of mingw 2016-01-28 12:06:00 -05:00
Alam Ed Arias 3c35ed60d3 appveyor: fixup cache list 2016-01-28 12:03:56 -05:00
Alam Ed Arias d762c4023e appveyor: show us all the commands 2016-01-28 11:52:33 -05:00
Alam Ed Arias 2176b21e62 ignore noreturns 2016-01-28 11:49:23 -05:00
Alam Ed Arias 7a09a82489 new flags: DEPFLAGS, to tell the depend step where are the headers 2016-01-28 11:41:02 -05:00
Alam Ed Arias 4230225a0c appveor: SDL, not SSDL 2016-01-28 11:36:51 -05:00
Alam Ed Arias 50846880a6 appveyor: not = for envs 2016-01-28 11:34:19 -05:00
Alam Ed Arias f0842d2200 appveyor: add debug and sdl mixer 2016-01-28 11:33:36 -05:00
Alam Ed Arias 89786ff7fd appveyor: include the SDL header in depend step: 2016-01-28 11:22:46 -05:00