Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,640 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

12640 Commits

Author SHA1 Message Date
Michael Contento f6dcf88685 Prevent nullptr access in AssetsManager 2013-09-23 12:05:22 +02:00
Michael Contento 4211cc7fd1 re-introduce Cocos2dxHelper.runOnGLThread(Runnable) 
It's crucial to execute various tasks synchonized with the rendering loop /
thread, but this ability (runOnGLThread) got removed with the NativeActivity
transitions a few days ago. This patch adds this method back again.

Why can't we just use runOnUiThread()? Because it seems not to be synchronized
properly and can cause broken OpenGL textures or even the whole app to crash.

Isn't there a better way to get into the mainloop? I hope so! But I'm not a
experienced Android developer and this solution is quite simple / the only one
that worked without any problems.
 2013-09-23 11:53:12 +02:00
Michael Contento 09543a0aac wrong variable used which could crash the whole app 2013-09-23 11:50:34 +02:00
Michael Contento c9fe2c5107 add EGL_RENDERABLE_TYPE to OpenGL attributes 
This patch adds EGL_RENDERABLE_TYPE=EGL_OPENGL_ES2_BIT to the OpenGL attributes.
The default value for this setting is EGL_OPENGL_ES_BIT and, as we require ES 2.0,
cause some problems on various Android devices (e.g. Amazon Kindle 2.Gen).
 2013-09-23 11:44:14 +02:00
yuye.liu 5845b353c5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-09-23 16:25:22 +08:00
yuye.liu b7f1a980ab revising indent Erro 2013-09-23 16:24:33 +08:00
minggo 635f394e93 Merge pull request #3755 from liamcindy/develop_action 
[ci skip]change to use CC_SAFE_RELEASE_NULL and CC_SAFE_RETAIN
 2013-09-23 00:14:43 -07:00
Liam c4dfdbcb14 change to use CC_SAFE_RELEASE_NULL and CC_SAFE_RETAIN 2013-09-23 14:44:55 +08:00
Liam 082e28b631 fixed action node crash 2013-09-23 14:34:50 +08:00
yuye.liu 56a058c74d modify particleSystem format erro 2013-09-23 10:12:54 +08:00
yuye.liu 276b770867 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-09-23 10:12:00 +08:00
Marc Lepage e6144e2c80 Clean up some API documentation 2013-09-22 20:05:49 -04:00
signmotion 7d139a3bc3 Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false'). 2013-09-22 23:50:54 +03:00
Liam e8cf0a1485 add judgment for retaining _actionSpawn 2013-09-22 23:55:12 +08:00
Liam 0840baa1ab retan ActionNode _actionSpawn while create 2013-09-22 22:49:25 +08:00
James Chen 6480b2c95d Update AUTHORS [ci skip] 2013-09-22 22:07:09 +08:00
James Chen 335c45664a Merge pull request #3736 from elwinarens/desc_scene_spelling 
Minor spelling changes in description of CCScene.h[ci skip]
 2013-09-22 07:05:38 -07:00
Elwin Arens 59c3efd53c Minor spelling changes description of CCScene.h 2013-09-22 11:07:21 +02:00
James Chen 2bffc959fd Merge pull request #3732 from dumganhar/develop 
[Win32] Updating the window size of JS-Games to 480x720.
 2013-09-21 21:02:46 -07:00
James Chen 26ecb2ea9e [Win32] Updating the window size of JS-Games to 480x720. 2013-09-22 12:03:55 +08:00
James Chen 23c22d064e Merge pull request #3730 from dumganhar/release-3.0-patch 
[Mac] Updating the window size for JS games and updating JS-Test.
 2013-09-21 20:27:11 -07:00
James Chen a8f71fff73 Updating JS-test. 2013-09-22 11:27:09 +08:00
James Chen 75a562f9b4 [Mac] Updating the window size for JS games. 2013-09-22 11:26:44 +08:00
James Chen 574c98dc17 Merge pull request #3729 from CocosRobot/updategeneratedsubmodule_1379816898 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-21 19:33:31 -07:00
CocosRobot fd735f66b6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-22 02:28:21 +00:00
James Chen b995e016bc Merge pull request #3728 from dumganhar/release-3.0-patch 
Updating submodule of JS-test and Bindings-generator.
 2013-09-21 19:23:01 -07:00
James Chen 5673af2b3e Updating Bindings-generator. 2013-09-22 10:23:48 +08:00
James Chen 47f9055e24 Updating js test. 2013-09-22 10:06:13 +08:00
minggo 40819b90df Merge pull request #3726 from ricardoquesada/missing_icons 
Adds missing icons to templates and samples
 2013-09-21 00:58:32 -07:00
minggo caae690bb6 Merge pull request #3727 from minggo/rename-file-name 
Rename file name
 2013-09-21 00:58:14 -07:00
minggo 8238a05039 fix compiling error 2013-09-21 15:30:54 +08:00
minggo f895183fbc add renamed files into vs.proj 2013-09-21 15:01:42 +08:00
minggo 261f0e4f05 rename some files 2013-09-21 14:40:54 +08:00
Ricardo Quesada cd557a11bf Adds missing icons to templates and samples 2013-09-20 14:06:44 -07:00
minggo cfefe032e5 Merge pull request #3725 from minggo/line_end 
fix line end in windows
 2013-09-20 07:55:27 -07:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
minggo 348386990b Merge pull request #3724 from samuele3hu/developTest 
[ci skip]Modify Accelerometer Test sample because of  the modification of nativeactivity.cpp
 2013-09-20 07:12:15 -07:00
samuele3hu a6d498e068 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-20 22:06:28 +08:00
samuele3hu 54e0fd9a63 Modify Accelerometer Test sample 2013-09-20 22:05:37 +08:00
minggo 480164abfc Merge pull request #3723 from minggo/develop 
[ci skip]fix typo error
 2013-09-20 06:30:55 -07:00
minggo be7d59b132 fix typo error 2013-09-20 21:29:12 +08:00
minggo cba54f4901 Merge pull request #3721 from CocosRobot/updategeneratedsubmodule_1379680870 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-20 06:08:38 -07:00
CocosRobot 1d005642ff [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-20 12:41:13 +00:00
minggo 919d88db4a Merge pull request #3720 from minggo/rename-class-name 
rename some class names to obey cocos2d-x coding style
 2013-09-20 05:33:58 -07:00
minggo 2549804dec fix compiling errors 2013-09-20 20:09:39 +08:00
minggo 4c9771ba3c rename some class names to obey cocos2d-x coding style 2013-09-20 19:19:31 +08:00
minggo 7471a1224c Merge pull request #3715 from ricardoquesada/improved_changelog 
Improved changelog
 2013-09-20 01:26:06 -07:00
minggo c84a1a157b Merge pull request #3714 from ricardoquesada/icon_xcode_improvements 
Icon xcode improvements
 2013-09-20 01:24:15 -07:00
James Chen 1bbc68a5e7 Merge pull request #3717 from dumganhar/event-dispatcher-crash-fix 
Don't set listener type to "" when dissociateEventListener.
 2013-09-19 23:38:00 -07:00
James Chen c22315a19c Don't set listener type to "" when dissociateEventListener. 2013-09-20 14:36:15 +08:00