c23d971bcb
Merge branch 'master' into next
2016-03-25 22:37:48 -04:00
0f853640e2
macosx: We need CoreFoudation for SDLMain
2016-03-25 22:23:47 -04:00
077781cc56
macosx: drop CoreFoundation linking
2016-03-25 22:11:39 -04:00
2c4a27c7c6
macosx: let fix linking to SDL frameworks
2016-03-25 22:07:34 -04:00
18f51b343b
build: more mac fixes
2016-03-25 20:37:14 -04:00
dadf8e1260
cmake: remove fixed HWRENDER define
2016-03-25 20:21:56 -04:00
0c9081f762
cmake: try to fixup mac build
2016-03-25 20:10:14 -04:00
de2d327da7
Merge branch 'next' into patch-scaling-flip-fix
2016-03-25 18:47:21 -04:00
169210138d
Merge branch 'next' into camera-fix
2016-03-25 18:45:57 -04:00
5945b8f16c
Merge branch 'next' into skybox-hotfix
2016-03-25 18:45:00 -04:00
42aa41c552
Merge branch 'next' into polyobj-teeter-fix
2016-03-25 18:44:30 -04:00
49b1c277af
Merge branch 'next' into portal-fix
2016-03-25 18:43:07 -04:00
62d93a349f
Merge branch 'next' into slope-fixes
2016-03-25 18:42:01 -04:00
a567ce8e8e
Merge branch 'master' into next
2016-03-25 16:40:13 -04:00
3698c2583d
wrap prevention code now takes flipped patches into account
2016-03-25 20:04:49 +00:00
76d71bda92
destend now scales the added-on patch width properly if needed
2016-03-25 19:43:17 +00:00
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
28631c30b7
Fix maskedtextureheight being set outside of ESLOPE code
2016-03-19 22:25:49 +00:00
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
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
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
5dd0e533b3
Removed unused "supdate" variable
2016-03-15 21:18:25 +00:00
6301deb2a5
Merge branch 'master' into next
2016-03-14 13:25:37 -04:00
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
f5b56f2a07
fixup
2016-03-14 12:28:22 -04:00
f9949a3026
dropping NOVERSION, you will not build SRB2 without a SCM
2016-03-14 12:24:51 -04:00
13f4ef2f34
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into slope-fixes
2016-03-12 23:06:37 +00:00
accab7da6a
Fixed precipitation not checking for slopes
2016-03-12 23:03:56 +00:00
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
d82c9a66db
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into skybox-hotfix
2016-03-11 17:13:31 +00:00
3232549971
Merge branch 'changeangle-hotfix' into 'next'
...
Changeangle hotfix
Fixes an issue with A_ChangeAngleAbsolute reported on the MB https://mb.srb2.org/showthread.php?t=41236
See merge request !59
2016-03-11 02:57:51 -05:00
81fc9df8d3
Merge branch 'master' into next
2016-03-10 18:02:23 -05:00
65c94218b9
Merge branch 'next' into changeangle-hotfix
2016-03-10 17:39:35 -05:00
5b89164cf7
Fix camera going nuts around intangible polyobjects
2016-03-10 20:50:54 +00:00
83e9eb6df4
patch.dta officially in use. Version number updated.
2016-03-09 18:30:11 -08:00
771c1ecb8a
Merge pull request #68 from Yukitty/revert-Lua-angles
...
Revert "Change angle_t handling in Lua."
2016-03-09 11:58:51 -05:00
a7cb049b65
leave a dummy string in dehacked, nothing more.
...
a courtesy fuck you to gitlab for making me have to keep
the previous screwed up bullshit in this branch.
2016-03-09 06:23:57 -08:00
f40cfb0271
Revert "MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh"
...
This reverts commit 4625118ee8
2016-03-09 06:22:40 -08:00
4625118ee8
MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh
2016-03-09 14:03:20 +00:00
bf415b8618
Revert "Shifted down the last few mobj eflags to close gap left by MF2_PUSHED -> MFE_PUSHED undo"
...
This reverts commit 280e932f02
2016-03-09 13:59:10 +00:00
280e932f02
Shifted down the last few mobj eflags to close gap left by MF2_PUSHED -> MFE_PUSHED undo
2016-03-09 13:38:30 +00:00
54f95eb387
Revert "Change angle_t handling in Lua."
...
This partially reverts commit ef0e61fc33
2016-03-09 08:38:10 -05:00
5a38088623
Well, we don't need "experimental" slopes anymore either
...
Not when we have properly working ones!
2016-03-09 01:09:21 -08:00
6aa708b5af
I don't think we need the BLUE_SPHERES define anymore...
2016-03-09 00:49:35 -08:00
436bcdf19a
Objectplace handles slopes.
...
Sorry MI, I'm hijacking your branch for a bit.
2016-03-08 23:43:43 -08:00
7ae87cc2c6
Revert "No more stupidity for No More Enemies special plz"
...
This reverts commit 474ad01b46
2016-03-08 22:22:30 -08:00
cfcd7ce0d3
Readded EvalMath to Lua.
...
There is a caveat to this: The first time EvalMath is used, a
deprecated function warning will be shown to the user that tells
them to use _G[] instead.
This reverts commit 9d36cf37bd
2016-03-08 22:15:26 -08:00
694220155e
Revert "MF2_PUSHED is now MFE_PUSHED, for the simple reason that it makes more sense as an eflags object flag than a flags2 object flag!"
...
This reverts commit c8c7878005
2016-03-08 21:30:12 -08:00
407bf4f39d
Merge branch 'next' into polyobj-teeter-fix
2016-03-07 16:46:32 -05:00
55a6355e15
Merge branch 'next' into slope-fixes
2016-03-07 16:45:51 -05:00
b173c3e31e
Merge branch 'next' into portal-fix
2016-03-07 16:44:59 -05:00
178d904bb9
Merge branch 'master' into portal-fix
2016-03-07 16:22:41 -05:00
c4b0c6ec56
Merge branch 'master' into gl-slopes
2016-03-07 16:22:10 -05:00
3ab3de20d7
Merge branch 'master' into polyobj-teeter-fix
2016-03-07 16:21:32 -05:00
6ab6cc959c
Merge branch 'master' into slope-fixes
2016-03-07 16:16:40 -05:00
eab51414f3
Fix typo in A_ChangeAngleAbsolute
2016-03-07 21:16:02 +00:00
60ea2ecb77
Whoops, forgot these
2016-03-07 21:02:35 +00:00
2f539a4df9
R_RenderThickSideRange now checks for slopes in the front sector's lightlist
...
This appears to fix a few holes that have been known to appear with FOF slopes sometimes, dunno how they actually came about exactly but this apparently sorts them out
2016-03-07 20:42:25 +00:00
4ab2c336e7
Possibly fixed the issues with LibGME mentioned in issue #14 .
...
Not even the HAVE_LIBGME macro was defined apparently, huh.
2016-03-06 19:32:07 +00:00
099e25824f
First person view now should correctly take the skybox centerpoint's angle into account
2016-03-05 16:29:25 +00:00
e769b7882c
Merge branch 'lua-sector-lines' into 'next'
...
Lua sector lines
Adds support for "sector.lines" in Lua, an array containing all the linedefs in a particular sector variable:
#sector.lines returns the number of lines in the sector.
sector.lines\[ _i_ \] (e.g. sector.lines[0], sector.lines[1], sector.lines[2], etc ....) gives you individual linedefs in the sector. If the number you supply is equal to or greater than #sector.lines, this returns nil.
Test script for your benefit: (see comments)
Type "luatest" in console in any level and you'll get a few print messages that tests these features for sectors[0]
See merge request !32
2016-03-04 10:23:42 -05:00
7eaf3cf221
Merge branch 'new-SOC-lump-names' into 'next'
...
SOC_**** lump name support
Exactly what it says on the tin: lumps with "SOC_" prefix now are read as SOC lumps like with MAINCFG/OBJCTCFG. Go nuts.
As a bonus, I've changed things with SOC lump detection so MAINCFG, OBJCTCFG and the new SOC_**** lumps are loaded in the order you find them in WAD files (rather than an arbitrary load-MAINCFG-then-load-OBJCTCFG thing as before). All of these are still loaded after Lua scripts though, mind.
See merge request !38
2016-03-04 10:23:20 -05:00
891c7843ca
Merge branch 'Lua-video-lib-expansion' into 'next'
...
Lua video lib expansion
New video/drawer library functions for hud.add to use:
v.width() and v.height() return the screen width and height respectively (in other words you get the screen resolution), while v.renderer() returns the string for the renderer used ("software", "opengl", or "none").
Possibly add more stuff later, but for now these things at the least can be merged in next
See merge request !40
2016-03-04 10:21:15 -05:00
4302cfaa00
Merge branch 'playerspawn-hook' into 'next'
...
Add PlayerSpawn hook to Lua
I don't know how I did this but I did. Something about staring at code from 3AM till 5AM...
Here's a test script too:
```Lua
addHook("PlayerSpawn", function(player) player.health = 99 end)
```
See merge request !48
2016-03-04 10:19:18 -05:00
e6f7b8ab26
Merge branch 'version-constants' into 'next'
...
Version constants for Lua
Pretty simple thing. Allows scripters to use VERSION, SUBVERSION, and VERSIONSTRING to check the game's version and potentially futureproof scripts. Have tested and confirmed working on my end.
See merge request !55
2016-03-03 22:33:36 -05:00
a8bca89dbd
Merge branch 'backport_unslot-music' into 'next'
...
BACKPORT: removal of music slots
Relevant commits cherry-picked. Basically everything except the internal music track name switches.
See merge request !43
2016-03-03 22:31:21 -05:00
b368936b03
Fix bad logic in LUAh_NetArchiveHook rewrite...
...
Argh, I knew I was forgetting something! archFunc is the argument to be passed to the hooks, not tables!
2016-03-03 17:30:46 -05:00
9d6e75ae4f
Cleanup LUAh_NetArchiveHook prototype mess.
2016-03-03 17:30:10 -05:00
0bdc976d50
Shut up compiler warning.
2016-03-03 17:19:35 -05:00
7ae871c7f8
Fix errenous stack pop.
...
This function is intended to leave the stack in the same state it recieved it.
2016-03-03 17:19:21 -05:00
0b704ba618
Updated NetArchiveHook to lua_hooklib.c
...
Fixes I_Assert failure crash due to hooks working differently now.
2016-03-03 17:07:05 -05:00
4f9bb15e4d
"Loading SOC from" console message now also displays the name of the SOC_ lump
2016-03-03 18:31:17 +00:00
61a0d1bcd1
don't use lstring
...
you have space for a null terminator there...
2016-03-03 03:09:35 -08:00
7349cbdbc0
Backwards compatibility.
...
A test WAD for all possible use cases I can think of
can be found here:
https://dl.dropboxusercontent.com/u/3518218/21/secret/bc_test.wad
2016-03-03 02:54:07 -08:00
668cc85d7b
P_ClosestPointOnLine can now (optionally) take custom coordinates that you want to make up your line
2016-03-02 20:31:04 +00:00
ab288a7d1a
Allow Lua to read VERSION, SUBVERSION, and VERSIONSTRING constants
2016-03-01 17:48:10 -06:00
eb1c85db48
Merge branch 'slope-fixes' of http://git.magicalgirl.moe/STJr/SRB2.git into slope-fixes
2016-03-01 19:55:48 +00:00
98fd5ca63b
Made some FOF-related seg code account for slopes, as requested by some TODOs
...
The funny thing is you really can't see ANY change here unless you have a sloped FOF intersecting a sector floor/ceiling (and a second FOF on the other side), which has other problems anyway lol
2016-03-01 19:55:13 +00:00
fc35c8557e
Super color code cleaning, speed 50%, nothing special
2016-02-29 01:18:33 -08:00
ffa9a4e056
Removed the removal of SF_SUPER from skins other than Sonic
...
# Conflicts:
# src/r_things.c
2016-02-29 01:16:17 -08:00
372002d2ad
Merge branch 'backport_state-animations' into 'next'
...
BACKPORT: FF_ANIMATE simplistic state animations
this is a lot more complex due to the need to remove the dispoffset related code as well as a lot of the redefinitions; combined with the code changes due to the sprite2 system in internal master.
~~BEFORE ACCEPTING THIS: get sryder to look at and fix any possible brokenness with OpenGL MD2s~~
See merge request !45
2016-02-29 03:04:00 -05:00
be642b41e2
Merge branch 'backport_special-stage-fade' into 'next'
...
BACKPORT: special stage fade
literally a straight cherry-pick of the old repository, this is a very simple change after all.
See merge request !44
2016-02-29 03:02:30 -05:00
4bb7143967
Merge branch 'fof-flag-change-hotfix' into 'next'
...
Fof flag change hotfix
This fixes rendering issues caused by changing FOF flags mid-level via Lua or linedef type 445. Everything else that toggles FF_EXISTS already had this fix it turns out.
Not sure if this is safe for master too, could someone check that for me?
See merge request !53
2016-02-29 02:57:47 -05:00
e2b3adc04f
Randy Heit -> Randi Heit
2016-02-28 18:21:37 -08:00
4b447b3d0d
Don't add polyobjects to a mobj's sector nodes list. This causes the player to teeter whenever they are above the polyobject's bottom, whether or not it is solid
...
Also, a minor tweak for the teetering code itself, though it looks a right mess and probably should be redone in the future
2016-02-28 18:30:29 +00:00
c3166e40b0
Update names in credits
...
Same as the commit in internal, minus toaster's name (by request, of course.)
2016-02-27 14:27:14 -06:00
c7ba1d1532
Make sure target sector's lightlist is reset whenever FOF flags are changed.
...
This fixes how removing certain flags (such as FF_EXISTS) from FOFs can cause HOMs on walls bordering their target sectors. Also fixes how the force-FOF-to-vanish linedef special can leave behind the FOF's shadow
2016-02-26 18:11:12 +00:00
f5ba192f0b
remove extraneous va() calls
2016-02-25 23:31:48 -08:00
2ba90082c3
Merge branch 'next' into gl-slopes
2016-02-26 02:14:00 -05:00
2b12e5ff20
Merge branch 'next' into backport_unslot-music
2016-02-26 02:11:29 -05:00
07d331676b
Merge branch 'next' into slope-fixes
2016-02-26 02:09:03 -05:00
77dc27d070
Merge branch 'next' into backport_state-animations
2016-02-26 02:06:57 -05:00
0a2078d0c0
Merge branch 'next' into playerspawn-hook
2016-02-26 02:05:24 -05:00
49877262e3
Merge branch 'next' into backport_special-stage-fade
2016-02-26 02:00:38 -05:00
9d3f7d760b
Merge branch 'next' into portal-fix
2016-02-26 01:58:55 -05:00
8d2b4102d1
Merge branch 'next' into Lua-video-lib-expansion
2016-02-26 01:58:19 -05:00
18688f476f
Merge branch 'next' into new-SOC-lump-names
2016-02-26 01:58:07 -05:00
09d2bbc448
Merge branch 'next' into lua-sector-lines
2016-02-26 01:57:15 -05:00
8f0abb267e
Don't mix declarations and code
2016-02-25 22:47:52 -06:00
5c9aaf2fe4
Move hook into G_SpawnPlayer
2016-02-25 22:28:19 -06:00
b3b5521e1b
Merge branch 'master' into next
2016-02-25 18:33:29 -05:00
8a369d969b
whitespace clean
2016-02-25 18:31:40 -05:00
1e15ed2f7b
Merge branch 'i-hate-stupid-speedrun-tricks' into 'next'
...
Fix chain launching
Basically you're not allowed to launch off a chain the frame you touch it anymore.
Coincidentally the changes here allow you to actually use PF_*STASIS in a Lua script now and have it work as you'd expect it to (it lasts for a tic).
See merge request !49
2016-02-25 18:12:39 -05:00
aa4414d706
Merge branch 'sdlmix-master' into 'master'
...
cpuaffinity/sdl_mixer changes
Hopefully this will alleviate SDL2 sound issues.
If not, hopefully this will give us info on what the hell is going on.
See merge request !51
2016-02-25 18:12:10 -05:00
f10279d61b
Very minor performance improvement.
2016-02-25 14:35:05 -08:00
3802ec33de
Fixed how dying players who were standing on slopes just jump off to the side
2016-02-23 22:53:24 +00:00
6dda71bef7
I guess this is becoming the "try to make SDL_mixer work" branch
...
Move InitSubSystem calls into proper places,
don't use AUDIO_S16LSB (bad according to SDL_mixer docs)
Add error checking
2016-02-22 23:08:35 -08:00
b258b9b503
remove cpuaffinity code from SDL
...
still exists in DD (while it exists) but no longer saves.
No reason whatsoever for affinity to be settable by the game itself.
2016-02-22 23:08:34 -08:00
0369f39ef4
Merge branch 'master' into gl-slopes
2016-02-22 00:15:26 -05:00
bcd05b1c63
Also fixed it for MD2s
2016-02-21 23:04:14 -06:00
ce793dfe28
Fix vissprite-related crashing in OGL
2016-02-21 22:50:29 -06:00
f87f1b7b1a
Fixed compiler errors as well as a ton of tab spaces (apparently it's a common problem in this file anyway but whatever)
2016-02-21 11:37:59 -06:00
3058648fdc
Fix elemental flame trails not spawning when going up slopes
2016-02-16 17:58:08 +00:00
03470118cd
Added missing ESLOPE ifdef from when I first did these fixes for slope compiling
2016-02-15 20:57:35 +00:00
fa1bc5a09b
Whoops forgot this for last commit
2016-02-15 20:55:57 +00:00
b5673ed101
Fix player spawning on slopes
2016-02-15 20:46:56 +00:00
ef6430c23e
Fix respawning rings on slopes
2016-02-15 20:34:53 +00:00
000ec9ac67
Call LUAh_PlayerSpawn instead of checking for it
2016-02-14 15:22:13 -06:00
7c5adacc6f
Fixed chain launching
...
In the process, the stasis flags work like you'd expect them to.
You can now set them in Lua or code and they'll actually do something.
2016-02-14 12:28:03 -08:00
db3797fd35
Add PlayerSpawn hook
2016-02-14 06:10:20 -06:00
e43f21cdda
Fix dead MF_PAIN objects hurting the player
...
Fixes #12
2016-02-13 17:31:38 -06:00
dabc4415af
Fix crash caused by drawing scaled, mirrored sprites semi-covered on the left side by portal edge
...
I suspect this crash was possible even outside the context of portals, but whatever
2016-02-13 18:11:50 +00:00
62d15e54e8
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into portal-fix
2016-02-09 20:02:33 +00:00
7278625963
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into Lua-video-lib-expansion
2016-02-09 20:01:32 +00:00
17d6bafc7e
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into new-SOC-lump-names
2016-02-09 20:00:54 +00:00
e44c96e417
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into lua-sector-lines
2016-02-09 19:58:51 +00:00
db18ad6b7f
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2.git into monster-misc-2
2016-02-09 19:54:49 +00:00
5d1c8d2968
My cherry picking somehow lead to these functions being doubled ...whoops
2016-02-09 19:35:04 +00:00
6000b5c980
Merge branch 'master' into next
2016-02-09 14:13:50 -05:00
ddb5652ab6
Tabbing
2016-02-09 18:05:19 +00:00
6b8c438e58
Change a few colours.
2016-02-09 18:05:11 +00:00
31deecc51c
Colour Changing MD2s
...
I don't know how I can move my old branch over so I've just created a new one.
2016-02-09 18:04:59 +00:00
700c9c2e70
Merge branch 'md2_colourchange' into 'master'
...
Colour Changing MD2s
What it says it is, I haven't touched it in quite a while, but I have checked and it seems to be working.
See merge request !30
2016-02-09 13:03:52 -05:00
b7ebb8186d
Fix MD2 interpolation for FF_ANIMATE states
2016-02-09 16:20:18 +00:00
8fc484cea9
Just a few more changes to TUNES, nothing special
...
(cherry picked from commit 63a9c66317
2016-02-09 02:48:35 -08:00
04d112276e
Fixed some oddities with TUNES.
...
(cherry picked from commit a4d05350f7
2016-02-09 02:48:35 -08:00
1203b0aa73
Fix crash on game clear
...
(No, game, you can't allocate a map header for the credits, why were you doing that before and how did it not break anything??)
(cherry picked from commit e1f9a01229
2016-02-09 02:48:34 -08:00
caab150c92
Fixed LD413
...
(cherry picked from commit 1e4c2f8aad
2016-02-09 02:48:34 -08:00
8c17dac589
The concept of "music slots" doesn't exist anymore.
...
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.
(cherry picked from commit 025ca413a2
2016-02-09 02:48:33 -08:00
58e685353a
Attempt 2 at special stage fades.
...
More basic in execution.
2016-02-09 02:43:24 -08:00
1bdd4cf641
backport state-animations from internal master to public next
...
most other code in the branch did not come along for the ride.
2016-02-09 02:39:16 -08:00
66175d87b8
removed unused macros from doomdef.h
2016-02-08 20:10:32 +00:00
985b9a11cc
Merge branch 'travis-ci' into 'master'
...
Travis-CI builds
Merge support to build SRB2 for Linux system via Travis-Ci
This will build SRB2 with GCC and Clang to make sure we do not break Linux/GNU builds
See merge request !41
2016-02-07 21:57:26 -05:00
2dc9a4b34a
Merge branch 'master' into next
2016-02-07 21:22:28 -05:00
6b626f1b27
build: cmake is messly
2016-02-07 20:53:27 -05:00
3ba827f33d
Merge branch 'master' into travis-ci
2016-02-07 00:39:25 -05:00
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
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
07fc74eaf5
clang: fixup a few clang warnings
2016-02-05 22:38:40 -05:00
68054a49e3
clang: cleanup
2016-02-05 22:32:14 -05:00
f4886657c1
clang: fixup a few clang warnings
2016-02-05 22:12:12 -05:00
864baeda05
cmake: fixed up to handle Clang and AppleClang
2016-02-05 21:49:24 -05:00
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
5320424269
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-03 18:09:08 -08:00
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
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
f17be6641e
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-03 18:00:28 -08:00
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
d1b89c9320
Quick fix for another drawer lib function while I'm here, cough
2016-01-31 22:52:02 +00:00
04528eb3e6
<Inuyasha> MonsterIestyn: what about render_none?
2016-01-31 22:15:17 +00:00
dafe0ccd11
Added v.width(), v.height() and v.renderer() to Lua's drawer/video library
2016-01-31 21:53:14 +00:00
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
2d94b2a85f
keys.h doesn't need to be included twice here lol
2016-01-31 17:10:57 +00:00
deb958a796
Remove unused "INVERSECOLORMAP" macro
2016-01-31 17:06:03 +00:00
9e29b69a29
Remove unused "firstnewseg" variable
2016-01-31 16:49:04 +00:00
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
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
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
e49f531ba1
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-01-29 18:27:33 -08:00
82bfce7683
Merge remote-tracking branch 'magicgirl/master'
2016-01-29 20:29:28 -05:00
e6f0a4be18
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-01-29 16:01:57 -08:00
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
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
e8cf4cdaac
SDL2: compile SDL with SDL_main for Win32
2016-01-29 00:33:11 -05:00
c47ff7b3c6
let make the main() entry point noreturns
2016-01-28 21:37:41 -05:00
050ce857c4
let not care for main() being noreturn
2016-01-28 21:31:18 -05:00
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
10e1aaaf85
appveyor: no need for DEPFLAGS
2016-01-28 12:08:08 -05:00
7fdb5cfcfb
move disabled warning out of mingw
2016-01-28 12:06:00 -05:00
2176b21e62
ignore noreturns
2016-01-28 11:49:23 -05:00
7a09a82489
new flags: DEPFLAGS, to tell the depend step where are the headers
2016-01-28 11:41:02 -05:00
f0842d2200
appveyor: add debug and sdl mixer
2016-01-28 11:33:36 -05:00
d76e21b546
fix bind out of bounds / keystring misreading
2016-01-28 08:15:34 -08:00
b3fbc37c94
Midtextures, lights, and culling fixes for ogl slopes
...
There's a weird issue with lights that's hard to diagnose but otherwise
this is ready to go I think
2016-01-27 20:10:02 -06:00
e6235d4d6b
Fix FOF slope rendering in ogl
...
should work as well as software if not better now
2016-01-27 20:09:52 -06:00
52ae3f2875
GL slope walls and fixed plane culling
2016-01-27 20:09:34 -06:00
24da82f026
Begin work on OGL slope support
...
unfinished
2016-01-27 20:09:04 -06:00
d0ce9170da
appveyor: build for GCC 5.2
2016-01-27 01:39:12 -05:00
80fb282334
Fixed math for calculating current texture in texture animations
2016-01-23 18:59:17 +00:00
181c875016
SDL: config.h.in is pre source tree, config.h for each cmake build
2016-01-22 17:25:19 -05:00
4df951224b
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2 into public_next
2016-01-21 14:51:33 -08:00
674ff51153
Fix shadowing in mapheaderinfo_get
2016-01-21 20:27:35 +00:00
ccb0abb853
Diagonal ring springs should now be able to face any angle
2016-01-21 20:19:43 +00:00
c33d20acff
whitespace cleanup
2016-01-21 13:50:05 -05:00
9d5718760d
interscreen is a lump name and thus needs lstring
...
... not just lstring though, but the behavior with i that is used elsewhere.
2016-01-20 09:42:35 -08:00
7d6dc3a5bb
fix bad lstring usage in map header lua
...
This is not how you use pushlstring! This is actually sending uninitialized memory to Lua, which is making scripts have inconsistent results (duh?)
c/o JTE: "Tell Red they're a doofus."
2016-01-20 09:25:28 -08:00
5abdb08a25
#sector.lines now returns the number of linedefs in the sector
2016-01-20 16:03:17 +00:00
7d914913dd
Tabbing
2016-01-20 15:55:32 +00:00
79e3e2351d
Finally bothered to add in a method to obtain sector.lines' size internally to prevent going out of bounds.
...
Admittedly I knew of this particular method from the start but wanted to avoid it in favour of a less-hacky looking method of getting sector.lines' size ...but there was none to be found at all.
2016-01-20 14:56:52 +00:00
3dc0f2b4ff
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into lua-sector-lines
2016-01-20 14:22:11 +00:00
Alam Ed Arias