1.5 stable #988

Merged
merged 69 commits into from Oct 16, 2014

Projects

None yet
@halfnelson
Contributor

update of 1.5 stable with mods from latest 1.5 development

makotok and others added some commits Jun 2, 2014
@makotok makotok Merge pull request #936 from moai/master
Synchronization of the branch.
a6c31f9
@halfnelson halfnelson Fix luagc_count in getMemoryUsage in moaiSim
see: http://pgl.yoyo.org/luai/i/lua_gc the value was just getting the bytes not the kilobytes.
ab30d10
Seebs pex plugin: Fix radial emitter
The radial emitter was lacking one assignment present in the gravity emitter,
with the result that it didn't display anything.
a1507fd
Seebs pex plugin: Cleanup and bug fixes
This looks larger than it is.

There was a ton of duplicated code between the gravity and radial script
cases, and that's simplified and cleaned up. Also, there's some overly
complicated computations, and dead code. It appears that the intended
angle computations for gravity emitters weren't quite correct. The
sourcePosition and sourcePositionVariance values were ignored. The code
to read in attributes could easily overrun buffers. In theory, all of
these should be fixed now.
ec16cc9
Seebs particles-pex-plugin sample: Clean up .pex file, update usage
The sourcePosition and sourcePositionVariance values were being mostly
ignored, and the usage of them with setRect was an extra complication.
Instead, we now handle those internally in the plugin code. Update
sample accordingly.

Also clean up the sample so it's more readable.
ad4455e
Seebs Fix miscapitalized attribute name.
There was a typo in one of the attribute names. We still accept the
old attribute name, but we now recognize the correct capitalization
and update the example to match it.
e30f783
@halfnelson halfnelson move to openssl-1.0.0m afcd902
@halfnelson halfnelson re-apply fixes needed for mingw 988d1ae
@halfnelson halfnelson added linux opensslconf.h dad3573
@halfnelson halfnelson fixed issues in android openssl platform include b6fe37a
@halfnelson halfnelson openssl upgrade for osx and ios 360eced
@halfnelson halfnelson fix misconfigured visual studio include for openssl 744bfe4
@makotok makotok Merge pull request #939 from seebs/seebs/pexpluginfixes
Seebs/pexpluginfixes
051c2f3
@makotok makotok Merge pull request #941 from moaiforge/pull_openssl100m
openssl 1.0.0m see #940
c560952
@makotok makotok Merge branch 'master' into 1.5-development 28d2460
@makotok makotok Fixed a bug when you have set a ScissorRect to MOAIProp.
* Fixed the problem that is drawn out of the range of the Viewport.
* Fixed the problem  that is one pixel drawing at the boundary of the
window in OSX.
e567e1f
@makotok makotok Merge pull request #943 from moai/fix-scissor-test
Fixed a bug when you have set a ScissorRect to MOAIProp.
e258579
@criptych criptych Fix const definitions for MOAICameraAnchor2D and MOAICameraFitter2D
CameraFitter and CameraAnchor consts were set in `RegisterLuaFuncs` instead of `RegisterLuaClass` like other classes.  This fix moves them to the correct method to make them accessible from Lua.
43d3a73
@makotok makotok Merge pull request #947 from criptych/fix-camerafitter-consts
Fix const definitions for MOAICameraAnchor2D and MOAICameraFitter2D
1016b53
Seebs Use timer for OS X
The configuration of the SDL timer was contingent on
"if(UNIX AND NOT APPLE)" or "if(WINDOWS)", with no attempt to
configure it for OS X.

The Unix timer is maintained for OS X and works fine. Copying
and pasting a few lines into the APPLE section fixes it.

What this fixes: Without it, if you use Spaces/Mission Control
and page such that the app isn't rendering, it uses 100% of CPU.
Also SDL_GetTicks() always returns zero and SDL_Delay() always
returns instantly.
1258b45
Seebs MOAIProp: Add getScissorRect()
It is occasionally desireable to be able to find out whether
a prop has a scissorRect assigned to it.
44a3daa
@halfnelson halfnelson fix moaiimage crash when loading palletized png f6b1106
@halfnelson halfnelson Merge pull request #953 from moaiforge/pull_moaiimage_png_fix
fix moaiimage crash when loading palletized png
1b927ec
@halfnelson halfnelson work around incompatibility with lua_jit and the coroutine error hand…
…ling functions
b812660
@makotok makotok Merge pull request #951 from seebs/seebs/prop-intersect
MOAIProp: Add getScissorRect()
af7cbf1
@criptych criptych Fix `GetMACAddress` for Windows
Fixes `ZLAdapterInfo::GetMACAddress()` for Windows systems, used by
`MOAIEnvironment.getMACAddress()` (previously returning zeroes).
859828f
@fivevolthigh fivevolthigh Added MOAIBox2DWorld:addRevoluteJointLocal which takes local anchorA …
…and anchorB points, rather than a single world anchor point.
d32add7
@Vavius Vavius fix bug in MOAILuaState::GetLuaObject() 7eb7b1d
@halfnelson halfnelson Update curl_config.h
http://getmoai.com/forums/post15120.html#p15120
fixes build on redhat based linux systems by removing the have_stropts_h
6d45f03
@DanielSWolf DanielSWolf Fixed bug that prevented setting no clear color at all
MOAIGfxDevice.setClearColor() always forwarded 4 arguments, making it
impossible to call the method without arguments.
f618eca
@DanielSWolf DanielSWolf Fixed MOAITransformBase.getWorldRot() by fixing ZLAffine3D.GetRot()
Arguments to atan2 were fed in the wrong order. Same for ZLAffine2D.GetRot().
6b5ef7b
@DanielSWolf DanielSWolf Fixed MOAITransformBase.getWorldDir() by fixing ZLAffine3D.GetHeading() 0d15a2e
@halfnelson halfnelson Merge pull request #963 from DanielSWolf/set-clear-color
Fixed bug that prevented setting no clear color at all
0b8d9b2
@halfnelson halfnelson Merge pull request #964 from DanielSWolf/world-transform
MOAITransformBase.getWorldRot() and .getWorldDir() are broken
fa315c2
@halfnelson halfnelson Merge pull request #960 from Vavius/fix-getluaobject
fix bug in MOAILuaState::GetLuaObject()
1511eb1
@halfnelson halfnelson Merge pull request #959 from fivevolthigh/fvh-addRevoluteJointLocal
Added MOAIBox2DWorld:addRevoluteJointLocal
1c3dfe8
@halfnelson halfnelson Merge pull request #958 from criptych/fix-getmac-win32
Fix `GetMACAddress` for Windows
fa104ac
@halfnelson halfnelson Merge pull request #950 from seebs/seebs/sdl-timer
Use timer for OS X
17fef89
@JDaance JDaance sensible handling of lua stack trace printing, I hope 969f71b
@JDaance JDaance never run without pcall c528c3c
@halfnelson halfnelson Update README.md c4c6680
@Vavius Vavius Attempt to fix MOAIImageTexture reallocated on each new glyph rendered 62f8d6a
@halfnelson halfnelson Merge pull request #970 from moai/1.5-stable
latest 1.5 stable
37fc97f
@halfnelson halfnelson Merge pull request #971 from moai/1.5-stable
1.5 stable fixes
84f749a
@ubershmekel ubershmekel Clone instructions didn't work for me
Cloning the .git failed like so:

    $ git clone git@github.com:moai/moai-dev.git
    Cloning into 'moai-dev'...
    Warning: Permanently added the RSA host key for IP address '192.30.252.123' to the list of known hosts.
    Permission denied (publickey).
    fatal: Could not read from remote repository.
    
    Please make sure you have the correct access rights
    and the repository exists.

And I added the `cd` so it can actually all be copy-pasted and would just work.
5f6e017
@halfnelson halfnelson Merge pull request #972 from ubershmekel/patch-1
Clone instructions didn't work for me
1419f68
@halfnelson halfnelson Merge pull request #968 from Vavius/fix-moaiimagetexture
Attempt to fix MOAIImageTexture reallocated on each new glyph rendered
3dcf831
@naartjie naartjie grammar tweak to README.md 15b8581
@naartjie naartjie correct windows path separator in README.md 1ca2e38
@naartjie naartjie correct windows path separator in README.md af7a6a1
@zeldin zeldin curl: Use autoconf script to generate config headers on Linux
When the RUN_CURL_CONFIGURE variable is set, use the curl configure
script to generate curlbuild.h and curl_config.h instead of using
pre-cooked ones.  Enable only on Linux for now.
dfb3f66
@makotok makotok Merge pull request #974 from naartjie/fixes
correct windows path separator in README.md
ff35879
@makotok makotok Merge pull request #973 from naartjie/master
grammar tweak to README.md
2119f96
@sclark39 sclark39 Fix out of bounds string assert in zl-gfx due to improper lower-casin…
…g of an std::string
6d97c65
@sclark39 sclark39 Make the host log an error when a script fails to load rather than ju…
…st silently failing
aa5a16e
@sclark39 sclark39 Fix MOAIFont crashing when trying to use a FreeTypeFont that failed t…
…o load
2dd12b2
@sclark39 sclark39 Fixed addRopeJoint interpreting parameters as local anchors instead o…
…f world anchors
4d77cd4
@sclark39 sclark39 Make zl-vfs able to load an archive that has had data prepended to it
Comment from physfs, from which this approach was inspired:
>  For self-extracting archives, etc, there's crapola in the file
>  before the zipfile records; we calculate how much data there is
>  prepended by determining how far the central directory offset is
>  from where it is supposed to be (start of end-of-central-dir minus
>  sizeof central dir)...the difference in bytes is how much arbitrary
>  data is at the start of the physical file.
c4bb574
@sclark39 sclark39 Fix issue with build docs script giving a "too many arguments" error
This was occurring if any of the required exes' path had a space in
it because it would be interpreted as separate words rather than one
string.
e2c3168
@patrickmeehan patrickmeehan Merge pull request #954 from moai/1.5-development
1.5 development
a5f0bf9
@patrickmeehan patrickmeehan Merge pull request #955 from moaiforge/pull_luajit_coroutine_stacktrace
work around incompatibility with lua_jit and the coroutine error handlin...
931646d
@patrickmeehan patrickmeehan Merge pull request #965 from JDaance/pr-pcall-and-traceback
I hazily recall working on this part of the code in my own branch after the split from 1.5. I am going to pull this in now then compare and resolve conflicts later.
6584795
@patrickmeehan patrickmeehan Merge pull request #976 from zeldin/curl-configure
curl: Use autoconf script to generate config headers on Linux
164ab76
@patrickmeehan patrickmeehan Merge pull request #983 from sclark39/ropejointinterface
Fixed addRopeJoint interpreting parameters as local anchors
ded8f3c
@patrickmeehan patrickmeehan Merge pull request #984 from sclark39/miscfixes
MOAIFont crash fix, zl-gfx assert fix, and fix for silently failing to load the main script
2d4bfbe
@patrickmeehan patrickmeehan Merge pull request #985 from sclark39/ziploadfix
Make zl-vfs able to load an archive that has had data prepended to it
dc3d4e6
@patrickmeehan patrickmeehan Merge pull request #987 from sclark39/fixbuilddocs
Fix issue with build docs script giving a "too many arguments" error
e0ed8e9
@patrickmeehan patrickmeehan Merge branch '1.5-development' into local c81db29
@halfnelson halfnelson Merge branch '1.5-development' into 1.5-stable
mods include vfs archive enhancements (can read combined moai.exe and zip file)
font loading error checking
image texture fix for glyph caching
mac address for windows
fix getRot
fix getluatype
add local box2d revolute joint
upgrade openssl to 1.0.0m
fix curl build on all linux by using configure
61777f7
@halfnelson halfnelson merged commit 593c937 into moai:1.5-stable Oct 16, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment