Collada to Lua file converter #3
Comments
ghost
assigned 
|
Mostly complete, in the tests samples folder. |
sakim
pushed a commit
to h2soft/moai-dev
that referenced
this issue
Sep 26, 2012
Fix double-increment in PushResultsList.
IkeBart
pushed a commit
to IkeBart/moai-dev
that referenced
this issue
Jun 17, 2013
[FINAL] Added global pause support
c0diq
added a commit
to quentinfasquel/moai-dev-fork
that referenced
this issue
Apr 12, 2014
commit 4043190d41d87589ab9e22e07decfec6ac388d2d
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jan 26 23:50:08 2014 +1000
fix mouse in html5 host and more ram for emscripten = more fun :)
commit c6dbe5929d81736f9ff5b1a230a21248a4073f93
Author: halfnelson <dpershouse@gmail.com>
Date: Fri Jan 24 21:38:36 2014 +1000
linux build fixes (thanks to seclorum)
commit 0319baf0a1d8af070fe5a787d2b76fbcaf369d45
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jan 5 15:08:09 2014 +1000
Fix for untz build in windows when vorbis is disabled
commit 8d439bf5f95cb912929b30791659441c2a79cd46
Author: halfnelson <dpershouse@gmail.com>
Date: Mon Nov 11 14:06:34 2013 +1000
Mods to html build to use emscripten provided cmake toolchain
Fix some relative paths
commit c152bd0669da8c2c794d306792f0e7f106f91cd5
Merge: 4871431 d4c24a6
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Oct 27 20:49:28 2013 +1000
Merge branch 'cmake-improvements' of https://github.com/halfnelson/moai-dev into cmake-development
commit d4c24a6aeaf231ad0b36447a58d70115b55626d3
Merge: 478a665 4c9b7f1
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Oct 21 07:09:09 2013 +1000
Merge branch 'cmake-improvements' of https://github.com/halfnelson/moai-dev into cmake-improvements
commit 478a66530ed6eccd593aed485773822a9860a048
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Oct 21 07:08:43 2013 +1000
fix issue with ios_luajit when path has space
commit 487143148d14b1c62d8d9e0d5804d2841233f29f
Merge: ce547e0 86bf3a3
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Oct 17 22:25:47 2013 -0700
Merge pull request #2 from JoakimBlomberg/html-host-framebuffer-fix
Framebuffertexture mode fix for html host
commit 4c9b7f128a7fdb65be5a0a7bec17663327554f67
Merge: 963d8e7 fbeda8a
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Oct 17 22:03:42 2013 -0700
Merge pull request #1 from ralepinski/cmake-improvements
Bug fixes for web untz
commit 963d8e7687ab87f62a2a480ae8d6997f630454ea
Author: David Pershouse <dpershouse@gmail.com>
Date: Fri Oct 18 00:18:48 2013 +1000
tapjoy and vungle fix
commit 86bf3a3f8008720f922b279d6a34efb95c8d31b5
Author: Joakim Tall <joakim@fastmail.se>
Date: Wed Oct 16 09:06:44 2013 +0200
for switch
commit 044020bf31b1d3f0cab0a243ad8c21f65001e5fc
Author: Joakim Tall <joakim@fastmail.se>
Date: Wed Oct 16 09:05:59 2013 +0200
Framebuffer mode fix for html host
commit fbeda8a4278d6eed5f5f05547ea914b843330cd0
Author: Ryan Lepinski <ralepinski@gmail.com>
Date: Mon Oct 14 20:12:42 2013 -0700
Restore precache capabilities
commit 83ffd13e9e9216b7239ac191f2a2a0aab97fa5c4
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Oct 14 23:13:07 2013 +1000
tapjoy fixes
commit a9e5478a5f527c5308760c0d8a53b160067615a8
Author: Ryan Lepinski <ralepinski@gmail.com>
Date: Sun Oct 13 21:19:29 2013 -0700
Fix loop sounds play state
commit bada23bf4cbe29398aa648fb09395dbd39e62845
Author: Ryan Lepinski <ralepinski@gmail.com>
Date: Sun Oct 13 21:12:00 2013 -0700
Fix web untz sound paths
commit bcb279c3568492ee03cbef3c9e2f32460291ff6d
Author: Ryan Lepinski <ralepinski@gmail.com>
Date: Sun Oct 13 21:05:20 2013 -0700
Update howler to latest version
commit c36a46005ad0d64814450fbfa7c201cac763d574
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Oct 14 07:03:46 2013 +1000
iphone cmake mods tapjoy etc
commit 9b810dce72ab83b9d7256a073b07068ae6e8611f
Author: David Pershouse <dpershouse@gmail.com>
Date: Thu Oct 10 18:08:08 2013 +1000
more work on disabled module support for ios
commit f211ba790e95ac0000bc06de53c88564cf074de3
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Oct 9 22:43:30 2013 +1000
cmake additions for iphone
commit 7ed3a144d157a9d9d5dec01bd84e728aa08a4d01
Merge: ce547e0 3e1bdb5
Author: halfnelson <dpershouse@gmail.com>
Date: Sat Oct 5 10:16:19 2013 +1000
Merge branch 'development' of http://github.com/moai/moai-dev into cmake-improvements
commit 3e1bdb5ce8ba6757b54d45d151b094bc57f6a417
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 29 23:34:01 2013 +0900
fix small xcode.
commit ce547e01ca0e05fcd76483727169a8cf367971ba
Author: Halfnelson <dpershouse@gmail.com>
Date: Fri Sep 27 21:32:30 2013 +1000
fix host-test build failure with cmake
commit 4c412ac37e3ec83a9560fafdc093b139154ca204
Author: Halfnelson <dpershouse@gmail.com>
Date: Fri Sep 27 14:00:25 2013 +1000
untz-html changed to be like others. Fixes rebuild
commit b9d2c177ca6922906da678a822c72b997862e901
Merge: 16f5dc7 d648713
Author: makoto <makotok1123@gmail.com>
Date: Thu Sep 26 10:14:49 2013 -0700
Merge pull request #784 from JandyCo/android-luajit
Add LuaJIT Support to Android Host
commit fb54f065e24786cea99fd2045d644e5f5240660d
Author: Halfnelson <dpershouse@gmail.com>
Date: Thu Sep 26 00:02:49 2013 +1000
moaijs host template update. Fix to moaihost
commit 705eb6c1f49a0571c618883203281851b42a785f
Author: Halfnelson <dpershouse@gmail.com>
Date: Wed Sep 25 22:00:35 2013 +1000
Compile working for latest emscripten (1.5.6)
commit 340d01f870c8459d7f8644dacb5c2d93db356cfb
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Sep 25 13:31:04 2013 +1000
fix case sensitivity in zlcore cmake
commit 5565dfc5fef4ebbec1c110d3f93c493ecf5f584b
Merge: debcad0 16f5dc7
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 24 22:27:15 2013 +1000
Merge remote-tracking branch 'moai/development' into cmake-development
commit debcad0bb9b919a0e327b61283a000020f078a8e
Author: David Pershouse <dpershouse@gmail.com>
Date: Tue Sep 24 22:17:26 2013 +1000
playhaven added to cmake
commit b38fe87c72b02810f4a4aa0b3e98b06ab234cf1c
Author: David Pershouse <dpershouse@gmail.com>
Date: Tue Sep 24 13:14:41 2013 +1000
nsurl support for osx
commit 16f5dc7b096a2c258e74a064d93946deef17ee0c
Merge: a38d9a2 c1cca98
Author: joshua-jandyco <joshua@jandyco.com>
Date: Mon Sep 23 17:09:14 2013 -0700
Merge pull request #786 from moai/fix-merge-master-to-dev
Fix sound on iOS and Android host due to wrong macro
commit d64871302632332ffdc040dbf9ab7b6b84e12589
Author: Joshua <joshua@jandyco.com>
Date: Mon Sep 23 19:31:53 2013 -0400
Run the libluajit target only to prevent errors when building the unused executable
commit 605ab790c999d080e450d1f142b9d74f063a257b
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Sep 23 23:56:11 2013 +1000
Add audiounit for osx cmake
commit 96254de9c33ebed2f5b114bfee6db12ff7008430
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Sep 23 23:40:15 2013 +1000
cmake updates for untz osx
commit c1cca98ddbc961e940f112373e3e1142a28ec244
Merge: a38d9a2 55d4c79
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 23 14:33:09 2013 +0900
Merge branch 'master' into development
Fixed a problem that could not be compiled.
Conflicts:
ant/libmoai/jni/src/moai.cpp
xcode/ios/Classes/MoaiView.mm
commit 55d4c794a60bb01e12b6ebe7c4d48fdea3ff6137
Merge: 9bbdb34 05d8bbd
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 22 18:53:25 2013 -0700
Merge pull request #783 from JandyCo/fix-host-sound
Fix sound on iOS and Android host due to wrong macro
commit d637ccdc498b469005604da4f0c3fa9524e08f34
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 22 22:39:07 2013 +1000
Turn off untz logging
commit b642c9ffb3f40ecce1872b5220ca6e94d509d8bb
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 22 15:43:02 2013 +1000
Untz work for CMake and mingw64 compile
commit 802e71295e4dc9fdd625c025c37b64985c0388b4
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 22 14:58:43 2013 +1000
mods to openssl headers for mingw64 build
commit 7da5846ee5ce326637c9b9cae856124909d1f77e
Author: Joshua <joshua@jandyco.com>
Date: Sat Sep 21 19:19:24 2013 -0400
Update varargs in init.lua to accomodate differences with LuaJIT
commit a85db4af8f3f5b061c377f675a9eec3f747eb26b
Author: Joshua <joshua@jandyco.com>
Date: Sat Sep 21 19:19:01 2013 -0400
Add LuaJIT to make-host and libmoai build
Add compilation, argument checking, etc for luajit in the make-host and
libmoai build.
commit b70712d27c887c55b83dedb1aea905cb6d1a96c1
Author: Joshua <joshua@jandyco.com>
Date: Sat Sep 21 19:17:05 2013 -0400
Add luajit libraries to Android ndk build
commit 05d8bbdc94b9bc86bd53a39e0c7487cfb0992635
Author: Joshua <joshua@jandyco.com>
Date: Sat Sep 21 11:26:22 2013 -0400
Fix sound on iOS and Android host due to wrong macro
Replace USE_UNTZ and USE_FMOD macros with MOAI_WITH_FMOD and
MOAI_WITH_UNTZ to fix sound on iOS and Android hosts.
commit 2b3de22f5fdd0d603e6281911d9cd1096ded353a
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Sep 19 23:48:16 2013 +1000
Configured include directory for openssl to work with updated mingw64
commit e15d3ebd816ce028cf4b843706a12d64ba908817
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Sep 18 12:29:16 2013 +1000
untz windows for cmake and refactor of cmake untz
commit a38d9a2794e7e779817c22d74b8416bf3c5fc4a5
Author: makoto <makotok1123@gmail.com>
Date: Wed Sep 18 01:50:14 2013 +0900
#775 Add LuaJIT support on iOS and OS X
commit 81e6b8eca35ff0a7cf7b3bceb5dd2812d8de5415
Merge: 05ba05b 945e961
Author: makoto <makotok1123@gmail.com>
Date: Tue Sep 17 09:20:25 2013 -0700
Merge pull request #775 from JandyCo/luajit-mac
Add LuaJIT support on iOS and OS X
commit 945e9610944743bbebc187c4c735efd0e0712195
Author: Joshua <joshua@jandyco.com>
Date: Mon Sep 16 19:02:16 2013 -0400
Remove LuaJIT portion of the Xcode readme
Guide to non-LuaJIT build is no longer needed with the separate schemes
for Lua and LuaJIT builds.
commit c049283b19d81524d8a7cbe480fcc200a3a8fd32
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 15 21:56:26 2013 -0400
Update OSX Project with LuaJIT target
* Add moai-luajit target for JIT builds
* Use existing moai target for non JIT builds
* Add scheme for JIT builds.
commit cdf421b413c9db4b96a99dc531fb35c13a9fac2c
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 15 21:55:47 2013 -0400
Update iOS Project with luajit target
* Add moai-luajit for building with jit
* Use existing moai target for building without jit
* Adding scheme for JIT
commit 7b8d5e19853368d5bb358b77ed46905dae3d71d0
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 15 21:53:33 2013 -0400
Update libmoai Xcode project w/luajit targets
* Add LuaJIT targets for iOS and OSX
* Remove old luajit compile scripts in libmoai-ios and libmoai-osx
commit 578113b9e6b51cab250cad46e18f240b653a2180
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 15 21:50:07 2013 -0400
Update the luajit build scripts
* Remove commented out code
* Add input args for product name and destination to tie into xcode
target
commit c3548a36f142a8d3ce66c874e0480588cfb88a96
Merge: dea3e0b 05ba05b
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 15 14:30:44 2013 +1000
Merge remote-tracking branch 'moai/development' into cmake-improvements
commit dea3e0bd0f6cf6b80522454ef5409550a5fe1721
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 15 14:27:41 2013 +1000
don't hardcode thirdparty includes in zlcore.
commit d68976faf17c6faee7d0f589b71704d5e5f6d498
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 15 14:06:42 2013 +1000
Remove vendored freeglut. Now part of the windows host
commit 05ba05b24e54537fb66234f92b8c4de8414cdea2
Merge: 83e0acf 0a07431
Author: superquadratic <code@superquadratic.net>
Date: Fri Sep 13 06:53:06 2013 -0700
Merge pull request #778 from patrickmeehan/fix/seed-rand-sfmt
Seed value for SFMT rand; fixed vs2008, vs2010 build
commit 0a074310491a5ebfbad03a702af4247b2efc86e6
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 10 16:03:09 2013 -0700
added csv output file and xlsx with graph to util/math-rand sample folder
commit e99e084e45082c20af70970ff790436cdcc64970
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 10 16:02:24 2013 -0700
added seed from clock () on MOAIMath sfmt init; added MOAIVecPathGraph to vs2008, vs2010; modified util/math-rand sample to output histogram
commit 46a84bab41f171f8e1c3ae234373966f04e808bd
Merge: 5f95823 971232a
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 10 22:50:29 2013 +1000
Merge branch 'cmake-improvements' into cmake-development
Conflicts:
src/moai-util/host.cpp
commit 5f95823744be6ffdf34825b3a0d1c058d4ed980f
Merge: 7b2f990 c876275
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 10 22:33:47 2013 +1000
Merge branch 'development' into cmake-development
commit c8762755c24946b94b3a4f37f24fa9e6292ece70
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 10 22:29:42 2013 +1000
Revert "Merge pull request #774 from jacobgardner/cmake-fix"
This reverts commit 9bbdb3441e0295e4160fc198b4cb0f71019c1b59, reversing
changes made to 218bdcf1ecfb6fe1b0ace6fa3a81317da815bf11.
this has been fixed already in main cmake-development branch to use the
bundled libs not link against system libs (for consistency)
commit 7b2f990c690e1fe0f9bea33a811f645407949486
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 10 22:04:18 2013 +1000
Revert "Guard win32 specifc openssl code against being compiled with not win32 platforms"
This reverts commit 1625df7db9e2aef3676ad664128cac1515b2c113.
commit 5e63d621e7ddb761a722d313ce64026625d2340a
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 8 20:36:15 2013 -0400
Update Xcode project readme
* Change format to markdown
* Add information on how to switch to non JIT compilation
commit 76618d099b1f720a89947e9d04bbd928f3fe6743
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 8 20:35:43 2013 -0400
Update osx and ios projects to use LuaJIT
commit cefd37d702e571f5c51c40a917fcf2914f0aabf7
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 8 20:35:21 2013 -0400
Update libmoai Xcode project for LuaJIT builds
* Separate Lua compilation into its own target
* Two new targets: libmoai-ios-lua and libmoai-osx-lua
* Adding new variable for enabling/disabling luajit
commit 247438db8cdef9be546111194ea3152504d20a2c
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 8 20:32:17 2013 -0400
Add scripts to build luajit for iOS and OSX
commit 83e0acf5bd9e6a68c20ff9e25c7714ec3cc2c4e9
Merge: dd187a6 9bbdb34
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 9 00:45:01 2013 +0900
Merge branch 'master' into development
commit 9bbdb3441e0295e4160fc198b4cb0f71019c1b59
Merge: 218bdcf a758329
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 8 08:38:11 2013 -0700
Merge pull request #774 from jacobgardner/cmake-fix
Fix to allow LUAEXT to work on linux.
commit dd187a6689dabd09b1b37b068f308f170ff3003c
Merge: ced2916 7417cfd
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 8 08:34:35 2013 -0700
Merge pull request #768 from patrickmeehan/fix/vs-remove-libcares
Removed libcares from Visual Studio projects
commit a75832994b30cb9f35b169c9babe500d4c2c4671
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 10:24:11 2013 -0500
Reset build script to original
commit 8f09b94f8ee6d7ebb990dc48e257339ade1eec64
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 10:18:58 2013 -0500
Fix bad change.
commit 071a80ae5306d1814f345f021413817f6b00ccb8
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 10:09:35 2013 -0500
Revert some changes
commit 9aaf7dc676e69d5a1013c17eacbc7856b09f4df5
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 10:01:20 2013 -0500
Revert to previous state
commit 4ac1809753a8781790b84140a2050d4de15897e5
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 09:43:24 2013 -0500
Fix CMAKE so luaext works
commit 971232aa27bf6762241d3e4d8ba0c6dbf98cf68b
Author: Halfnelson <dpershouse@gmail.com>
Date: Sun Sep 8 22:12:12 2013 +1000
optimize emscripten output
commit 401d89c147e5308524dcc98c25248601fefc3527
Author: Halfnelson <dpershouse@gmail.com>
Date: Sun Sep 8 21:52:41 2013 +1000
Fix to html host to allow resizing.
was breaking mouse move capturing.
Define GL_ES in html host to get precision specifiers
commit 7c23fd120d352cd00888fd8ff135a091d31e4519
Merge: ced2916 a2134f0
Author: halfnelson <dpershouse@gmail.com>
Date: Fri Sep 6 18:23:47 2013 +1000
Changes to CMake build system and HTML/JS host
CMake changes add support for Html host, mingw32 (windows), android, ios and fixes some optional modules on linux and osx
Changes to zl libs to support html host
html5 host template and build script added
Fix curl for osx
Fix android ZLLog support (broken by reorg)
Add web-untz for html5 host
added freeglut as non-external (will probably remove)
commit ced2916591e083b07ceaca0b285e86ed65487c39
Merge: a8d1c7f 1b45a51
Author: makoto <makotok1123@gmail.com>
Date: Thu Sep 5 10:55:05 2013 -0700
Merge pull request #770 from theGoodEvil/vec_path_graph
Support Path Finding in Arbitrary Graphs
commit a8d1c7fb78cc4b16e5661c624aed4a66bf091440
Merge: cbe3db0 218bdcf
Author: makoto <makotok1123@gmail.com>
Date: Fri Sep 6 02:45:48 2013 +0900
Merge branch 'master' into development
commit cbe3db0072843f76464801c45b3d1758e19d0f94
Merge: 325ecbe 89afcc5
Author: makoto <makotok1123@gmail.com>
Date: Thu Sep 5 09:51:24 2013 -0700
Merge pull request #771 from JandyCo/host-physics
Fixing physics on iOS and Android
commit a2134f07395963a23c7f978b11723ac64c79c088
Author: Halfnelson <dpershouse@gmail.com>
Date: Thu Sep 5 21:47:00 2013 +1000
fix untz on linux
commit 89afcc5f6c2ce70076e6135bfcca40bc5b385237
Author: Joshua <joshua@jandyco.com>
Date: Wed Sep 4 22:21:10 2013 -0400
Fix physics on ios
Initialize chipmunk and box2d on ios so that physics works. Add
missing finalize of util and sim.
commit f13c5e79ce460bb5b859ce88c505e6dabf8e43f6
Author: Joshua <joshua@jandyco.com>
Date: Wed Sep 4 22:20:18 2013 -0400
Add box2d and chipmunk initialization to android host
Box2d and chipmunk were not initialized so it would not work on
android. Add AKUFinalizeUtil and AKUFinalizeSim as they were missing.
commit cb4715c39f92261272b33a65b38c61747ed8431c
Author: Joshua <joshua@jandyco.com>
Date: Wed Sep 4 22:19:14 2013 -0400
Update physics samples to run on devices
Updated the physics samples, box2d and chipmunk so that they scale to
multiple resolutions and respond to touch events.
commit 325ecbeb024e4e0fa35740f5531043eec7f5cf3d
Author: Guido Lorenz <code@superquadratic.net>
Date: Wed Sep 4 17:28:54 2013 +0200
Fix compilation error
commit d17bcf250625867c9de2c1e1b7057c31814d071d
Merge: 1cbb768 6d9e811
Author: superquadratic <code@superquadratic.net>
Date: Wed Sep 4 08:27:06 2013 -0700
Merge pull request #769 from patrickmeehan/fix/lua-gc
Revisions to Moai Lua binding, memory management and garbage collection
commit 1b45a512a2ab4ad07205863a9061a391d85eb0f7
Author: Guido Lorenz <code@superquadratic.net>
Date: Wed Sep 4 16:47:31 2013 +0200
Add new file to NaCl build script
commit 355055415a3c46b92954cc4b8a6194aa39d11aa0
Author: Halfnelson <dpershouse@gmail.com>
Date: Wed Sep 4 23:41:12 2013 +1000
Updates to get curl working again on linux.
Added fix to gluthost to solve problem with linux glut on virtualbox
commit fa0af699148b411e30f354f256c69ebfc259c9f4
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Sep 3 15:32:08 2013 +0200
Turn path finding into complete A*
commit ae02769826a45df23b8ad5aa99bc3946a33829cc
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Sep 3 16:19:41 2013 +0200
Add MOAIVecPathGraph
commit 87c694951667179dd15dc0fe0766c95c252b82ee
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Sep 3 14:49:48 2013 +0200
Allow any PathGraph with PathFinder
commit 218bdcf1ecfb6fe1b0ace6fa3a81317da815bf11
Merge: 032befd 1739f4e
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Sep 3 10:27:26 2013 -0700
Merge pull request #764 from makotok/doc_improvement
Doc improvement
commit 1739f4e7503a7fb5c0f1dbc5d3cd68f8c337a729
Author: makoto <makotok1123@gmail.com>
Date: Wed Sep 4 02:12:08 2013 +0900
Improvement in the README.
commit 1cbb768c0944538af5d900761cab4b1cd5961e53
Merge: 94ad43a 223eb3b
Author: superquadratic <code@superquadratic.net>
Date: Tue Sep 3 09:18:11 2013 -0700
Merge pull request #767 from patrickmeehan/fix/missing-static-glyph
no longer crashes when a glyph is missing from a static glyph cache
commit 6d9e811770e3435c8d273e41c2fb89ff7ee386c5
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 02:43:41 2013 -0700
cleaned up implementation of latches in MOAITask and MOAIHttpTaskBase
commit 42c8f6424008ea9f78ea50054a9d30d982891127
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 02:29:10 2013 -0700
removed strong ref from MOAILuaObject::OnRetain (). Also removed LockToRefCount in favor of creating explicit string refs to self as needed
commit 7417cfd1e8b8682640dfc89f9e364aec72f1d394
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 00:32:41 2013 -0700
restored call to set curl timeout in MOAIHttpTaskCurl.cpp
commit d762edb4f1ce662f036f6a33d76fb7652eca783e
Merge: b85153a 94ad43a
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 00:28:01 2013 -0700
merge from development
commit b85153a8cb122088deca08022189d7aa75a490c7
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 00:22:15 2013 -0700
removed libcares from vs projects
commit 223eb3bd623ce61eaecf2c3f42d104019e2b4dcd
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Mon Sep 2 23:19:50 2013 -0700
no longer crashes when a glyph is missing from a static glyph cache
commit 2b22b1d0321ce32191225ce3da9fe4d8a17998ea
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Mon Sep 2 15:38:41 2013 -0700
adding flags for ares in VS build
commit 94ad43a792d1ed6956fdb27ce766d4fde5cbb306
Merge: a599cd5 032befd
Author: Guido Lorenz <code@superquadratic.net>
Date: Mon Sep 2 10:48:30 2013 +0200
Merge branch 'master' into development
commit 032befdff62863e2f9f8632ed0b6cc39316ce832
Author: Vavius <vavius@gmail.com>
Date: Sun Sep 1 23:38:48 2013 +0400
Fix setClearColor with no arguments (to disable clear color)
commit a599cd538d064f30a66bd5fd7c9aac45375dd71e
Merge: 9c45fb1 3c72ac3
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sun Sep 1 11:03:36 2013 -0700
Merge pull request #765 from makotok/fix/device_clear_color
Fixed compatibility setClearColor.
commit 3c72ac356b7b0210345df0731384ed0e520f92d5
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 02:53:48 2013 +0900
Fixed compatibility setClearColor.
commit 98e6562dfb1903ad286eff13ecd0775ee9abb9b0
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 02:02:52 2013 +0900
Improvement in the README.
commit b8aeb7de30affb3946dd1d9777ddd58aae6f42cf
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 01:46:13 2013 +0900
Optimized for the github README.
commit 9c45fb116544a9bc9ffa43639182bbe8307a6514
Merge: eac9ba0 f7cdde8
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 08:47:58 2013 -0700
Merge pull request #763 from moai/optional-twitter-ios
Adding the ability to disable Twitter for IOS.
commit f7cdde8b3ed3cd1b13d96aa33a159d0e2f7efd50
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 00:47:16 2013 +0900
Modified to match the format.
commit eac9ba03493632d646ca86f0f09c4c303fca51d0
Merge: 1f8e90c 31e2c34
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 08:37:21 2013 -0700
Merge pull request #762 from moai/MOAIBrowser
Create a shared interface, MOAIBrowser for opening urls across platforms
commit 31e2c3435d47ecd5efc3ba6d551debda0e387ccd
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 00:34:47 2013 +0900
Compatibility fixes due to the change in MOAIBrowser
commit 66d90fc3d82af27a4abf5222866b250b17185823
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 16:47:12 2013 +0900
Add a sample of MOAIBrowser.
commit 09bef91706a1cf4558f285fefac98cf4c9843354
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 15:48:36 2013 -0400
Adding the ability to disable twitter for IOS.
Implements what PR #691 does against the latest development branch.
commit 1f8e90cd088bb3754b24e9014de85a630678f202
Merge: 0575a7e 95ff272
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sat Aug 31 12:21:29 2013 -0700
Merge pull request #760 from makotok/feature/ios_hide_keyboard
Feature/ios hide keyboard
commit 124e8ce0902f296b67f96f5ea9df9e4cdc2c52f6
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 14:54:24 2013 -0400
Adding canOpenURL to MOAIBrowser
Adding canOpenURL to MOAIBrowser as defined in PR #413
commit 299370e3b7e32341d8328ad82de2038b674aca8d
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 14:04:28 2013 -0400
Fixing the remaining issues with MOAIBrowserAndroid
commit 4466f9d958b548b63aa21c1c203c9c41058a80e9
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 13:37:01 2013 -0400
Fixing variable name in browser cpp and adding MOAIBrowserAndroid to the make file
commit ca75b67758130533545b0287f1f7fc255b1df348
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 13:29:40 2013 -0400
Adding implementation of openURLWithParams for Android, adding MOAIBrowser include in moaiext-android.h
commit 95ff272169c6e702fe207bc3b099ffa9a08cbb6c
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 01:39:43 2013 +0900
Added the ability to close the software keyboard of iOS.
commit 0575a7e119ca19e2f69c39b2937a6cd5804c6cdb
Merge: e34bf67 614684d
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 00:26:07 2013 +0900
Merge branch 'master' into development
commit 614684dce2c88929120d5dacc15aec7cf12472f0
Merge: 940befc 3afd4c8
Author: makoto <makotok1123@gmail.com>
Date: Sat Aug 31 08:12:05 2013 -0700
Merge pull request #755 from theGoodEvil/pvr_support
Fix PVR Texture Support
commit d77445e3d0089b22a6ded66c97de185f00748439
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 10:35:59 2013 -0400
Removing MOAISafariIOS from libmoai project and adding MOAIBrowser
commit 551876aad8966a78b2b4b260be23ae04a715a6b2
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 10:34:48 2013 -0400
Updating moai.lua and compiled header, replacing instances of MOAISafariIOS with MOAIBrowserIOS
commit c65ec2fc3cffac848e22488bc37597f5f3c05c46
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:44:50 2013 -0400
Moving openURL from Moai.java to newly created MOAIBrowser.java
commit 87c367dd969e89ff1584abe5da91021b6008f6a0
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:33:57 2013 -0400
References MOAIBrowser java class, adding the openURLWithParams method
commit 217c24343442ae400e09c230d62a524294dd7045
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:23:36 2013 -0400
Updating copyright year and some comment typos
commit bfa2591960d3d6e648c7074bbab81059d07c74e6
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:22:03 2013 -0400
Moving openURL from MOAIAppAndroid to MOAIBrowserAndroid
commit f9994611c2930998ba17b2782ac7ac53d2d1e6ae
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:10:50 2013 -0400
Adding MOAIBrowserAndroid
commit 5cf47735899419359c7795f8348fa8dab20fa87a
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:06:26 2013 -0400
Renaming MOAISafariIOS to MOAIBrowserIOS
commit 98fe4ecd9072d6de5f10fdfcc46f83a79d51e694
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:05:59 2013 -0400
Renaming MOAISafariIOS to MOAIBrowserIOS
commit e34bf67a30dd6793eb1b426dc0466173fec91702
Merge: a64c2f1 8e8feac
Author: joshua-jandyco <joshua@jandyco.com>
Date: Fri Aug 30 15:42:15 2013 -0700
Merge pull request #758 from theGoodEvil/lua_popen
Enable popen etc. on Mac OS X
commit a64c2f121db8faeb1829729a61c7aae8aff89492
Merge: 5befd3f 5f182cd
Author: joshua-jandyco <joshua@jandyco.com>
Date: Fri Aug 30 15:23:05 2013 -0700
Merge pull request #757 from theGoodEvil/get_interface_orientation
Add MOAIAppIOS:getInterfaceOrientation()
commit 5befd3fdd5a2914640d957d7610e70bb33a16291
Merge: be29095 5641df6
Author: joshua-jandyco <joshua@jandyco.com>
Date: Fri Aug 30 15:08:32 2013 -0700
Merge pull request #756 from theGoodEvil/fix_warnings
Fix Warnings in Xcode Builds
commit 8e8feac6ed6833ad4f124038b9d1d54fb8d3c9ee
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 17:28:24 2013 +0200
Set LUA_USE_MACOSX for OS X host build
This enables some extended Lua functionality, like io.popen.
See https://github.com/moai/moai-dev/pull/706.
commit 33699694f7d5eef86322506dee4343533a717a84
Author: halfnelson <dpershouse@gmail.com>
Date: Sat Aug 31 00:57:12 2013 +1000
fix luasocket build in windows (cmake)
commit 5641df69a84df411284f0ffff566ea853858419e
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 15:13:18 2013 +0200
Simplify ARC macro definitions
commit ff2140ffa01624ed403ce7d15840c75c5446dce4
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 15:12:21 2013 +0200
Fix ARC detection preprocessor directive
commit 5ee525cbabf8876b5a9c7d7c574b315a440b50fd
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 15:08:00 2013 +0200
Fix warning about missing function prototype
commit c0be400e30dfb54e567620bfaa9d7c68e794eced
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 15:00:40 2013 +0200
Fix warning from SFMT library
Usually I don't like tinkering with 3rd-party code, but this
warning is very annoying and rather useless. It's only there
to say that a sensible default value was chosen, which is
nothing to be worried about.
commit 72be3c5f5f9b5c6544410a6d26fc2af15038a8be
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 14:52:38 2013 +0200
Fix warning about unused vaiable in release mode
commit cf72c1ee17d6ff6aef5ace01896f53fcb222866f
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 14:50:29 2013 +0200
Remove unused variable that is shadowed by another one later
commit be29095200a742f905dc91fb7f31775f057966d7
Merge: 5a117fe d51512a
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 14:41:08 2013 +0200
Merge branch 'removing-warnings' of github.com:mindsnacks/moai-dev into development
commit 5f182cd7e3e7425f2d8294ff38f3c70437fb811e
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 14:21:43 2013 +0200
Add MOAIAppIOS.getInterfaceOrientation()
commit 9ef41f55c89af9d91217f2687bdc963d9db2fdb0
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 13:15:18 2013 +0200
Sort Lua functions by name in MOAIAppIOS
commit 3afd4c820ba5d0c3cb5dd3a30296fbf98672f23b
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 12:17:12 2013 +0200
Remove unnessecary casts
commit f25940ddc96c0218ea4108cd43df16e8d2c77fe8
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 11:45:47 2013 +0200
Fix PVR support by using zgl abstraction layer
commit e178588d8f35a49df765f0ac65e10b2a6d64c691
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 10:43:21 2013 +0200
Enable PVR support on iOS
MOAI_TEST_PVR was defined in a place where the actual PVR
code could not see it. Since it was just an alias for
MOAI_OS_IPHONE, I replaced it with that.
commit 5a117fe9708a1e4b0e190e732dafeb91908cb414
Merge: f192102 4f428e9
Author: joshua-jandyco <joshua@jandyco.com>
Date: Thu Aug 29 10:42:58 2013 -0700
Merge pull request #737 from moai/feature_android_performance
It dramatically improves the performance of Android.
commit f19210299e92a9f1ab10826ee3c80fea5caa4e1e
Merge: 039bc2d 940befc
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 29 18:00:02 2013 +0200
Merge branch 'master' into development
commit 940befc38f4ecb728ab1481ad15fa39d4c88bc15
Merge: 7c8cff7 7df2bd5
Author: joshua-jandyco <joshua@jandyco.com>
Date: Thu Aug 29 08:43:33 2013 -0700
Merge pull request #754 from theGoodEvil/fix_ios_extensions
Fix Compilation of some iOS Extensions
commit 7df2bd5561e9f7d682ee7db8f4ba96ab3b5843a0
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 29 17:15:05 2013 +0200
Fix compilation of some iOS extensions
These extensions weren't updated when MOAILuaStateHandle
was renamed to MOAIScopedLuaState in changeset
39eba52567b652f9af7f962743d5fd8bee037ce9.
commit 039bc2d6d9cee656486ad6b3c3f9da2c1df9e283
Merge: 0ded7f4 7c8cff7
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 29 17:04:06 2013 +0200
Merge branch 'master' into development
commit 7c8cff774929649be2e7c8242ed7abc1c275e649
Merge: ab78dcd 9a56a88
Author: joshua-jandyco <joshua@jandyco.com>
Date: Thu Aug 29 05:35:36 2013 -0700
Merge pull request #750 from theGoodEvil/fix_timer_event_stop
Fix MOAITimer.EVENT_STOP
commit 9a56a8853cee9457984e537a80be78936823fde3
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 29 11:19:04 2013 +0200
Fix MOAITimer.EVENT_STOP
The new MOAINode::EVENT_UPDATE (enum value 0) collided with
MOAIAction::EVENT_STOP (also enum value 0) in MOAITimer, which
is derived from both Node and Action. As a result, EVENT_STOP
was triggered every frame. Fixed by starting MOAIAction events
at MOAINode::TOTAL_EVENTS, similar to MOAITimer events starting
at MOAIAction::TOTAL_EVENTS.
commit 30f2f9b9b4b541e6c74f25b331174d5b261b7544
Author: David Pershouse <dpershouse@gmail.com>
Date: Thu Aug 29 15:50:52 2013 +1000
Add freeglut (not as submodule)
some Cmake fixes for mingw32. Still some unresolved symbols
commit 0ded7f480c4434f0276f7b9a151d6fb9b4b63aa3
Merge: 55f8c88 bd4adb0
Author: joshua-jandyco <joshua@jandyco.com>
Date: Wed Aug 28 14:00:54 2013 -0700
Merge pull request #748 from theGoodEvil/add_get_listener
Add some getListener() functions
commit 55f8c88afb84c34713bc3f84bf3e00f208202e58
Merge: 708cb2a 3630145
Author: joshua-jandyco <joshua@jandyco.com>
Date: Wed Aug 28 11:55:50 2013 -0700
Merge pull request #749 from theGoodEvil/xcode_settings
Update Xcode projects to recommended settings
commit 1d22883d39d43f3bc3f531923b79b548725c5418
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Aug 29 00:12:56 2013 +1000
Some fixes to cmake mingw32. WIP still some linker errors
commit 3630145a6192d6986dc3626b9f3161351addc53e
Author: Guido Lorenz <code@superquadratic.net>
Date: Wed Aug 28 15:09:34 2013 +0200
Update Xcode projects to recommended settings
commit 4f428e9ab0c90a4df6452005b234b6888e26abbd
Author: makoto <makotok1123@gmail.com>
Date: Wed Aug 28 02:48:36 2013 +0900
#737 It dramatically improves the performance of Android.
Again. I have modified only access to the UI.
commit 708cb2a2512f65d6dbaa0dc677dc6fc0f08f9d7f
Merge: 3c1ef1a ab78dcd
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Aug 27 19:34:24 2013 +0200
Merge branch 'master' into development
commit 18b50dd7e67ebca0d95e88b5c4cc6e1531d38680
Author: makoto <makotok1123@gmail.com>
Date: Wed Aug 28 01:43:44 2013 +0900
Revert "#737 It dramatically improves the performance of Android."
This reverts commit b84846af04ed5b80e39c77734b9cda7f216e70d5.
commit ab78dcd5b2f6dd2c2a225f5b29931393954d4a01
Merge: c2c4abc 475a5ee
Author: superquadratic <code@superquadratic.net>
Date: Tue Aug 27 09:33:47 2013 -0700
Merge pull request #745 from Vavius/fix-MOAIParticleForce
fix MOAIParticleForce attractor bug
commit bd4adb0d9dd541e7343edad204ac1f5b74a1f012
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Aug 27 17:52:06 2013 +0200
Add MOAIGlobalEventSource.getListener()
commit c2a9fd10f6a44ef8d04822d07fdde1a0e2c37ecd
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Aug 27 17:47:52 2013 +0200
Add MOAIInstanceEventSource:getListener()
commit 3c1ef1ae72860958a3f71f9632e46b6a68474348
Merge: 13a95ea c2c4abc
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 27 05:18:25 2013 -0700
Merge pull request #747 from moai/master
Merge Thai Text Rendering Changes to Develop.
commit c2c4abc7638e8dceeddcc49f00a170324668ff4e
Merge: c1dd6df 8b5a3cd
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 27 04:59:17 2013 -0700
Merge pull request #746 from Vavius/fix-MOAITextDesigner
fix text box not displaying some characters
commit 475a5ee9f5586fb1fdc370743e190d75e9657166
Author: Vavius <vavius@gmail.com>
Date: Tue Aug 27 12:31:21 2013 +0400
Add test case particle-default-force
commit 8b5a3cd7a500a8c4417cae9580c1277f93b26429
Author: Vavius <vavius@gmail.com>
Date: Tue Aug 27 11:35:58 2013 +0400
Add test case textbox-thai
commit b84846af04ed5b80e39c77734b9cda7f216e70d5
Author: makoto <makotok1123@gmail.com>
Date: Tue Aug 27 11:08:11 2013 +0900
#737 It dramatically improves the performance of Android.
Fixed due to the move to GLThread
commit d0a7d0bd97176d3cab86c8ee692f851d47d8a772
Author: Vavius <vavius@gmail.com>
Date: Mon Aug 26 20:50:26 2013 +0400
fix text box not displaying some characters (thai and other specific)
commit 7e20f4cc1e513d4c0935196df7c6fc6a3c999e11
Author: Vavius <vavius@gmail.com>
Date: Mon Aug 26 20:40:51 2013 +0400
fix MOAIParticleForce attractor bug (applies random force if particle is out of attraction radius)
commit 99e9529232149933ffb40828af639670949af343
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 18:07:35 2013 -0400
Fixing conflict from merge.
Adding both the screenOrientation and asset_dirs options to
settings-local.
commit bd665ea81c39ba93adb0caa47bc343b851f6ae47
Merge: dc4ca32 13a95ea
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 18:04:45 2013 -0400
Merge remote-tracking branch 'origin/development' into feature_android_performance
Conflicts:
ant/host-source/d.settings-local.sh
commit 13a95ea64eb985522cea7194145274325ba270ea
Merge: a7afc11 9020df6
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sun Aug 25 13:44:42 2013 -0700
Merge pull request #743 from JandyCo/android-host-improvements
Improving Android Host Builds
commit 9020df6769ef9c68c98439ef784d358565ffab2f
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 16:35:49 2013 -0400
Improving Android Host Builds
* Adding ability to follow symlinks in copying lua source
* Adding configurable assets
commit a7afc11d172dbe4de4c97eaf7117b00352601239
Merge: 9ff57ca 2e33708
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sun Aug 25 13:25:43 2013 -0700
Merge pull request #742 from JandyCo/android-sendmail
Adding sendMail to Android
commit 2e33708b2b67fd7d0bff04ba02f1d4370bc96205
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 16:23:29 2013 -0400
Adding sendMail to Android
Adding the ability to send e-mails like the functionality available on
IOS.
commit 9ff57ca23b7648166f718deebb49bbd7dc36e05c
Merge: c1dd6df 4f858a1
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sun Aug 25 12:29:15 2013 -0700
Merge pull request #741 from JandyCo/facebook-graph-parameters
Allowing parameters to be passed to facebook graph requests.
commit 4f858a1b9b23a734f94cfaac982196d790f48ee6
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 15:26:15 2013 -0400
Allowing parameters to be passed to facebook graph requests.
*Allows parameters in IOS and Android facebook graph requests.
*Modified Android graphRequest to be asynchronous, like the IOS verison.
*Fixed a null pointer issue in IOS facebook getSession
*Adding REQUEST_RESPONSE_FAILED call back for graph requests.
*Updating doc comments.
*Adding JniUtils for common JNI operations.
In the future I'd like to see a means of passing what request the call
back is for as well as more information about errors that occured.
commit c1dd6df89bf6ce61eef8e8908d22f47627e1c002
Merge: c29ab16 7b56ced
Author: makoto <makotok1123@gmail.com>
Date: Sun Aug 25 23:40:46 2013 +0900
Merge branch 'development'
commit c29ab166da0802e7321644223350104caee26d7b
Merge: 852a587 ba3b58a
Author: makoto <makotok1123@gmail.com>
Date: Sun Aug 25 04:10:26 2013 -0700
Merge pull request #738 from theGoodEvil/contributing
Contribution Guidelines
commit ba3b58a72ccb764daf4f0cf4386e657f39926382
Author: Guido Lorenz <code@superquadratic.net>
Date: Sun Aug 25 12:49:11 2013 +0200
Add clause about merging master into development
commit 7b56ced56a85066945c61f695ce857b83ce558bd
Merge: 2089973 e2a8ee7
Author: makoto <makotok1123@gmail.com>
Date: Sun Aug 25 02:55:03 2013 -0700
Merge pull request #739 from theGoodEvil/fix-playhaven-pathes
Fix iOS build
commit e2a8ee7bee21c23246c1ecd4f9c6c3075c718e36
Author: Guido Lorenz <code@superquadratic.net>
Date: Sun Aug 25 11:45:56 2013 +0200
Fix path for some playhaven source files in Xcode
commit c5877280ab6a46bc6ef4caa77950d93884077824
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 22 23:24:01 2013 +0200
Add contribution guidelines
commit dc4ca3241ab0f61e9c72287926743108797eef6c
Author: makoto <makotok1123@gmail.com>
Date: Thu Aug 22 03:38:57 2013 +0900
Miss fix.
commit b552566072d95ab475c9d2e133c449beea2b33c9
Author: makoto <makotok1123@gmail.com>
Date: Thu Aug 22 03:15:07 2013 +0900
It dramatically improves the performance of Android.
* Move GLThead the update process.
* Fixed a bug of the keyboard.
* Specify improvement of orientation
* Improvement of indentation.
commit 20899730a5d9604756bd6f9813b749b2370b74b6
Author: makoto <makotok1123@gmail.com>
Date: Thu Aug 22 01:15:14 2013 +0900
Fix the mistake of xcode project
commit cea502de7c2677dc8f76d7eafbb2533c535c829d
Merge: 3eedc05 52ad51e
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 20 17:57:29 2013 -0700
Merge pull request #736 from JandyCo/nix-samples
Adding Unix Run Scripts for Samples
commit 852a587d898e14c1c8f075b5706e371c67bba0c8
Merge: fa54ef5 52ad51e
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 20 17:44:05 2013 -0700
Merge pull request #692 from JandyCo/nix-samples
Adding a *nix run script for samples.
commit 3eedc0542dbbdfae6981613cea1356a0828531f9
Merge: 6632bd1 d198cf4
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 20 17:38:47 2013 -0700
Merge pull request #735 from JandyCo/ios-sendmail
Fixing IOS sendMail functionality
commit d198cf45f107871f1c5b260765b2632cbe2f0292
Author: Joshua <joshua@jandyco.com>
Date: Tue Aug 20 20:36:41 2013 -0400
Fixing IOS Sendmail functionality
The arguments are being pulled from the wrong indexes. Also fixing
some leaked objects by using autoreleased objects.
commit 52ad51e9619251c2bfceb3769903d4984650d9b7
Author: Joshua <joshua@jandyco.com>
Date: Tue Aug 20 20:20:01 2013 -0400
Updating *nix run scripts according to spacepluk's comments
Quoting the moai bin in the check, changing bash to sh. Also exiting
on error.
commit 59be524b988d50546ed3b47c5fbd239cec1d0d2f
Merge: a69e9a2 ea84dbb
Author: David Pershouse <dpershouse@gmail.com>
Date: Tue Aug 20 12:47:52 2013 +1000
Merge branch 'ios-cmake' of https://github.com/halfnelson/moai-dev into ios-cmake
commit a69e9a2b0037965fcfbabb8e5cde5bdd4b797c7e
Author: David Pershouse <dpershouse@gmail.com>
Date: Tue Aug 20 12:47:17 2013 +1000
fixed cmake android build on mac
commit 6632bd13fb78d6077caf6c6a3d9e515e13e80692
Merge: 403caa5 526f45a
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 09:02:42 2013 -0700
Merge pull request #709 from makotok/fix_visible
Improved visibility settings
commit fa54ef5fd1d884240fcb3af1aa235b1cbb6c182e
Merge: 761ef72 3d1da27
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 09:00:11 2013 -0700
Merge pull request #714 from JandyCo/android-print-fix
Updating the android run-host script so that the init.lua file gets run ...
commit 403caa510e7cdbe1c8cccdd5fdfb2544f91a151d
Merge: a951bf5 4d2032f
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:59:32 2013 -0700
Merge pull request #707 from toriaezunama/pexplugin-fix
Fix to MOAIParticlePexPlugin where open GL flags were being fed to MOAI ...
commit 761ef72456e825424b89381572ef1ab9f72187e7
Merge: c68c6e2 a27991b
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:59:03 2013 -0700
Merge pull request #716 from Kaali/moai-master
Fix for infinite loop in MOAITimer ping-pong mode
commit a951bf56b041c4ddd36c972cb18d5542768a573b
Merge: 1ae79e0 8fdfb79
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:58:18 2013 -0700
Merge pull request #720 from JandyCo/getstringbounds-fix
Fixing issues with determining a textbox string bounds.
commit 1ae79e0d1a4594ea5c2d646818297287abfb4713
Merge: e08445d 80d27ea
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:57:09 2013 -0700
Merge pull request #721 from btatarov/master
MOAI iOS Playhaven integration
commit e08445d0a4810895e12dc32686d2bcbfcf7a6e65
Merge: 9ad3978 44c1cd4
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:55:57 2013 -0700
Merge pull request #724 from robertwahler/android_language_code
Add MOAIEnvironment.languageCode, countryCode to Android host
commit c68c6e297bd5f3880784bf36a40e8a3a5a75dbf2
Merge: 3bd3065 f0c2f30
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:55:09 2013 -0700
Merge pull request #727 from atis--/glut_fullscreen_fix
fix glut fullscreen bug (app would not stay in fullscreen mode)
commit 9ad3978af9693b539d594955795068e3c34bee41
Merge: 0497fa6 e6b0b49
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:53:11 2013 -0700
Merge pull request #725 from virtualritz/development
Protected windows-specific changes in 1a858c7be856d7fd8c440ec7290adcf1af...
commit 3bd30654eed528a354a7304c77221aaec08feef9
Merge: f7d6a47 f4873ed
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:52:23 2013 -0700
Merge pull request #726 from jhandley/master
Added UNIFORM_WORLD_VIEW to MOAIShader and exposed setType on MOAIBox2DBody
commit 0497fa6632101875c1c1b6a10b5dc8e6d7b16330
Merge: 846eae4 ea47455
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:51:02 2013 -0700
Merge pull request #722 from JandyCo/getAlignment-MOAITextBox
Add getAlignment method to MOAITextBox
commit f7d6a4753a2c61512d263b3255a3a1405e77b2d2
Merge: 7502bcb 1a4826f
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:50:01 2013 -0700
Merge pull request #734 from eidosabi/master
Added superseded note
commit 7502bcb98a2fcd848e5a5a9a4e4d7d8c3ff4b2c6
Merge: 88fd714 d6473c7
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:49:42 2013 -0700
Merge pull request #729 from JoakimBlomberg/patch-1
Invalid null check in JSON parser caused infinite loop when encoding lua...
commit 846eae4ba17f0304cb46a0602c46e97e4befe651
Merge: ca2335b 0f29e78
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:49:12 2013 -0700
Merge pull request #731 from JandyCo/twitter-android
Twitter functionality for Android
commit ca2335bb7616aa2b498201b4ad7fcc238a5d4e41
Merge: a2c4650 d894e0f
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:48:21 2013 -0700
Merge pull request #730 from JandyCo/fix-android
Updating android host to work after the reorg
commit 88fd714fd5ab02a6a83c0236af510ce9beae5269
Merge: 553dad6 e13270f
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:47:40 2013 -0700
Merge pull request #732 from krizka/master
Fix MOAIJSONParser flags while encoding
commit a2c4650836ffa3e5cc64817185f1b5b93bebd0f9
Merge: 1a858c7 e9081e5
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:47:06 2013 -0700
Merge pull request #733 from theGoodEvil/lua_stack_overflows
Avoid (some) Lua stack overflows
commit ea84dbb6ce98ea68ade2df3344118fdcd6628a82
Author: David Pershouse <dpershouse@gmail.com>
Date: Sat Aug 17 10:47:14 2013 +1000
OSX opengl glsl compiler cant handle precision specifiers. IFdef out
commit e624447ba15f11b6a9f3c151c482d4ff61474954
Author: David Pershouse <dpershouse@gmail.com>
Date: Sat Aug 17 00:12:39 2013 +1000
CMake osx host WIP (compiles and runs)
but needs opengl precision fix
commit 638025a5aa73cecc4a8eb0fb3a27de8ecd20b323
Author: David Pershouse <dpershouse@gmail.com>
Date: Fri Aug 16 21:40:51 2013 +1000
Pre configured include dir for osx
commit 8d032f823ed36b903971b54df046307e524943c7
Author: David Pershouse <dpershouse@gmail.com>
Date: Fri Aug 16 21:14:35 2013 +1000
cmake build OSX WIP
commit c865c8ff954f95860ba429fa939f8321158af23f
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Aug 14 17:33:35 2013 +1000
simulator build is working
commit 1a4826f06c273c27a7c1561476287cd221bef0ff
Author: eidosabi <eidosabi@gmail.com>
Date: Tue Aug 13 14:14:12 2013 -0600
Added superseded note
Added comment explaining removeRenderPass has been superseded by setRenderTable
commit e9081e5e5c8a259d6513342d9a2ce20f010f3de6
Author: Guido Lorenz <code@superquadratic.net>
Date: Mon Aug 12 15:34:38 2013 +0200
Avoid Lua stack overflow in MOAITouchSensor:getActiveTouches()
See previous commits for details.
commit 816660a2a3ed3eec1763bb579f80c0a0afa76501
Author: Guido Lorenz <code@superquadratic.net>
Date: Mon Aug 12 15:33:09 2013 +0200
Avoid Lua stack overflow in MOAIPathTerrainDeck:getTerrainVec()
See previous commit for details.
commit 6c73a22d17ec1e18541b6675b2773e769d912536
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 9 12:21:46 2013 +0200
Avoid Lua stack overflow when picking lots of props
According to the Lua manual, "you are responsible for controlling
stack overflow", especially when pushing elements onto the stack in
a loop (see http://www.lua.org/manual/5.1/manual.html#3.2).
Pushing too many elements onto the stack does not crash immediately,
but will corrupt the heap, potentially causing random crashes later.
MOAIPartitionResultBuffer::PushProps() pushes props onto the stack
in a loop, so it must make sure that the stack is big enough to
accomodate them by calling lua_checkstack().
commit 5732ae1f9a99abef83f4d01973c67f507808b18e
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Aug 12 22:58:24 2013 +1000
a little bit more building
commit e13270f2aeafe69eeb065c69f3450439fdc8753c
Author: Kostya Kurilov <krizka@gmail.com>
Date: Mon Aug 12 12:07:37 2013 +0700
json parser flags while encoding
commit 7d5482fd14c80589e3271cb32d79fea19c2141c9
Author: David Pershouse <dpershouse@gmail.com>
Date: Sat Aug 10 22:54:49 2013 +1000
remove adcolony etc . redo moai-iphone
commit cbc0950ba354f527f821ceeff69f349b29ad2c6a
Author: David Pershouse <dpershouse@gmail.com>
Date: Fri Aug 9 14:47:10 2013 +1000
add moai-iphone. Remove dodgy flags
commit 280466efb08dc08f291144cfc614e5b04baabc35
Author: David Pershouse <dpershouse@gmail.com>
Date: Thu Aug 8 23:45:47 2013 +1000
untz ios
commit c797c83d273cee26d529d3c5a41919d3be1e5b2b
Author: David Pershouse <dpershouse@gmail.com>
Date: Thu Aug 8 23:11:09 2013 +1000
cmake mods for ios
commit 06875956d0d27b08dcbbff80f09dc974f9411465
Merge: e534716 1625df7
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 22:50:28 2013 +1000
Merge branch 'androidfix' of https://github.com/halfnelson/moai-dev into halfnelson-androidfix
commit 1625df7db9e2aef3676ad664128cac1515b2c113
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 22:22:13 2013 +1000
Guard win32 specifc openssl code against being compiled with not win32 platforms
commit edd7b3bff7a4853bfe55e680aca5dd2520daec7c
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 22:18:09 2013 +1000
Revert "clean up ssl"
This reverts commit f77a0e53720c2b057b860b9ec3cea7ab4b5f932b.
commit e5347162e036d33e38c1ae17e58af2943704bb03
Merge: 9c19cbb 1bf4fb9
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 05:04:09 2013 -0700
Merge pull request #3 from halfnelson/mingw32
Mingw32 final fixes
commit 9c19cbb0409feaabb30af251f8ca3b3b8ad731d1
Merge: 43bd68e b1f4e36
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 04:43:24 2013 -0700
Merge pull request #2 from halfnelson/mingw32
Allow sdk to buiild with cmake on windows using mingw32
commit 43bd68e8d9d4ab357f92667aaacc1af22713eaf1
Merge: 1a858c7 31aa542
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 04:35:35 2013 -0700
Merge pull request #1 from halfnelson/development
Html5 Javascript host
commit f4873ed022cd3a84b77cceea577450da1c3a1b45
Author: Josh Handley <jhandley@lkc.com>
Date: Tue Aug 6 19:20:33 2013 -0400
Made shader variables linked MOAIShader.UNIFORM_TRANSFORM get all elements of 3D transform matrix instead of just the upper left 3x3.
commit 0f29e78dc87480de44b2c7b135213967a55b50cf
Author: Joshua <joshua@jandyco.com>
Date: Mon Aug 5 18:54:06 2013 -0400
Fixing tapjoy flags.
commit 273ad37a6657a79d953c2739c06436380ac0e692
Author: Joshua <joshua@jandyco.com>
Date: Mon Aug 5 18:45:16 2013 -0400
Twitter functionality for Android
Redoing the twitter for android branch based on the development branch.
This branch should be pullable. Fixing a bug in OptionalComponents.mk
pointed out in the previous pull request.
commit 7dcaedf07f0d39d622455bdba81dfcc8d8a0ac89
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Aug 4 14:47:27 2013 +1000
Cmake fixes for android
fix chipmunk path
add untz android build options in cmake
commit 855ca9f3501c044e08bca29f551cbb32dc91ea66
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Aug 1 21:35:43 2013 +1000
Revert "revert this and see"
This reverts commit a63467c2b8ed57fc68928d1b663337c8c4a0a119.
commit d9e07d8b10da5421507643168afbabc3e86cbedf
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Jul 30 23:11:56 2013 +1000
ensure thirdparty gets vfs
commit 6e11405d3d15522239bb8b25e3b827de02998758
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Jul 30 23:11:25 2013 +1000
ZLLog workaround for android and vfs clash
commit c7378a6b0d984362e149f8a6c2aa3ffee77fffdb
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Jul 30 00:18:12 2013 +1000
cmake for android fixes. VFS replace
commit a63467c2b8ed57fc68928d1b663337c8c4a0a119
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 22:52:01 2013 +1000
revert this and see
commit f77a0e53720c2b057b860b9ec3cea7ab4b5f932b
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 22:42:17 2013 +1000
clean up ssl
commit 4e82b49f4c65d7efd7581e457f2b53f648c38961
Merge: b32df4f d894e0f
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 22:05:27 2013 +1000
Merge remote-tracking branch 'remotes/jandyco/fix-android' into androidfix
commit b32df4f6158eb4c691005f1cb2bbf95a5629c566
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 21:50:19 2013 +1000
cmake for android working
commit f60f5ceaa6cc035a76e038d0ac07f49bcf50f4e7
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 00:04:32 2013 +1000
more cmake android.
need to add moai-luaext, moai-curl, moai-sql etc to cmake
commit 6de572a3ec52a6b049a2fdfa567ede613f956cd0
Author: halfnelson <dpershouse@gmail.com>
Date: Sat Jul 27 22:10:03 2013 +1000
android cmake support wip
commit d894e0f4b3633837aa5eadf3c7301289e201dca3
Author: Joshua <joshua@jandyco.com>
Date: Fri Jul 26 21:28:37 2013 -0400
Updating android host to work after the reorg
The android host was broken after the reorg and was never updated to
fix this. In the main Android.mk, removed unused uscore, reordered the
static_libs to fix some linking errors with zl and whirlpool. Also had
to change the typedefs in whirlpool to fix a type conflict with zltypes.
Modified the android host to add similar initializations as the ios
host that are required after the reorg. Also, something was broken in
MOAIGfxDevice which didn't categorize Android as an OpenGL ES host
which would cause only a black screen to be displayed.
Left to do: Android host printing is still broken due to some linking
problems. I may take a look into that next.
commit d6473c75e0ec99550cb6cc4170180cf22f535b92
Author: JoakimBlomberg <joakim.blomberg@gmail.com>
Date: Fri Jul 19 12:51:41 2013 +0200
Invalid null check in JSON parser caused infinite loop when encoding lua numeric arrays
commit f0c2f304c8b92379f5ed9e3ac9b829d58616afb0
Author: Atis <atis@aol.es>
Date: Thu Jul 18 11:47:31 2013 +0300
fix glut fullscreen bug (app would not stay in fullscreen mode)
commit 121d684e036c607d25e8511fcc383fb141f13a43
Author: Josh Handley <jhandley@lkc.com>
Date: Tue Jul 16 16:09:30 2013 -0400
Added setType to MOAIBox2DBody
Signed-off-by: Josh Handley <jhandley@lkc.com>
commit e6b0b49a2de417a87c87b47ec5a589d22a3947cc
Author: Moritz Moeller <moritz@jupiter-jazz.com>
Date: Tue Jul 16 16:46:04 2013 +0200
Protected windows-specific changes in 1a858c7be856d7fd8c440ec7290adcf1af8e7da8 to break build on other platforms.
commit 0ddd6bc0493696f388c86f758763ff312b844afd
Author: Josh Handley <jhandley@lkc.com>
Date: Tue Jul 16 08:09:57 2013 -0400
Added UNIFORM_WORLD_VIEW uniform to MOAIShader which is bound to worldView matrix (worldViewProj without projection)
Signed-off-by: Josh Handley <jhandley@lkc.com>
commit 1bf4fb951507372e5f185b3fafadcb280fae1e8b
Author: halfnelson <dpershouse@gmail.com>
Date: Fri Jul 12 23:16:37 2013 +1000
resolve cmake path problems for full mingw32 compile
commit 44c1cd4a452adbb0804ba8f4af539c74567f92dc
Author: Robert Wahler <robert@gearheadforhire.com>
Date: Wed Jul 10 14:07:18 2013 -0400
remove bad space char \160
commit 93595173b4fb03d81e1233cea4637137f9194aa8
Author: Robert Wahler <robert@gearheadforhire.com>
Date: Wed Jul 10 13:41:37 2013 -0400
add AKUSetDeviceLocale to the host-source version of Moai.java
commit a43ac316884f0cf8f42f0925fe8c8a221915b019
Author: Robert Wahler <robert@gearheadforhire.com>
Date: Wed Jul 10 13:36:00 2013 -0400
revert changes to Moai.java, this was the distribution file
The correct file is ant/host-source/source/project/src/moai/Moai.java
commit 30f1982124b62870b4a9c2301ef08db386d27e9a
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Jul 11 00:06:52 2013 +1000
Plugins for cmake
commit 1a858c7be856d7fd8c440ec7290adcf1af8e7da8
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Jul 9 10:30:46 2013 -0700
re-enabled ares on Windows; fixed a garbage collection bug in MOAILuaObject
commit 60fcf86b7dbcb2b0d0345aad6411fe65a6ecb4c0
Author: Robert Wahler <robert@gearheadforhire.com>
Date: Mon Jul 8 18:42:12 2013 -0400
add Android languageCode and countryCode to MOAIEnvironment
Code originally authored by An Nguyen at MeYuMe
commit b1f4e3671441bfd7d509d6d67bbb6b7c8c403b10
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 7 00:20:56 2013 +1000
cmake updates for mingw32
mingw32 fix for mongoose
commit 4620dd6fdc1e859a7f9aa7964cbcf6193c2b9075
Author: halfnelson <dpershouse@gmail.com>
Date: Sat Jul 6 15:33:04 2013 +1000
mods to cmake for mingw builds
commit ea474557f2920b7a948c1133df4f709758c3784f
Author: Joshua <joshua@jandyco.com>
Date: Thu Jun 20 15:46:49 2013 -0400
Add getAlignment method to MOAITextBox
Adding the getAlignment method to MOAITextbox, useful for when one is
resizing a textbox, you can rettrieve its alignment and then re-align
it after the resize.
commit 80d27ead180abd6744dc6279385b5cdb1c4597c9
Author: Bogdan Tatarov <bogdan.tatarov@gmail.com>
Date: Thu Jun 20 17:27:45 2013 +0300
Playhaven iOS integration
commit 8fdfb79ff70ecabc264aa7d0c3062b7ab158df5b
Author: Joshua <joshua@jandyco.com>
Date: Wed Jun 19 21:32:40 2013 -0400
Fixing issues with determining a textbox string bounds.
Currently the GetStringBounds returns a rect which is not correct.
Drawing the textbox with the rect provided doesn't create a textbox
with the text laid out as expected. Fixing some bugs in the build
layout of text box designer and an issue with MOAIGlyph::GetRect which
was causing these problems.
commit a27991bab49477d3bf141f6cc225aba6833f6a66
Author: Väinö Järvelä <vaino.jarvela@spinfy.com>
Date: Mon Jun 10 10:56:40 2013 +0300
Fix for infinite loop in MOAITimer ping-pong mode
When the time is equal to the end time, the old version will go into an
infinite loop.
commit 3d1da27ba7341a7d1c694eee640de606a62cb5e0
Author: Joshua <joshua@jandyco.com>
Date: Fri Jun 7 20:46:18 2013 -0400
Updating the android run-host script so that the init.lua file gets run when working directory is .
When the android working_dir was "." the init.lua was not run because
its directory was not determined properly. Added a check for a working
dir of "." in the run-host and skipping the default directory
determination if found.
commit 3014cba02617c9dfeed2715254cbcef08cf446b1
Author: Michael Harrington <kibiz0r@gmail.com>
Date: Thu Jun 6 13:53:22 2013 -0400
Tests compile and run on Windows again
commit 31aa542935891590b1f6c419dc7a52a27efe4f52
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Jun 5 18:03:55 2013 +1000
updated host-template readme with more instructions
commit 8f7f59097a0d2e0f8ee831dad832caa602a630e3
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Jun 5 18:53:49 2013 +1100
Update readme with new build instructions
commit 05ede7287816d8cafb361a74e335ae86e3f14693
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Jun 5 15:51:03 2013 +1000
Build now works and creates the template.
commit d25e6cedeaed5a162a611a1f19ab5019984e866b
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Jun 5 13:50:01 2013 +1000
fix paths in cmake files. Not sure how this was working for zipline,
commit 0270bfb553347ff52e52432cc832b45f671c30f3
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Jun 5 13:09:31 2013 +1000
Html5 and javascript host.
* sets mediump by default for float in fragment shader (explicit definition of precision is required by webgl)
* Changed libfreetype cmake file to generate a buildable source ( currently defined symbols multiple times which gcc is happy with but not clang)
* builds webuntz instead of untz (interface compatible) may need its own cmake file/folder to clean it up
* skips glew but does so differently to blackberry. I can change later if needed
commit 21c4216e965c96f7beb2429c9208e06d0411a54d
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 17:54:45 2013 -0300
[CI] Finished distribution script.
commit 3e285728b70e8deca2cb57446e867cb3f00708b2
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 16:33:52 2013 -0300
[CI] Fix for windows build scripts.
commit 6909f5ac8fe7bdf9c3312de75fc614497f9a7ca3
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 16:22:03 2013 -0300
[CI] Fixed visual studio artifact copy.
commit 92e7314474309f710afa9013a696c3899683063f
Merge: 83e2beb f3bf4b8
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 14:57:47 2013 -0300
Merge branch 'development' of github.com:moai/moai-dev into development
commit 83e2bebf14830a4645597529399a8153bd698d23
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 14:57:11 2013 -0300
[CI] Copy artifacts on visual studio builds to release/
commit f3bf4b88622a693f1cf85d8b56a92a70d31c7e2e
Merge: 5ab8078 80c59ef
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 12:51:20 2013 -0300
Merge branch 'development' of github.com:moai/moai-dev into development
commit 5ab8078026a19817c843951c6777051fbfb7a470
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 12:49:13 2013 -0300
[CI] Fixed xcode-libmoai artifact copy.
commit 80c59ef768015e29e7a95068f1d8d5c0d2b54927
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 12:06:47 2013 -0300
[CI] Fix Linux.
commit 68b6d1fa5b43b3f4df63a78541ae3495fe17d71b
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 10:48:05 2013 -0300
[CI] Uncommenting …
c0diq
added a commit
to quentinfasquel/moai-dev-fork
that referenced
this issue
Apr 12, 2014
commit 4043190d41d87589ab9e22e07decfec6ac388d2d
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jan 26 23:50:08 2014 +1000
fix mouse in html5 host and more ram for emscripten = more fun :)
commit c6dbe5929d81736f9ff5b1a230a21248a4073f93
Author: halfnelson <dpershouse@gmail.com>
Date: Fri Jan 24 21:38:36 2014 +1000
linux build fixes (thanks to seclorum)
commit 0319baf0a1d8af070fe5a787d2b76fbcaf369d45
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jan 5 15:08:09 2014 +1000
Fix for untz build in windows when vorbis is disabled
commit 8d439bf5f95cb912929b30791659441c2a79cd46
Author: halfnelson <dpershouse@gmail.com>
Date: Mon Nov 11 14:06:34 2013 +1000
Mods to html build to use emscripten provided cmake toolchain
Fix some relative paths
commit c152bd0669da8c2c794d306792f0e7f106f91cd5
Merge: 4871431 d4c24a6
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Oct 27 20:49:28 2013 +1000
Merge branch 'cmake-improvements' of https://github.com/halfnelson/moai-dev into cmake-development
commit d4c24a6aeaf231ad0b36447a58d70115b55626d3
Merge: 478a665 4c9b7f1
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Oct 21 07:09:09 2013 +1000
Merge branch 'cmake-improvements' of https://github.com/halfnelson/moai-dev into cmake-improvements
commit 478a66530ed6eccd593aed485773822a9860a048
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Oct 21 07:08:43 2013 +1000
fix issue with ios_luajit when path has space
commit 487143148d14b1c62d8d9e0d5804d2841233f29f
Merge: ce547e0 86bf3a3
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Oct 17 22:25:47 2013 -0700
Merge pull request #2 from JoakimBlomberg/html-host-framebuffer-fix
Framebuffertexture mode fix for html host
commit 4c9b7f128a7fdb65be5a0a7bec17663327554f67
Merge: 963d8e7 fbeda8a
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Oct 17 22:03:42 2013 -0700
Merge pull request #1 from ralepinski/cmake-improvements
Bug fixes for web untz
commit 963d8e7687ab87f62a2a480ae8d6997f630454ea
Author: David Pershouse <dpershouse@gmail.com>
Date: Fri Oct 18 00:18:48 2013 +1000
tapjoy and vungle fix
commit 86bf3a3f8008720f922b279d6a34efb95c8d31b5
Author: Joakim Tall <joakim@fastmail.se>
Date: Wed Oct 16 09:06:44 2013 +0200
for switch
commit 044020bf31b1d3f0cab0a243ad8c21f65001e5fc
Author: Joakim Tall <joakim@fastmail.se>
Date: Wed Oct 16 09:05:59 2013 +0200
Framebuffer mode fix for html host
commit fbeda8a4278d6eed5f5f05547ea914b843330cd0
Author: Ryan Lepinski <ralepinski@gmail.com>
Date: Mon Oct 14 20:12:42 2013 -0700
Restore precache capabilities
commit 83ffd13e9e9216b7239ac191f2a2a0aab97fa5c4
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Oct 14 23:13:07 2013 +1000
tapjoy fixes
commit a9e5478a5f527c5308760c0d8a53b160067615a8
Author: Ryan Lepinski <ralepinski@gmail.com>
Date: Sun Oct 13 21:19:29 2013 -0700
Fix loop sounds play state
commit bada23bf4cbe29398aa648fb09395dbd39e62845
Author: Ryan Lepinski <ralepinski@gmail.com>
Date: Sun Oct 13 21:12:00 2013 -0700
Fix web untz sound paths
commit bcb279c3568492ee03cbef3c9e2f32460291ff6d
Author: Ryan Lepinski <ralepinski@gmail.com>
Date: Sun Oct 13 21:05:20 2013 -0700
Update howler to latest version
commit c36a46005ad0d64814450fbfa7c201cac763d574
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Oct 14 07:03:46 2013 +1000
iphone cmake mods tapjoy etc
commit 9b810dce72ab83b9d7256a073b07068ae6e8611f
Author: David Pershouse <dpershouse@gmail.com>
Date: Thu Oct 10 18:08:08 2013 +1000
more work on disabled module support for ios
commit f211ba790e95ac0000bc06de53c88564cf074de3
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Oct 9 22:43:30 2013 +1000
cmake additions for iphone
commit 7ed3a144d157a9d9d5dec01bd84e728aa08a4d01
Merge: ce547e0 3e1bdb5
Author: halfnelson <dpershouse@gmail.com>
Date: Sat Oct 5 10:16:19 2013 +1000
Merge branch 'development' of http://github.com/moai/moai-dev into cmake-improvements
commit 3e1bdb5ce8ba6757b54d45d151b094bc57f6a417
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 29 23:34:01 2013 +0900
fix small xcode.
commit ce547e01ca0e05fcd76483727169a8cf367971ba
Author: Halfnelson <dpershouse@gmail.com>
Date: Fri Sep 27 21:32:30 2013 +1000
fix host-test build failure with cmake
commit 4c412ac37e3ec83a9560fafdc093b139154ca204
Author: Halfnelson <dpershouse@gmail.com>
Date: Fri Sep 27 14:00:25 2013 +1000
untz-html changed to be like others. Fixes rebuild
commit b9d2c177ca6922906da678a822c72b997862e901
Merge: 16f5dc7 d648713
Author: makoto <makotok1123@gmail.com>
Date: Thu Sep 26 10:14:49 2013 -0700
Merge pull request #784 from JandyCo/android-luajit
Add LuaJIT Support to Android Host
commit fb54f065e24786cea99fd2045d644e5f5240660d
Author: Halfnelson <dpershouse@gmail.com>
Date: Thu Sep 26 00:02:49 2013 +1000
moaijs host template update. Fix to moaihost
commit 705eb6c1f49a0571c618883203281851b42a785f
Author: Halfnelson <dpershouse@gmail.com>
Date: Wed Sep 25 22:00:35 2013 +1000
Compile working for latest emscripten (1.5.6)
commit 340d01f870c8459d7f8644dacb5c2d93db356cfb
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Sep 25 13:31:04 2013 +1000
fix case sensitivity in zlcore cmake
commit 5565dfc5fef4ebbec1c110d3f93c493ecf5f584b
Merge: debcad0 16f5dc7
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 24 22:27:15 2013 +1000
Merge remote-tracking branch 'moai/development' into cmake-development
commit debcad0bb9b919a0e327b61283a000020f078a8e
Author: David Pershouse <dpershouse@gmail.com>
Date: Tue Sep 24 22:17:26 2013 +1000
playhaven added to cmake
commit b38fe87c72b02810f4a4aa0b3e98b06ab234cf1c
Author: David Pershouse <dpershouse@gmail.com>
Date: Tue Sep 24 13:14:41 2013 +1000
nsurl support for osx
commit 16f5dc7b096a2c258e74a064d93946deef17ee0c
Merge: a38d9a2 c1cca98
Author: joshua-jandyco <joshua@jandyco.com>
Date: Mon Sep 23 17:09:14 2013 -0700
Merge pull request #786 from moai/fix-merge-master-to-dev
Fix sound on iOS and Android host due to wrong macro
commit d64871302632332ffdc040dbf9ab7b6b84e12589
Author: Joshua <joshua@jandyco.com>
Date: Mon Sep 23 19:31:53 2013 -0400
Run the libluajit target only to prevent errors when building the unused executable
commit 605ab790c999d080e450d1f142b9d74f063a257b
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Sep 23 23:56:11 2013 +1000
Add audiounit for osx cmake
commit 96254de9c33ebed2f5b114bfee6db12ff7008430
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Sep 23 23:40:15 2013 +1000
cmake updates for untz osx
commit c1cca98ddbc961e940f112373e3e1142a28ec244
Merge: a38d9a2 55d4c79
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 23 14:33:09 2013 +0900
Merge branch 'master' into development
Fixed a problem that could not be compiled.
Conflicts:
ant/libmoai/jni/src/moai.cpp
xcode/ios/Classes/MoaiView.mm
commit 55d4c794a60bb01e12b6ebe7c4d48fdea3ff6137
Merge: 9bbdb34 05d8bbd
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 22 18:53:25 2013 -0700
Merge pull request #783 from JandyCo/fix-host-sound
Fix sound on iOS and Android host due to wrong macro
commit d637ccdc498b469005604da4f0c3fa9524e08f34
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 22 22:39:07 2013 +1000
Turn off untz logging
commit b642c9ffb3f40ecce1872b5220ca6e94d509d8bb
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 22 15:43:02 2013 +1000
Untz work for CMake and mingw64 compile
commit 802e71295e4dc9fdd625c025c37b64985c0388b4
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 22 14:58:43 2013 +1000
mods to openssl headers for mingw64 build
commit 7da5846ee5ce326637c9b9cae856124909d1f77e
Author: Joshua <joshua@jandyco.com>
Date: Sat Sep 21 19:19:24 2013 -0400
Update varargs in init.lua to accomodate differences with LuaJIT
commit a85db4af8f3f5b061c377f675a9eec3f747eb26b
Author: Joshua <joshua@jandyco.com>
Date: Sat Sep 21 19:19:01 2013 -0400
Add LuaJIT to make-host and libmoai build
Add compilation, argument checking, etc for luajit in the make-host and
libmoai build.
commit b70712d27c887c55b83dedb1aea905cb6d1a96c1
Author: Joshua <joshua@jandyco.com>
Date: Sat Sep 21 19:17:05 2013 -0400
Add luajit libraries to Android ndk build
commit 05d8bbdc94b9bc86bd53a39e0c7487cfb0992635
Author: Joshua <joshua@jandyco.com>
Date: Sat Sep 21 11:26:22 2013 -0400
Fix sound on iOS and Android host due to wrong macro
Replace USE_UNTZ and USE_FMOD macros with MOAI_WITH_FMOD and
MOAI_WITH_UNTZ to fix sound on iOS and Android hosts.
commit 2b3de22f5fdd0d603e6281911d9cd1096ded353a
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Sep 19 23:48:16 2013 +1000
Configured include directory for openssl to work with updated mingw64
commit e15d3ebd816ce028cf4b843706a12d64ba908817
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Sep 18 12:29:16 2013 +1000
untz windows for cmake and refactor of cmake untz
commit a38d9a2794e7e779817c22d74b8416bf3c5fc4a5
Author: makoto <makotok1123@gmail.com>
Date: Wed Sep 18 01:50:14 2013 +0900
#775 Add LuaJIT support on iOS and OS X
commit 81e6b8eca35ff0a7cf7b3bceb5dd2812d8de5415
Merge: 05ba05b 945e961
Author: makoto <makotok1123@gmail.com>
Date: Tue Sep 17 09:20:25 2013 -0700
Merge pull request #775 from JandyCo/luajit-mac
Add LuaJIT support on iOS and OS X
commit 945e9610944743bbebc187c4c735efd0e0712195
Author: Joshua <joshua@jandyco.com>
Date: Mon Sep 16 19:02:16 2013 -0400
Remove LuaJIT portion of the Xcode readme
Guide to non-LuaJIT build is no longer needed with the separate schemes
for Lua and LuaJIT builds.
commit c049283b19d81524d8a7cbe480fcc200a3a8fd32
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 15 21:56:26 2013 -0400
Update OSX Project with LuaJIT target
* Add moai-luajit target for JIT builds
* Use existing moai target for non JIT builds
* Add scheme for JIT builds.
commit cdf421b413c9db4b96a99dc531fb35c13a9fac2c
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 15 21:55:47 2013 -0400
Update iOS Project with luajit target
* Add moai-luajit for building with jit
* Use existing moai target for building without jit
* Adding scheme for JIT
commit 7b8d5e19853368d5bb358b77ed46905dae3d71d0
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 15 21:53:33 2013 -0400
Update libmoai Xcode project w/luajit targets
* Add LuaJIT targets for iOS and OSX
* Remove old luajit compile scripts in libmoai-ios and libmoai-osx
commit 578113b9e6b51cab250cad46e18f240b653a2180
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 15 21:50:07 2013 -0400
Update the luajit build scripts
* Remove commented out code
* Add input args for product name and destination to tie into xcode
target
commit c3548a36f142a8d3ce66c874e0480588cfb88a96
Merge: dea3e0b 05ba05b
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 15 14:30:44 2013 +1000
Merge remote-tracking branch 'moai/development' into cmake-improvements
commit dea3e0bd0f6cf6b80522454ef5409550a5fe1721
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 15 14:27:41 2013 +1000
don't hardcode thirdparty includes in zlcore.
commit d68976faf17c6faee7d0f589b71704d5e5f6d498
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Sep 15 14:06:42 2013 +1000
Remove vendored freeglut. Now part of the windows host
commit 05ba05b24e54537fb66234f92b8c4de8414cdea2
Merge: 83e0acf 0a07431
Author: superquadratic <code@superquadratic.net>
Date: Fri Sep 13 06:53:06 2013 -0700
Merge pull request #778 from patrickmeehan/fix/seed-rand-sfmt
Seed value for SFMT rand; fixed vs2008, vs2010 build
commit 0a074310491a5ebfbad03a702af4247b2efc86e6
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 10 16:03:09 2013 -0700
added csv output file and xlsx with graph to util/math-rand sample folder
commit e99e084e45082c20af70970ff790436cdcc64970
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 10 16:02:24 2013 -0700
added seed from clock () on MOAIMath sfmt init; added MOAIVecPathGraph to vs2008, vs2010; modified util/math-rand sample to output histogram
commit 46a84bab41f171f8e1c3ae234373966f04e808bd
Merge: 5f95823 971232a
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 10 22:50:29 2013 +1000
Merge branch 'cmake-improvements' into cmake-development
Conflicts:
src/moai-util/host.cpp
commit 5f95823744be6ffdf34825b3a0d1c058d4ed980f
Merge: 7b2f990 c876275
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 10 22:33:47 2013 +1000
Merge branch 'development' into cmake-development
commit c8762755c24946b94b3a4f37f24fa9e6292ece70
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 10 22:29:42 2013 +1000
Revert "Merge pull request #774 from jacobgardner/cmake-fix"
This reverts commit 9bbdb3441e0295e4160fc198b4cb0f71019c1b59, reversing
changes made to 218bdcf1ecfb6fe1b0ace6fa3a81317da815bf11.
this has been fixed already in main cmake-development branch to use the
bundled libs not link against system libs (for consistency)
commit 7b2f990c690e1fe0f9bea33a811f645407949486
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Sep 10 22:04:18 2013 +1000
Revert "Guard win32 specifc openssl code against being compiled with not win32 platforms"
This reverts commit 1625df7db9e2aef3676ad664128cac1515b2c113.
commit 5e63d621e7ddb761a722d313ce64026625d2340a
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 8 20:36:15 2013 -0400
Update Xcode project readme
* Change format to markdown
* Add information on how to switch to non JIT compilation
commit 76618d099b1f720a89947e9d04bbd928f3fe6743
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 8 20:35:43 2013 -0400
Update osx and ios projects to use LuaJIT
commit cefd37d702e571f5c51c40a917fcf2914f0aabf7
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 8 20:35:21 2013 -0400
Update libmoai Xcode project for LuaJIT builds
* Separate Lua compilation into its own target
* Two new targets: libmoai-ios-lua and libmoai-osx-lua
* Adding new variable for enabling/disabling luajit
commit 247438db8cdef9be546111194ea3152504d20a2c
Author: Joshua <joshua@jandyco.com>
Date: Sun Sep 8 20:32:17 2013 -0400
Add scripts to build luajit for iOS and OSX
commit 83e0acf5bd9e6a68c20ff9e25c7714ec3cc2c4e9
Merge: dd187a6 9bbdb34
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 9 00:45:01 2013 +0900
Merge branch 'master' into development
commit 9bbdb3441e0295e4160fc198b4cb0f71019c1b59
Merge: 218bdcf a758329
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 8 08:38:11 2013 -0700
Merge pull request #774 from jacobgardner/cmake-fix
Fix to allow LUAEXT to work on linux.
commit dd187a6689dabd09b1b37b068f308f170ff3003c
Merge: ced2916 7417cfd
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 8 08:34:35 2013 -0700
Merge pull request #768 from patrickmeehan/fix/vs-remove-libcares
Removed libcares from Visual Studio projects
commit a75832994b30cb9f35b169c9babe500d4c2c4671
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 10:24:11 2013 -0500
Reset build script to original
commit 8f09b94f8ee6d7ebb990dc48e257339ade1eec64
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 10:18:58 2013 -0500
Fix bad change.
commit 071a80ae5306d1814f345f021413817f6b00ccb8
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 10:09:35 2013 -0500
Revert some changes
commit 9aaf7dc676e69d5a1013c17eacbc7856b09f4df5
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 10:01:20 2013 -0500
Revert to previous state
commit 4ac1809753a8781790b84140a2050d4de15897e5
Author: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Sun Sep 8 09:43:24 2013 -0500
Fix CMAKE so luaext works
commit 971232aa27bf6762241d3e4d8ba0c6dbf98cf68b
Author: Halfnelson <dpershouse@gmail.com>
Date: Sun Sep 8 22:12:12 2013 +1000
optimize emscripten output
commit 401d89c147e5308524dcc98c25248601fefc3527
Author: Halfnelson <dpershouse@gmail.com>
Date: Sun Sep 8 21:52:41 2013 +1000
Fix to html host to allow resizing.
was breaking mouse move capturing.
Define GL_ES in html host to get precision specifiers
commit 7c23fd120d352cd00888fd8ff135a091d31e4519
Merge: ced2916 a2134f0
Author: halfnelson <dpershouse@gmail.com>
Date: Fri Sep 6 18:23:47 2013 +1000
Changes to CMake build system and HTML/JS host
CMake changes add support for Html host, mingw32 (windows), android, ios and fixes some optional modules on linux and osx
Changes to zl libs to support html host
html5 host template and build script added
Fix curl for osx
Fix android ZLLog support (broken by reorg)
Add web-untz for html5 host
added freeglut as non-external (will probably remove)
commit ced2916591e083b07ceaca0b285e86ed65487c39
Merge: a8d1c7f 1b45a51
Author: makoto <makotok1123@gmail.com>
Date: Thu Sep 5 10:55:05 2013 -0700
Merge pull request #770 from theGoodEvil/vec_path_graph
Support Path Finding in Arbitrary Graphs
commit a8d1c7fb78cc4b16e5661c624aed4a66bf091440
Merge: cbe3db0 218bdcf
Author: makoto <makotok1123@gmail.com>
Date: Fri Sep 6 02:45:48 2013 +0900
Merge branch 'master' into development
commit cbe3db0072843f76464801c45b3d1758e19d0f94
Merge: 325ecbe 89afcc5
Author: makoto <makotok1123@gmail.com>
Date: Thu Sep 5 09:51:24 2013 -0700
Merge pull request #771 from JandyCo/host-physics
Fixing physics on iOS and Android
commit a2134f07395963a23c7f978b11723ac64c79c088
Author: Halfnelson <dpershouse@gmail.com>
Date: Thu Sep 5 21:47:00 2013 +1000
fix untz on linux
commit 89afcc5f6c2ce70076e6135bfcca40bc5b385237
Author: Joshua <joshua@jandyco.com>
Date: Wed Sep 4 22:21:10 2013 -0400
Fix physics on ios
Initialize chipmunk and box2d on ios so that physics works. Add
missing finalize of util and sim.
commit f13c5e79ce460bb5b859ce88c505e6dabf8e43f6
Author: Joshua <joshua@jandyco.com>
Date: Wed Sep 4 22:20:18 2013 -0400
Add box2d and chipmunk initialization to android host
Box2d and chipmunk were not initialized so it would not work on
android. Add AKUFinalizeUtil and AKUFinalizeSim as they were missing.
commit cb4715c39f92261272b33a65b38c61747ed8431c
Author: Joshua <joshua@jandyco.com>
Date: Wed Sep 4 22:19:14 2013 -0400
Update physics samples to run on devices
Updated the physics samples, box2d and chipmunk so that they scale to
multiple resolutions and respond to touch events.
commit 325ecbeb024e4e0fa35740f5531043eec7f5cf3d
Author: Guido Lorenz <code@superquadratic.net>
Date: Wed Sep 4 17:28:54 2013 +0200
Fix compilation error
commit d17bcf250625867c9de2c1e1b7057c31814d071d
Merge: 1cbb768 6d9e811
Author: superquadratic <code@superquadratic.net>
Date: Wed Sep 4 08:27:06 2013 -0700
Merge pull request #769 from patrickmeehan/fix/lua-gc
Revisions to Moai Lua binding, memory management and garbage collection
commit 1b45a512a2ab4ad07205863a9061a391d85eb0f7
Author: Guido Lorenz <code@superquadratic.net>
Date: Wed Sep 4 16:47:31 2013 +0200
Add new file to NaCl build script
commit 355055415a3c46b92954cc4b8a6194aa39d11aa0
Author: Halfnelson <dpershouse@gmail.com>
Date: Wed Sep 4 23:41:12 2013 +1000
Updates to get curl working again on linux.
Added fix to gluthost to solve problem with linux glut on virtualbox
commit fa0af699148b411e30f354f256c69ebfc259c9f4
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Sep 3 15:32:08 2013 +0200
Turn path finding into complete A*
commit ae02769826a45df23b8ad5aa99bc3946a33829cc
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Sep 3 16:19:41 2013 +0200
Add MOAIVecPathGraph
commit 87c694951667179dd15dc0fe0766c95c252b82ee
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Sep 3 14:49:48 2013 +0200
Allow any PathGraph with PathFinder
commit 218bdcf1ecfb6fe1b0ace6fa3a81317da815bf11
Merge: 032befd 1739f4e
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Sep 3 10:27:26 2013 -0700
Merge pull request #764 from makotok/doc_improvement
Doc improvement
commit 1739f4e7503a7fb5c0f1dbc5d3cd68f8c337a729
Author: makoto <makotok1123@gmail.com>
Date: Wed Sep 4 02:12:08 2013 +0900
Improvement in the README.
commit 1cbb768c0944538af5d900761cab4b1cd5961e53
Merge: 94ad43a 223eb3b
Author: superquadratic <code@superquadratic.net>
Date: Tue Sep 3 09:18:11 2013 -0700
Merge pull request #767 from patrickmeehan/fix/missing-static-glyph
no longer crashes when a glyph is missing from a static glyph cache
commit 6d9e811770e3435c8d273e41c2fb89ff7ee386c5
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 02:43:41 2013 -0700
cleaned up implementation of latches in MOAITask and MOAIHttpTaskBase
commit 42c8f6424008ea9f78ea50054a9d30d982891127
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 02:29:10 2013 -0700
removed strong ref from MOAILuaObject::OnRetain (). Also removed LockToRefCount in favor of creating explicit string refs to self as needed
commit 7417cfd1e8b8682640dfc89f9e364aec72f1d394
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 00:32:41 2013 -0700
restored call to set curl timeout in MOAIHttpTaskCurl.cpp
commit d762edb4f1ce662f036f6a33d76fb7652eca783e
Merge: b85153a 94ad43a
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 00:28:01 2013 -0700
merge from development
commit b85153a8cb122088deca08022189d7aa75a490c7
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Sep 3 00:22:15 2013 -0700
removed libcares from vs projects
commit 223eb3bd623ce61eaecf2c3f42d104019e2b4dcd
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Mon Sep 2 23:19:50 2013 -0700
no longer crashes when a glyph is missing from a static glyph cache
commit 2b22b1d0321ce32191225ce3da9fe4d8a17998ea
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Mon Sep 2 15:38:41 2013 -0700
adding flags for ares in VS build
commit 94ad43a792d1ed6956fdb27ce766d4fde5cbb306
Merge: a599cd5 032befd
Author: Guido Lorenz <code@superquadratic.net>
Date: Mon Sep 2 10:48:30 2013 +0200
Merge branch 'master' into development
commit 032befdff62863e2f9f8632ed0b6cc39316ce832
Author: Vavius <vavius@gmail.com>
Date: Sun Sep 1 23:38:48 2013 +0400
Fix setClearColor with no arguments (to disable clear color)
commit a599cd538d064f30a66bd5fd7c9aac45375dd71e
Merge: 9c45fb1 3c72ac3
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sun Sep 1 11:03:36 2013 -0700
Merge pull request #765 from makotok/fix/device_clear_color
Fixed compatibility setClearColor.
commit 3c72ac356b7b0210345df0731384ed0e520f92d5
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 02:53:48 2013 +0900
Fixed compatibility setClearColor.
commit 98e6562dfb1903ad286eff13ecd0775ee9abb9b0
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 02:02:52 2013 +0900
Improvement in the README.
commit b8aeb7de30affb3946dd1d9777ddd58aae6f42cf
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 01:46:13 2013 +0900
Optimized for the github README.
commit 9c45fb116544a9bc9ffa43639182bbe8307a6514
Merge: eac9ba0 f7cdde8
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 08:47:58 2013 -0700
Merge pull request #763 from moai/optional-twitter-ios
Adding the ability to disable Twitter for IOS.
commit f7cdde8b3ed3cd1b13d96aa33a159d0e2f7efd50
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 00:47:16 2013 +0900
Modified to match the format.
commit eac9ba03493632d646ca86f0f09c4c303fca51d0
Merge: 1f8e90c 31e2c34
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 08:37:21 2013 -0700
Merge pull request #762 from moai/MOAIBrowser
Create a shared interface, MOAIBrowser for opening urls across platforms
commit 31e2c3435d47ecd5efc3ba6d551debda0e387ccd
Author: makoto <makotok1123@gmail.com>
Date: Mon Sep 2 00:34:47 2013 +0900
Compatibility fixes due to the change in MOAIBrowser
commit 66d90fc3d82af27a4abf5222866b250b17185823
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 16:47:12 2013 +0900
Add a sample of MOAIBrowser.
commit 09bef91706a1cf4558f285fefac98cf4c9843354
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 15:48:36 2013 -0400
Adding the ability to disable twitter for IOS.
Implements what PR #691 does against the latest development branch.
commit 1f8e90cd088bb3754b24e9014de85a630678f202
Merge: 0575a7e 95ff272
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sat Aug 31 12:21:29 2013 -0700
Merge pull request #760 from makotok/feature/ios_hide_keyboard
Feature/ios hide keyboard
commit 124e8ce0902f296b67f96f5ea9df9e4cdc2c52f6
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 14:54:24 2013 -0400
Adding canOpenURL to MOAIBrowser
Adding canOpenURL to MOAIBrowser as defined in PR #413
commit 299370e3b7e32341d8328ad82de2038b674aca8d
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 14:04:28 2013 -0400
Fixing the remaining issues with MOAIBrowserAndroid
commit 4466f9d958b548b63aa21c1c203c9c41058a80e9
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 13:37:01 2013 -0400
Fixing variable name in browser cpp and adding MOAIBrowserAndroid to the make file
commit ca75b67758130533545b0287f1f7fc255b1df348
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 13:29:40 2013 -0400
Adding implementation of openURLWithParams for Android, adding MOAIBrowser include in moaiext-android.h
commit 95ff272169c6e702fe207bc3b099ffa9a08cbb6c
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 01:39:43 2013 +0900
Added the ability to close the software keyboard of iOS.
commit 0575a7e119ca19e2f69c39b2937a6cd5804c6cdb
Merge: e34bf67 614684d
Author: makoto <makotok1123@gmail.com>
Date: Sun Sep 1 00:26:07 2013 +0900
Merge branch 'master' into development
commit 614684dce2c88929120d5dacc15aec7cf12472f0
Merge: 940befc 3afd4c8
Author: makoto <makotok1123@gmail.com>
Date: Sat Aug 31 08:12:05 2013 -0700
Merge pull request #755 from theGoodEvil/pvr_support
Fix PVR Texture Support
commit d77445e3d0089b22a6ded66c97de185f00748439
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 10:35:59 2013 -0400
Removing MOAISafariIOS from libmoai project and adding MOAIBrowser
commit 551876aad8966a78b2b4b260be23ae04a715a6b2
Author: Joshua <joshua@jandyco.com>
Date: Sat Aug 31 10:34:48 2013 -0400
Updating moai.lua and compiled header, replacing instances of MOAISafariIOS with MOAIBrowserIOS
commit c65ec2fc3cffac848e22488bc37597f5f3c05c46
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:44:50 2013 -0400
Moving openURL from Moai.java to newly created MOAIBrowser.java
commit 87c367dd969e89ff1584abe5da91021b6008f6a0
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:33:57 2013 -0400
References MOAIBrowser java class, adding the openURLWithParams method
commit 217c24343442ae400e09c230d62a524294dd7045
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:23:36 2013 -0400
Updating copyright year and some comment typos
commit bfa2591960d3d6e648c7074bbab81059d07c74e6
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:22:03 2013 -0400
Moving openURL from MOAIAppAndroid to MOAIBrowserAndroid
commit f9994611c2930998ba17b2782ac7ac53d2d1e6ae
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:10:50 2013 -0400
Adding MOAIBrowserAndroid
commit 5cf47735899419359c7795f8348fa8dab20fa87a
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:06:26 2013 -0400
Renaming MOAISafariIOS to MOAIBrowserIOS
commit 98fe4ecd9072d6de5f10fdfcc46f83a79d51e694
Author: Joshua <joshua@jandyco.com>
Date: Fri Aug 30 19:05:59 2013 -0400
Renaming MOAISafariIOS to MOAIBrowserIOS
commit e34bf67a30dd6793eb1b426dc0466173fec91702
Merge: a64c2f1 8e8feac
Author: joshua-jandyco <joshua@jandyco.com>
Date: Fri Aug 30 15:42:15 2013 -0700
Merge pull request #758 from theGoodEvil/lua_popen
Enable popen etc. on Mac OS X
commit a64c2f121db8faeb1829729a61c7aae8aff89492
Merge: 5befd3f 5f182cd
Author: joshua-jandyco <joshua@jandyco.com>
Date: Fri Aug 30 15:23:05 2013 -0700
Merge pull request #757 from theGoodEvil/get_interface_orientation
Add MOAIAppIOS:getInterfaceOrientation()
commit 5befd3fdd5a2914640d957d7610e70bb33a16291
Merge: be29095 5641df6
Author: joshua-jandyco <joshua@jandyco.com>
Date: Fri Aug 30 15:08:32 2013 -0700
Merge pull request #756 from theGoodEvil/fix_warnings
Fix Warnings in Xcode Builds
commit 8e8feac6ed6833ad4f124038b9d1d54fb8d3c9ee
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 17:28:24 2013 +0200
Set LUA_USE_MACOSX for OS X host build
This enables some extended Lua functionality, like io.popen.
See https://github.com/moai/moai-dev/pull/706.
commit 33699694f7d5eef86322506dee4343533a717a84
Author: halfnelson <dpershouse@gmail.com>
Date: Sat Aug 31 00:57:12 2013 +1000
fix luasocket build in windows (cmake)
commit 5641df69a84df411284f0ffff566ea853858419e
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 15:13:18 2013 +0200
Simplify ARC macro definitions
commit ff2140ffa01624ed403ce7d15840c75c5446dce4
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 15:12:21 2013 +0200
Fix ARC detection preprocessor directive
commit 5ee525cbabf8876b5a9c7d7c574b315a440b50fd
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 15:08:00 2013 +0200
Fix warning about missing function prototype
commit c0be400e30dfb54e567620bfaa9d7c68e794eced
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 15:00:40 2013 +0200
Fix warning from SFMT library
Usually I don't like tinkering with 3rd-party code, but this
warning is very annoying and rather useless. It's only there
to say that a sensible default value was chosen, which is
nothing to be worried about.
commit 72be3c5f5f9b5c6544410a6d26fc2af15038a8be
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 14:52:38 2013 +0200
Fix warning about unused vaiable in release mode
commit cf72c1ee17d6ff6aef5ace01896f53fcb222866f
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 14:50:29 2013 +0200
Remove unused variable that is shadowed by another one later
commit be29095200a742f905dc91fb7f31775f057966d7
Merge: 5a117fe d51512a
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 14:41:08 2013 +0200
Merge branch 'removing-warnings' of github.com:mindsnacks/moai-dev into development
commit 5f182cd7e3e7425f2d8294ff38f3c70437fb811e
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 14:21:43 2013 +0200
Add MOAIAppIOS.getInterfaceOrientation()
commit 9ef41f55c89af9d91217f2687bdc963d9db2fdb0
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 13:15:18 2013 +0200
Sort Lua functions by name in MOAIAppIOS
commit 3afd4c820ba5d0c3cb5dd3a30296fbf98672f23b
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 12:17:12 2013 +0200
Remove unnessecary casts
commit f25940ddc96c0218ea4108cd43df16e8d2c77fe8
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 11:45:47 2013 +0200
Fix PVR support by using zgl abstraction layer
commit e178588d8f35a49df765f0ac65e10b2a6d64c691
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 30 10:43:21 2013 +0200
Enable PVR support on iOS
MOAI_TEST_PVR was defined in a place where the actual PVR
code could not see it. Since it was just an alias for
MOAI_OS_IPHONE, I replaced it with that.
commit 5a117fe9708a1e4b0e190e732dafeb91908cb414
Merge: f192102 4f428e9
Author: joshua-jandyco <joshua@jandyco.com>
Date: Thu Aug 29 10:42:58 2013 -0700
Merge pull request #737 from moai/feature_android_performance
It dramatically improves the performance of Android.
commit f19210299e92a9f1ab10826ee3c80fea5caa4e1e
Merge: 039bc2d 940befc
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 29 18:00:02 2013 +0200
Merge branch 'master' into development
commit 940befc38f4ecb728ab1481ad15fa39d4c88bc15
Merge: 7c8cff7 7df2bd5
Author: joshua-jandyco <joshua@jandyco.com>
Date: Thu Aug 29 08:43:33 2013 -0700
Merge pull request #754 from theGoodEvil/fix_ios_extensions
Fix Compilation of some iOS Extensions
commit 7df2bd5561e9f7d682ee7db8f4ba96ab3b5843a0
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 29 17:15:05 2013 +0200
Fix compilation of some iOS extensions
These extensions weren't updated when MOAILuaStateHandle
was renamed to MOAIScopedLuaState in changeset
39eba52567b652f9af7f962743d5fd8bee037ce9.
commit 039bc2d6d9cee656486ad6b3c3f9da2c1df9e283
Merge: 0ded7f4 7c8cff7
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 29 17:04:06 2013 +0200
Merge branch 'master' into development
commit 7c8cff774929649be2e7c8242ed7abc1c275e649
Merge: ab78dcd 9a56a88
Author: joshua-jandyco <joshua@jandyco.com>
Date: Thu Aug 29 05:35:36 2013 -0700
Merge pull request #750 from theGoodEvil/fix_timer_event_stop
Fix MOAITimer.EVENT_STOP
commit 9a56a8853cee9457984e537a80be78936823fde3
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 29 11:19:04 2013 +0200
Fix MOAITimer.EVENT_STOP
The new MOAINode::EVENT_UPDATE (enum value 0) collided with
MOAIAction::EVENT_STOP (also enum value 0) in MOAITimer, which
is derived from both Node and Action. As a result, EVENT_STOP
was triggered every frame. Fixed by starting MOAIAction events
at MOAINode::TOTAL_EVENTS, similar to MOAITimer events starting
at MOAIAction::TOTAL_EVENTS.
commit 30f2f9b9b4b541e6c74f25b331174d5b261b7544
Author: David Pershouse <dpershouse@gmail.com>
Date: Thu Aug 29 15:50:52 2013 +1000
Add freeglut (not as submodule)
some Cmake fixes for mingw32. Still some unresolved symbols
commit 0ded7f480c4434f0276f7b9a151d6fb9b4b63aa3
Merge: 55f8c88 bd4adb0
Author: joshua-jandyco <joshua@jandyco.com>
Date: Wed Aug 28 14:00:54 2013 -0700
Merge pull request #748 from theGoodEvil/add_get_listener
Add some getListener() functions
commit 55f8c88afb84c34713bc3f84bf3e00f208202e58
Merge: 708cb2a 3630145
Author: joshua-jandyco <joshua@jandyco.com>
Date: Wed Aug 28 11:55:50 2013 -0700
Merge pull request #749 from theGoodEvil/xcode_settings
Update Xcode projects to recommended settings
commit 1d22883d39d43f3bc3f531923b79b548725c5418
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Aug 29 00:12:56 2013 +1000
Some fixes to cmake mingw32. WIP still some linker errors
commit 3630145a6192d6986dc3626b9f3161351addc53e
Author: Guido Lorenz <code@superquadratic.net>
Date: Wed Aug 28 15:09:34 2013 +0200
Update Xcode projects to recommended settings
commit 4f428e9ab0c90a4df6452005b234b6888e26abbd
Author: makoto <makotok1123@gmail.com>
Date: Wed Aug 28 02:48:36 2013 +0900
#737 It dramatically improves the performance of Android.
Again. I have modified only access to the UI.
commit 708cb2a2512f65d6dbaa0dc677dc6fc0f08f9d7f
Merge: 3c1ef1a ab78dcd
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Aug 27 19:34:24 2013 +0200
Merge branch 'master' into development
commit 18b50dd7e67ebca0d95e88b5c4cc6e1531d38680
Author: makoto <makotok1123@gmail.com>
Date: Wed Aug 28 01:43:44 2013 +0900
Revert "#737 It dramatically improves the performance of Android."
This reverts commit b84846af04ed5b80e39c77734b9cda7f216e70d5.
commit ab78dcd5b2f6dd2c2a225f5b29931393954d4a01
Merge: c2c4abc 475a5ee
Author: superquadratic <code@superquadratic.net>
Date: Tue Aug 27 09:33:47 2013 -0700
Merge pull request #745 from Vavius/fix-MOAIParticleForce
fix MOAIParticleForce attractor bug
commit bd4adb0d9dd541e7343edad204ac1f5b74a1f012
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Aug 27 17:52:06 2013 +0200
Add MOAIGlobalEventSource.getListener()
commit c2a9fd10f6a44ef8d04822d07fdde1a0e2c37ecd
Author: Guido Lorenz <code@superquadratic.net>
Date: Tue Aug 27 17:47:52 2013 +0200
Add MOAIInstanceEventSource:getListener()
commit 3c1ef1ae72860958a3f71f9632e46b6a68474348
Merge: 13a95ea c2c4abc
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 27 05:18:25 2013 -0700
Merge pull request #747 from moai/master
Merge Thai Text Rendering Changes to Develop.
commit c2c4abc7638e8dceeddcc49f00a170324668ff4e
Merge: c1dd6df 8b5a3cd
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 27 04:59:17 2013 -0700
Merge pull request #746 from Vavius/fix-MOAITextDesigner
fix text box not displaying some characters
commit 475a5ee9f5586fb1fdc370743e190d75e9657166
Author: Vavius <vavius@gmail.com>
Date: Tue Aug 27 12:31:21 2013 +0400
Add test case particle-default-force
commit 8b5a3cd7a500a8c4417cae9580c1277f93b26429
Author: Vavius <vavius@gmail.com>
Date: Tue Aug 27 11:35:58 2013 +0400
Add test case textbox-thai
commit b84846af04ed5b80e39c77734b9cda7f216e70d5
Author: makoto <makotok1123@gmail.com>
Date: Tue Aug 27 11:08:11 2013 +0900
#737 It dramatically improves the performance of Android.
Fixed due to the move to GLThread
commit d0a7d0bd97176d3cab86c8ee692f851d47d8a772
Author: Vavius <vavius@gmail.com>
Date: Mon Aug 26 20:50:26 2013 +0400
fix text box not displaying some characters (thai and other specific)
commit 7e20f4cc1e513d4c0935196df7c6fc6a3c999e11
Author: Vavius <vavius@gmail.com>
Date: Mon Aug 26 20:40:51 2013 +0400
fix MOAIParticleForce attractor bug (applies random force if particle is out of attraction radius)
commit 99e9529232149933ffb40828af639670949af343
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 18:07:35 2013 -0400
Fixing conflict from merge.
Adding both the screenOrientation and asset_dirs options to
settings-local.
commit bd665ea81c39ba93adb0caa47bc343b851f6ae47
Merge: dc4ca32 13a95ea
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 18:04:45 2013 -0400
Merge remote-tracking branch 'origin/development' into feature_android_performance
Conflicts:
ant/host-source/d.settings-local.sh
commit 13a95ea64eb985522cea7194145274325ba270ea
Merge: a7afc11 9020df6
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sun Aug 25 13:44:42 2013 -0700
Merge pull request #743 from JandyCo/android-host-improvements
Improving Android Host Builds
commit 9020df6769ef9c68c98439ef784d358565ffab2f
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 16:35:49 2013 -0400
Improving Android Host Builds
* Adding ability to follow symlinks in copying lua source
* Adding configurable assets
commit a7afc11d172dbe4de4c97eaf7117b00352601239
Merge: 9ff57ca 2e33708
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sun Aug 25 13:25:43 2013 -0700
Merge pull request #742 from JandyCo/android-sendmail
Adding sendMail to Android
commit 2e33708b2b67fd7d0bff04ba02f1d4370bc96205
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 16:23:29 2013 -0400
Adding sendMail to Android
Adding the ability to send e-mails like the functionality available on
IOS.
commit 9ff57ca23b7648166f718deebb49bbd7dc36e05c
Merge: c1dd6df 4f858a1
Author: joshua-jandyco <joshua@jandyco.com>
Date: Sun Aug 25 12:29:15 2013 -0700
Merge pull request #741 from JandyCo/facebook-graph-parameters
Allowing parameters to be passed to facebook graph requests.
commit 4f858a1b9b23a734f94cfaac982196d790f48ee6
Author: Joshua <joshua@jandyco.com>
Date: Sun Aug 25 15:26:15 2013 -0400
Allowing parameters to be passed to facebook graph requests.
*Allows parameters in IOS and Android facebook graph requests.
*Modified Android graphRequest to be asynchronous, like the IOS verison.
*Fixed a null pointer issue in IOS facebook getSession
*Adding REQUEST_RESPONSE_FAILED call back for graph requests.
*Updating doc comments.
*Adding JniUtils for common JNI operations.
In the future I'd like to see a means of passing what request the call
back is for as well as more information about errors that occured.
commit c1dd6df89bf6ce61eef8e8908d22f47627e1c002
Merge: c29ab16 7b56ced
Author: makoto <makotok1123@gmail.com>
Date: Sun Aug 25 23:40:46 2013 +0900
Merge branch 'development'
commit c29ab166da0802e7321644223350104caee26d7b
Merge: 852a587 ba3b58a
Author: makoto <makotok1123@gmail.com>
Date: Sun Aug 25 04:10:26 2013 -0700
Merge pull request #738 from theGoodEvil/contributing
Contribution Guidelines
commit ba3b58a72ccb764daf4f0cf4386e657f39926382
Author: Guido Lorenz <code@superquadratic.net>
Date: Sun Aug 25 12:49:11 2013 +0200
Add clause about merging master into development
commit 7b56ced56a85066945c61f695ce857b83ce558bd
Merge: 2089973 e2a8ee7
Author: makoto <makotok1123@gmail.com>
Date: Sun Aug 25 02:55:03 2013 -0700
Merge pull request #739 from theGoodEvil/fix-playhaven-pathes
Fix iOS build
commit e2a8ee7bee21c23246c1ecd4f9c6c3075c718e36
Author: Guido Lorenz <code@superquadratic.net>
Date: Sun Aug 25 11:45:56 2013 +0200
Fix path for some playhaven source files in Xcode
commit c5877280ab6a46bc6ef4caa77950d93884077824
Author: Guido Lorenz <code@superquadratic.net>
Date: Thu Aug 22 23:24:01 2013 +0200
Add contribution guidelines
commit dc4ca3241ab0f61e9c72287926743108797eef6c
Author: makoto <makotok1123@gmail.com>
Date: Thu Aug 22 03:38:57 2013 +0900
Miss fix.
commit b552566072d95ab475c9d2e133c449beea2b33c9
Author: makoto <makotok1123@gmail.com>
Date: Thu Aug 22 03:15:07 2013 +0900
It dramatically improves the performance of Android.
* Move GLThead the update process.
* Fixed a bug of the keyboard.
* Specify improvement of orientation
* Improvement of indentation.
commit 20899730a5d9604756bd6f9813b749b2370b74b6
Author: makoto <makotok1123@gmail.com>
Date: Thu Aug 22 01:15:14 2013 +0900
Fix the mistake of xcode project
commit cea502de7c2677dc8f76d7eafbb2533c535c829d
Merge: 3eedc05 52ad51e
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 20 17:57:29 2013 -0700
Merge pull request #736 from JandyCo/nix-samples
Adding Unix Run Scripts for Samples
commit 852a587d898e14c1c8f075b5706e371c67bba0c8
Merge: fa54ef5 52ad51e
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 20 17:44:05 2013 -0700
Merge pull request #692 from JandyCo/nix-samples
Adding a *nix run script for samples.
commit 3eedc0542dbbdfae6981613cea1356a0828531f9
Merge: 6632bd1 d198cf4
Author: joshua-jandyco <joshua@jandyco.com>
Date: Tue Aug 20 17:38:47 2013 -0700
Merge pull request #735 from JandyCo/ios-sendmail
Fixing IOS sendMail functionality
commit d198cf45f107871f1c5b260765b2632cbe2f0292
Author: Joshua <joshua@jandyco.com>
Date: Tue Aug 20 20:36:41 2013 -0400
Fixing IOS Sendmail functionality
The arguments are being pulled from the wrong indexes. Also fixing
some leaked objects by using autoreleased objects.
commit 52ad51e9619251c2bfceb3769903d4984650d9b7
Author: Joshua <joshua@jandyco.com>
Date: Tue Aug 20 20:20:01 2013 -0400
Updating *nix run scripts according to spacepluk's comments
Quoting the moai bin in the check, changing bash to sh. Also exiting
on error.
commit 59be524b988d50546ed3b47c5fbd239cec1d0d2f
Merge: a69e9a2 ea84dbb
Author: David Pershouse <dpershouse@gmail.com>
Date: Tue Aug 20 12:47:52 2013 +1000
Merge branch 'ios-cmake' of https://github.com/halfnelson/moai-dev into ios-cmake
commit a69e9a2b0037965fcfbabb8e5cde5bdd4b797c7e
Author: David Pershouse <dpershouse@gmail.com>
Date: Tue Aug 20 12:47:17 2013 +1000
fixed cmake android build on mac
commit 6632bd13fb78d6077caf6c6a3d9e515e13e80692
Merge: 403caa5 526f45a
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 09:02:42 2013 -0700
Merge pull request #709 from makotok/fix_visible
Improved visibility settings
commit fa54ef5fd1d884240fcb3af1aa235b1cbb6c182e
Merge: 761ef72 3d1da27
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 09:00:11 2013 -0700
Merge pull request #714 from JandyCo/android-print-fix
Updating the android run-host script so that the init.lua file gets run ...
commit 403caa510e7cdbe1c8cccdd5fdfb2544f91a151d
Merge: a951bf5 4d2032f
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:59:32 2013 -0700
Merge pull request #707 from toriaezunama/pexplugin-fix
Fix to MOAIParticlePexPlugin where open GL flags were being fed to MOAI ...
commit 761ef72456e825424b89381572ef1ab9f72187e7
Merge: c68c6e2 a27991b
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:59:03 2013 -0700
Merge pull request #716 from Kaali/moai-master
Fix for infinite loop in MOAITimer ping-pong mode
commit a951bf56b041c4ddd36c972cb18d5542768a573b
Merge: 1ae79e0 8fdfb79
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:58:18 2013 -0700
Merge pull request #720 from JandyCo/getstringbounds-fix
Fixing issues with determining a textbox string bounds.
commit 1ae79e0d1a4594ea5c2d646818297287abfb4713
Merge: e08445d 80d27ea
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:57:09 2013 -0700
Merge pull request #721 from btatarov/master
MOAI iOS Playhaven integration
commit e08445d0a4810895e12dc32686d2bcbfcf7a6e65
Merge: 9ad3978 44c1cd4
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:55:57 2013 -0700
Merge pull request #724 from robertwahler/android_language_code
Add MOAIEnvironment.languageCode, countryCode to Android host
commit c68c6e297bd5f3880784bf36a40e8a3a5a75dbf2
Merge: 3bd3065 f0c2f30
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:55:09 2013 -0700
Merge pull request #727 from atis--/glut_fullscreen_fix
fix glut fullscreen bug (app would not stay in fullscreen mode)
commit 9ad3978af9693b539d594955795068e3c34bee41
Merge: 0497fa6 e6b0b49
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:53:11 2013 -0700
Merge pull request #725 from virtualritz/development
Protected windows-specific changes in 1a858c7be856d7fd8c440ec7290adcf1af...
commit 3bd30654eed528a354a7304c77221aaec08feef9
Merge: f7d6a47 f4873ed
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:52:23 2013 -0700
Merge pull request #726 from jhandley/master
Added UNIFORM_WORLD_VIEW to MOAIShader and exposed setType on MOAIBox2DBody
commit 0497fa6632101875c1c1b6a10b5dc8e6d7b16330
Merge: 846eae4 ea47455
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:51:02 2013 -0700
Merge pull request #722 from JandyCo/getAlignment-MOAITextBox
Add getAlignment method to MOAITextBox
commit f7d6a4753a2c61512d263b3255a3a1405e77b2d2
Merge: 7502bcb 1a4826f
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:50:01 2013 -0700
Merge pull request #734 from eidosabi/master
Added superseded note
commit 7502bcb98a2fcd848e5a5a9a4e4d7d8c3ff4b2c6
Merge: 88fd714 d6473c7
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:49:42 2013 -0700
Merge pull request #729 from JoakimBlomberg/patch-1
Invalid null check in JSON parser caused infinite loop when encoding lua...
commit 846eae4ba17f0304cb46a0602c46e97e4befe651
Merge: ca2335b 0f29e78
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:49:12 2013 -0700
Merge pull request #731 from JandyCo/twitter-android
Twitter functionality for Android
commit ca2335bb7616aa2b498201b4ad7fcc238a5d4e41
Merge: a2c4650 d894e0f
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:48:21 2013 -0700
Merge pull request #730 from JandyCo/fix-android
Updating android host to work after the reorg
commit 88fd714fd5ab02a6a83c0236af510ce9beae5269
Merge: 553dad6 e13270f
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:47:40 2013 -0700
Merge pull request #732 from krizka/master
Fix MOAIJSONParser flags while encoding
commit a2c4650836ffa3e5cc64817185f1b5b93bebd0f9
Merge: 1a858c7 e9081e5
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Sun Aug 18 08:47:06 2013 -0700
Merge pull request #733 from theGoodEvil/lua_stack_overflows
Avoid (some) Lua stack overflows
commit ea84dbb6ce98ea68ade2df3344118fdcd6628a82
Author: David Pershouse <dpershouse@gmail.com>
Date: Sat Aug 17 10:47:14 2013 +1000
OSX opengl glsl compiler cant handle precision specifiers. IFdef out
commit e624447ba15f11b6a9f3c151c482d4ff61474954
Author: David Pershouse <dpershouse@gmail.com>
Date: Sat Aug 17 00:12:39 2013 +1000
CMake osx host WIP (compiles and runs)
but needs opengl precision fix
commit 638025a5aa73cecc4a8eb0fb3a27de8ecd20b323
Author: David Pershouse <dpershouse@gmail.com>
Date: Fri Aug 16 21:40:51 2013 +1000
Pre configured include dir for osx
commit 8d032f823ed36b903971b54df046307e524943c7
Author: David Pershouse <dpershouse@gmail.com>
Date: Fri Aug 16 21:14:35 2013 +1000
cmake build OSX WIP
commit c865c8ff954f95860ba429fa939f8321158af23f
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Aug 14 17:33:35 2013 +1000
simulator build is working
commit 1a4826f06c273c27a7c1561476287cd221bef0ff
Author: eidosabi <eidosabi@gmail.com>
Date: Tue Aug 13 14:14:12 2013 -0600
Added superseded note
Added comment explaining removeRenderPass has been superseded by setRenderTable
commit e9081e5e5c8a259d6513342d9a2ce20f010f3de6
Author: Guido Lorenz <code@superquadratic.net>
Date: Mon Aug 12 15:34:38 2013 +0200
Avoid Lua stack overflow in MOAITouchSensor:getActiveTouches()
See previous commits for details.
commit 816660a2a3ed3eec1763bb579f80c0a0afa76501
Author: Guido Lorenz <code@superquadratic.net>
Date: Mon Aug 12 15:33:09 2013 +0200
Avoid Lua stack overflow in MOAIPathTerrainDeck:getTerrainVec()
See previous commit for details.
commit 6c73a22d17ec1e18541b6675b2773e769d912536
Author: Guido Lorenz <code@superquadratic.net>
Date: Fri Aug 9 12:21:46 2013 +0200
Avoid Lua stack overflow when picking lots of props
According to the Lua manual, "you are responsible for controlling
stack overflow", especially when pushing elements onto the stack in
a loop (see http://www.lua.org/manual/5.1/manual.html#3.2).
Pushing too many elements onto the stack does not crash immediately,
but will corrupt the heap, potentially causing random crashes later.
MOAIPartitionResultBuffer::PushProps() pushes props onto the stack
in a loop, so it must make sure that the stack is big enough to
accomodate them by calling lua_checkstack().
commit 5732ae1f9a99abef83f4d01973c67f507808b18e
Author: David Pershouse <dpershouse@gmail.com>
Date: Mon Aug 12 22:58:24 2013 +1000
a little bit more building
commit e13270f2aeafe69eeb065c69f3450439fdc8753c
Author: Kostya Kurilov <krizka@gmail.com>
Date: Mon Aug 12 12:07:37 2013 +0700
json parser flags while encoding
commit 7d5482fd14c80589e3271cb32d79fea19c2141c9
Author: David Pershouse <dpershouse@gmail.com>
Date: Sat Aug 10 22:54:49 2013 +1000
remove adcolony etc . redo moai-iphone
commit cbc0950ba354f527f821ceeff69f349b29ad2c6a
Author: David Pershouse <dpershouse@gmail.com>
Date: Fri Aug 9 14:47:10 2013 +1000
add moai-iphone. Remove dodgy flags
commit 280466efb08dc08f291144cfc614e5b04baabc35
Author: David Pershouse <dpershouse@gmail.com>
Date: Thu Aug 8 23:45:47 2013 +1000
untz ios
commit c797c83d273cee26d529d3c5a41919d3be1e5b2b
Author: David Pershouse <dpershouse@gmail.com>
Date: Thu Aug 8 23:11:09 2013 +1000
cmake mods for ios
commit 06875956d0d27b08dcbbff80f09dc974f9411465
Merge: e534716 1625df7
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 22:50:28 2013 +1000
Merge branch 'androidfix' of https://github.com/halfnelson/moai-dev into halfnelson-androidfix
commit 1625df7db9e2aef3676ad664128cac1515b2c113
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 22:22:13 2013 +1000
Guard win32 specifc openssl code against being compiled with not win32 platforms
commit edd7b3bff7a4853bfe55e680aca5dd2520daec7c
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 22:18:09 2013 +1000
Revert "clean up ssl"
This reverts commit f77a0e53720c2b057b860b9ec3cea7ab4b5f932b.
commit e5347162e036d33e38c1ae17e58af2943704bb03
Merge: 9c19cbb 1bf4fb9
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 05:04:09 2013 -0700
Merge pull request #3 from halfnelson/mingw32
Mingw32 final fixes
commit 9c19cbb0409feaabb30af251f8ca3b3b8ad731d1
Merge: 43bd68e b1f4e36
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 04:43:24 2013 -0700
Merge pull request #2 from halfnelson/mingw32
Allow sdk to buiild with cmake on windows using mingw32
commit 43bd68e8d9d4ab357f92667aaacc1af22713eaf1
Merge: 1a858c7 31aa542
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Aug 7 04:35:35 2013 -0700
Merge pull request #1 from halfnelson/development
Html5 Javascript host
commit f4873ed022cd3a84b77cceea577450da1c3a1b45
Author: Josh Handley <jhandley@lkc.com>
Date: Tue Aug 6 19:20:33 2013 -0400
Made shader variables linked MOAIShader.UNIFORM_TRANSFORM get all elements of 3D transform matrix instead of just the upper left 3x3.
commit 0f29e78dc87480de44b2c7b135213967a55b50cf
Author: Joshua <joshua@jandyco.com>
Date: Mon Aug 5 18:54:06 2013 -0400
Fixing tapjoy flags.
commit 273ad37a6657a79d953c2739c06436380ac0e692
Author: Joshua <joshua@jandyco.com>
Date: Mon Aug 5 18:45:16 2013 -0400
Twitter functionality for Android
Redoing the twitter for android branch based on the development branch.
This branch should be pullable. Fixing a bug in OptionalComponents.mk
pointed out in the previous pull request.
commit 7dcaedf07f0d39d622455bdba81dfcc8d8a0ac89
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Aug 4 14:47:27 2013 +1000
Cmake fixes for android
fix chipmunk path
add untz android build options in cmake
commit 855ca9f3501c044e08bca29f551cbb32dc91ea66
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Aug 1 21:35:43 2013 +1000
Revert "revert this and see"
This reverts commit a63467c2b8ed57fc68928d1b663337c8c4a0a119.
commit d9e07d8b10da5421507643168afbabc3e86cbedf
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Jul 30 23:11:56 2013 +1000
ensure thirdparty gets vfs
commit 6e11405d3d15522239bb8b25e3b827de02998758
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Jul 30 23:11:25 2013 +1000
ZLLog workaround for android and vfs clash
commit c7378a6b0d984362e149f8a6c2aa3ffee77fffdb
Author: halfnelson <dpershouse@gmail.com>
Date: Tue Jul 30 00:18:12 2013 +1000
cmake for android fixes. VFS replace
commit a63467c2b8ed57fc68928d1b663337c8c4a0a119
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 22:52:01 2013 +1000
revert this and see
commit f77a0e53720c2b057b860b9ec3cea7ab4b5f932b
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 22:42:17 2013 +1000
clean up ssl
commit 4e82b49f4c65d7efd7581e457f2b53f648c38961
Merge: b32df4f d894e0f
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 22:05:27 2013 +1000
Merge remote-tracking branch 'remotes/jandyco/fix-android' into androidfix
commit b32df4f6158eb4c691005f1cb2bbf95a5629c566
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 21:50:19 2013 +1000
cmake for android working
commit f60f5ceaa6cc035a76e038d0ac07f49bcf50f4e7
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 28 00:04:32 2013 +1000
more cmake android.
need to add moai-luaext, moai-curl, moai-sql etc to cmake
commit 6de572a3ec52a6b049a2fdfa567ede613f956cd0
Author: halfnelson <dpershouse@gmail.com>
Date: Sat Jul 27 22:10:03 2013 +1000
android cmake support wip
commit d894e0f4b3633837aa5eadf3c7301289e201dca3
Author: Joshua <joshua@jandyco.com>
Date: Fri Jul 26 21:28:37 2013 -0400
Updating android host to work after the reorg
The android host was broken after the reorg and was never updated to
fix this. In the main Android.mk, removed unused uscore, reordered the
static_libs to fix some linking errors with zl and whirlpool. Also had
to change the typedefs in whirlpool to fix a type conflict with zltypes.
Modified the android host to add similar initializations as the ios
host that are required after the reorg. Also, something was broken in
MOAIGfxDevice which didn't categorize Android as an OpenGL ES host
which would cause only a black screen to be displayed.
Left to do: Android host printing is still broken due to some linking
problems. I may take a look into that next.
commit d6473c75e0ec99550cb6cc4170180cf22f535b92
Author: JoakimBlomberg <joakim.blomberg@gmail.com>
Date: Fri Jul 19 12:51:41 2013 +0200
Invalid null check in JSON parser caused infinite loop when encoding lua numeric arrays
commit f0c2f304c8b92379f5ed9e3ac9b829d58616afb0
Author: Atis <atis@aol.es>
Date: Thu Jul 18 11:47:31 2013 +0300
fix glut fullscreen bug (app would not stay in fullscreen mode)
commit 121d684e036c607d25e8511fcc383fb141f13a43
Author: Josh Handley <jhandley@lkc.com>
Date: Tue Jul 16 16:09:30 2013 -0400
Added setType to MOAIBox2DBody
Signed-off-by: Josh Handley <jhandley@lkc.com>
commit e6b0b49a2de417a87c87b47ec5a589d22a3947cc
Author: Moritz Moeller <moritz@jupiter-jazz.com>
Date: Tue Jul 16 16:46:04 2013 +0200
Protected windows-specific changes in 1a858c7be856d7fd8c440ec7290adcf1af8e7da8 to break build on other platforms.
commit 0ddd6bc0493696f388c86f758763ff312b844afd
Author: Josh Handley <jhandley@lkc.com>
Date: Tue Jul 16 08:09:57 2013 -0400
Added UNIFORM_WORLD_VIEW uniform to MOAIShader which is bound to worldView matrix (worldViewProj without projection)
Signed-off-by: Josh Handley <jhandley@lkc.com>
commit 1bf4fb951507372e5f185b3fafadcb280fae1e8b
Author: halfnelson <dpershouse@gmail.com>
Date: Fri Jul 12 23:16:37 2013 +1000
resolve cmake path problems for full mingw32 compile
commit 44c1cd4a452adbb0804ba8f4af539c74567f92dc
Author: Robert Wahler <robert@gearheadforhire.com>
Date: Wed Jul 10 14:07:18 2013 -0400
remove bad space char \160
commit 93595173b4fb03d81e1233cea4637137f9194aa8
Author: Robert Wahler <robert@gearheadforhire.com>
Date: Wed Jul 10 13:41:37 2013 -0400
add AKUSetDeviceLocale to the host-source version of Moai.java
commit a43ac316884f0cf8f42f0925fe8c8a221915b019
Author: Robert Wahler <robert@gearheadforhire.com>
Date: Wed Jul 10 13:36:00 2013 -0400
revert changes to Moai.java, this was the distribution file
The correct file is ant/host-source/source/project/src/moai/Moai.java
commit 30f1982124b62870b4a9c2301ef08db386d27e9a
Author: halfnelson <dpershouse@gmail.com>
Date: Thu Jul 11 00:06:52 2013 +1000
Plugins for cmake
commit 1a858c7be856d7fd8c440ec7290adcf1af8e7da8
Author: Patrick Meehan <patrick@ziplinegames.com>
Date: Tue Jul 9 10:30:46 2013 -0700
re-enabled ares on Windows; fixed a garbage collection bug in MOAILuaObject
commit 60fcf86b7dbcb2b0d0345aad6411fe65a6ecb4c0
Author: Robert Wahler <robert@gearheadforhire.com>
Date: Mon Jul 8 18:42:12 2013 -0400
add Android languageCode and countryCode to MOAIEnvironment
Code originally authored by An Nguyen at MeYuMe
commit b1f4e3671441bfd7d509d6d67bbb6b7c8c403b10
Author: halfnelson <dpershouse@gmail.com>
Date: Sun Jul 7 00:20:56 2013 +1000
cmake updates for mingw32
mingw32 fix for mongoose
commit 4620dd6fdc1e859a7f9aa7964cbcf6193c2b9075
Author: halfnelson <dpershouse@gmail.com>
Date: Sat Jul 6 15:33:04 2013 +1000
mods to cmake for mingw builds
commit ea474557f2920b7a948c1133df4f709758c3784f
Author: Joshua <joshua@jandyco.com>
Date: Thu Jun 20 15:46:49 2013 -0400
Add getAlignment method to MOAITextBox
Adding the getAlignment method to MOAITextbox, useful for when one is
resizing a textbox, you can rettrieve its alignment and then re-align
it after the resize.
commit 80d27ead180abd6744dc6279385b5cdb1c4597c9
Author: Bogdan Tatarov <bogdan.tatarov@gmail.com>
Date: Thu Jun 20 17:27:45 2013 +0300
Playhaven iOS integration
commit 8fdfb79ff70ecabc264aa7d0c3062b7ab158df5b
Author: Joshua <joshua@jandyco.com>
Date: Wed Jun 19 21:32:40 2013 -0400
Fixing issues with determining a textbox string bounds.
Currently the GetStringBounds returns a rect which is not correct.
Drawing the textbox with the rect provided doesn't create a textbox
with the text laid out as expected. Fixing some bugs in the build
layout of text box designer and an issue with MOAIGlyph::GetRect which
was causing these problems.
commit a27991bab49477d3bf141f6cc225aba6833f6a66
Author: Väinö Järvelä <vaino.jarvela@spinfy.com>
Date: Mon Jun 10 10:56:40 2013 +0300
Fix for infinite loop in MOAITimer ping-pong mode
When the time is equal to the end time, the old version will go into an
infinite loop.
commit 3d1da27ba7341a7d1c694eee640de606a62cb5e0
Author: Joshua <joshua@jandyco.com>
Date: Fri Jun 7 20:46:18 2013 -0400
Updating the android run-host script so that the init.lua file gets run when working directory is .
When the android working_dir was "." the init.lua was not run because
its directory was not determined properly. Added a check for a working
dir of "." in the run-host and skipping the default directory
determination if found.
commit 3014cba02617c9dfeed2715254cbcef08cf446b1
Author: Michael Harrington <kibiz0r@gmail.com>
Date: Thu Jun 6 13:53:22 2013 -0400
Tests compile and run on Windows again
commit 31aa542935891590b1f6c419dc7a52a27efe4f52
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Jun 5 18:03:55 2013 +1000
updated host-template readme with more instructions
commit 8f7f59097a0d2e0f8ee831dad832caa602a630e3
Author: halfnelson <dpershouse@gmail.com>
Date: Wed Jun 5 18:53:49 2013 +1100
Update readme with new build instructions
commit 05ede7287816d8cafb361a74e335ae86e3f14693
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Jun 5 15:51:03 2013 +1000
Build now works and creates the template.
commit d25e6cedeaed5a162a611a1f19ab5019984e866b
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Jun 5 13:50:01 2013 +1000
fix paths in cmake files. Not sure how this was working for zipline,
commit 0270bfb553347ff52e52432cc832b45f671c30f3
Author: David Pershouse <dpershouse@gmail.com>
Date: Wed Jun 5 13:09:31 2013 +1000
Html5 and javascript host.
* sets mediump by default for float in fragment shader (explicit definition of precision is required by webgl)
* Changed libfreetype cmake file to generate a buildable source ( currently defined symbols multiple times which gcc is happy with but not clang)
* builds webuntz instead of untz (interface compatible) may need its own cmake file/folder to clean it up
* skips glew but does so differently to blackberry. I can change later if needed
commit 21c4216e965c96f7beb2429c9208e06d0411a54d
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 17:54:45 2013 -0300
[CI] Finished distribution script.
commit 3e285728b70e8deca2cb57446e867cb3f00708b2
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 16:33:52 2013 -0300
[CI] Fix for windows build scripts.
commit 6909f5ac8fe7bdf9c3312de75fc614497f9a7ca3
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 16:22:03 2013 -0300
[CI] Fixed visual studio artifact copy.
commit 92e7314474309f710afa9013a696c3899683063f
Merge: 83e2beb f3bf4b8
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 14:57:47 2013 -0300
Merge branch 'development' of github.com:moai/moai-dev into development
commit 83e2bebf14830a4645597529399a8153bd698d23
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 14:57:11 2013 -0300
[CI] Copy artifacts on visual studio builds to release/
commit f3bf4b88622a693f1cf85d8b56a92a70d31c7e2e
Merge: 5ab8078 80c59ef
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 12:51:20 2013 -0300
Merge branch 'development' of github.com:moai/moai-dev into development
commit 5ab8078026a19817c843951c6777051fbfb7a470
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 12:49:13 2013 -0300
[CI] Fixed xcode-libmoai artifact copy.
commit 80c59ef768015e29e7a95068f1d8d5c0d2b54927
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 12:06:47 2013 -0300
[CI] Fix Linux.
commit 68b6d1fa5b43b3f4df63a78541ae3495fe17d71b
Author: Francisco Tufró <contacto@franciscotufro.com.ar>
Date: Tue Jun 4 10:48:05 2013 -0300
[CI] Uncommenting …
Vavius
pushed a commit
to Vavius/moai-dev
that referenced
this issue
Sep 7, 2014
handling tessellator error and pumping out error status
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Write a lua script to convert collada to an equivalent, platform-agnostic not-lossy intermediate format suitable for loading and further processing into a Moai scene graph.
The text was updated successfully, but these errors were encountered: