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

12019 Commits

Author SHA1 Message Date
Ricardo Quesada c599ecb260 revert back fps interval to 0.1s 
Why was it set to 2 seconds?
 2013-08-29 20:05:14 -07:00
Huabing.Xu ef7f51d875 issue #2460: script compile error 2013-08-30 10:29:59 +08:00
Huabing.Xu 0136a2cb0f issue #2460: script compile error 2013-08-30 09:37:48 +08:00
Huabing.Xu 850b5514cf issue #2460: travis scripts 2013-08-29 18:10:12 +08:00
James Chen 4804ea14b1 Merge pull request #3504 from CocosRobot/updategeneratedsubmodule_1377765969 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-08-29 01:52:27 -07:00
CocosRobot d2f056e2aa [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-29 08:46:14 +00:00
minggo b96fa9a4bf Merge pull request #3501 from ricardoquesada/perf_and_bug_fixes 
More performance improvements
 2013-08-29 01:39:33 -07:00
Huabing.Xu b7d788a2f9 issue #2460: remove comment code 2013-08-29 13:48:58 +08:00
Huabing.Xu 99f88df8d2 issue #2460: optimize EGLView interface 2013-08-29 11:36:16 +08:00
Ricardo Quesada c04409b6d5 More accurate test 
Name is recalculated. No time is "wasted" in calculating it.

And `Visit` test uses `Node` objects instead of `Sprite`s. So `draw` is not taken into account, just the visit.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:32:45 -07:00
Ricardo Quesada 530a0119ae `getNodeToParent()` returns a `const &` 
This gives a little performance improvement.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:31:32 -07:00
Ricardo Quesada f4101d8b25 receives a `const &` instead of `const *` 
If is more accurate since a `NULL` AffineTransform is not allowed.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:30:00 -07:00
Ricardo Quesada 57ce406bdb More reliable profiling. 
clock is the first instruction to execute on `EndTimingBlock`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:29:09 -07:00
Ricardo Quesada c4eb6c99ab kazmath: removes unneeded `memcpy` 
gains about 5% in improvement

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:28:30 -07:00
Ricardo Quesada eff8f4307f Project is Xcode 5 friendly 
Adds defaults for provisioning profile. Needed for iOS on Xcode 5

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 12:43:50 -07:00
Ricardo Quesada 85ed6d620b fixes some macro names 
kActionInvalidTag -> Action::INVALID_TAG
kNodeTagInvalid -> Node::INVALID_TAG

and it is no longer a `#define` but an `int`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 12:43:20 -07:00
Ricardo Quesada 29e732a218 Fixes .plist in SimpleGame 
Product name is not a "version"

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 12:40:35 -07:00
Ricardo Quesada 7fb56bd123 Adds "Visit Scene Graph" tests 
A new tests to measure the performance of visit

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 12:39:57 -07:00
James Chen b057225fba Merge pull request #3500 from CocosRobot/updategeneratedsubmodule_1377701397 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-08-28 08:07:06 -07:00
CocosRobot 6a298b24ea [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-28 14:50:09 +00:00
James Chen 7b7c51eb90 Merge pull request #3499 from dumganhar/iss2747-sprite-getDisplayFrame 
issue #2747: cc.Sprite.getDisplayFrame() was not exposed to JS and Lua.
 2013-08-28 07:40:52 -07:00
Huabing.Xu d73b8e8b23 issue #2460: glfw windows keyboard input 2013-08-28 18:31:02 +08:00
James Chen f9872e396c closed #2747: Don't skip cc.Sprite.getDisplayFrame. 2013-08-28 18:17:52 +08:00
James Chen 2578d15420 issue #2747: [Best C++ practice] Deprecating Sprite::displayFrame, adding Sprite::getDisplayFrame. 2013-08-28 18:17:05 +08:00
James Chen 3942c12293 Update AUTHORS [ci skip] 2013-08-28 17:31:37 +08:00
James Chen 3959cb0d3c Merge pull request #3474 from xbruce/develop 
closed #2746: cc.registerTargettedDelegate doesn't support pure js object as its target.
 2013-08-28 02:29:09 -07:00
James Chen cdcf28ad67 Merge pull request #3498 from dumganhar/develop 
Minor fix of 'Color4F(const Color3B& color3B)'. r(color3B.r) --> r(color3B.r/255.0f)
 2013-08-28 02:22:15 -07:00
Huabing.Xu 1e4defb14d issue #2460: glfw linux keyboard input 2013-08-28 17:17:46 +08:00
James Chen 3ad8de9f15 Minor fix of 'Color4F(const Color3B& color3B)'. r(color3B.r) --> r(color3B.r/255.0f) 2013-08-28 17:15:35 +08:00
Huabing.Xu 4af0a418fe issue #2460: glfw mac keyboard input 2013-08-28 16:25:03 +08:00
James Chen bac48287f5 Merge pull request #3497 from dumganhar/develop 
Adding WebsocketTest and SocketIOTest for Mac and adding test for issue http://www.cocos2d-x.org/issues/2401
 2013-08-28 00:54:12 -07:00
samuele3hu 1e54fdec00 issue #2433:update submodule 2013-08-28 15:53:15 +08:00
samuele3hu 1dabab2ca5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 
Conflicts:
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
 2013-08-28 15:35:33 +08:00
James Chen a8140dd31b Adding test for issue http://www.cocos2d-x.org/issues/2401 . 2013-08-28 15:12:41 +08:00
samuele3hu 9e071afe09 issue #2433:Add more deprecated function and modify some test 2013-08-28 15:11:19 +08:00
James Chen b235bf07b7 [Mac] Adding WebsocketTest and SocketIOTest. 2013-08-28 15:02:57 +08:00
Huabing.Xu e935481361 Merge branch 'develop' into Iss2460-glfw-refractor 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/platform/mac/CCEGLView.mm
	samples/Cpp/TestCpp/proj.linux/main.cpp
	samples/Cpp/TestCpp/proj.win32/main.cpp
 2013-08-28 13:42:22 +08:00
minggo e41eaf7355 Merge pull request #3495 from shinriyo/shinriyo 
Python2.x 3.x runnable
 2013-08-27 21:06:33 -07:00
Huabing.Xu 29746d513a issue #2640: glfw linux version 2013-08-28 12:00:06 +08:00
shinriyo 498d8d9e6d Python2.x 3.x runnable 
For Python2.x 3.x runnable, I used print()
 2013-08-28 11:53:18 +09:00
minggo 20e2e5c3d6 Merge pull request #3494 from CocosRobot/updategeneratedsubmodule_1377656189 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-27 19:24:54 -07:00
CocosRobot 275d719ede [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-28 02:16:33 +00:00
minggo 48444c864c Merge pull request #3484 from ledyba/develop 
Override LayerMultiplex::init()
 2013-08-27 19:08:39 -07:00
James Chen fefa9a12d9 Merge pull request #3492 from CocosRobot/updategeneratedsubmodule_1377618171 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-08-27 08:43:57 -07:00
CocosRobot fbfb4d1002 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-27 15:42:55 +00:00
James Chen 245dce7e9c Merge pull request #3490 from dumganhar/move-auto-generated 
closed #2732: The auto-generated codes of JSBindings and LuaBindings use the same sub-repo
 2013-08-27 08:02:32 -07:00
James Chen f3e0775cef issue #2732: [travis ci] install llvm for linux. 2013-08-27 22:04:08 +08:00
James Chen 384bf00070 issue #2732: Updating travis script. Linux port needs to generate luabinding codes. 2013-08-27 21:52:06 +08:00
James Chen 78d8576a3a closed #2732: [Linux emscripten] Updating Makefile. 2013-08-27 21:40:29 +08:00
James Chen 935222f27c issue #2732: Adding 'tools/tolua/userconf.ini' to ignore list. 2013-08-27 17:20:40 +08:00