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

541 Commits

Author SHA1 Message Date
minggo 34b60e99f1 Merge pull request #3140 from minggo/iss2393-mark_deprecated 
Use Point, Rect and Size member functions instead of global functions
 2013-07-12 08:59:27 -07:00
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
CocosRobot e0ed817177 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-12 09:01:48 +00:00
CocosRobot 746a077623 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-12 08:35:39 +00:00
minggo 2d205c235f closed #2393:fix some warnings 2013-07-12 15:29:32 +08:00
minggo 5d9fea1416 issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used... 
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
 2013-07-11 15:24:23 -07:00
minggo c37af8fa77 issue #2393:mark functions in CCPointExtensions deprecated 2013-07-11 16:38:58 +08:00
James Chen 9b9fe67d25 issue #2387: Using static_cast instead of C style cast in iteration of CCArray. 2013-07-09 14:29:51 +08:00
CocosRobot 920634d70c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-09 03:29:23 +00:00
CocosRobot 945c967409 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-09 02:19:07 +00:00
dumganhar 9b126e79d7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-08 23:09:48 +08:00
dumganhar 8f900d02b8 issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
minggo da41046e4a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2129-remove_prefix 2013-07-08 18:12:38 +08:00
minggo 87125e4b2a issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
CocosRobot bff888507a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-08 08:10:07 +00:00
James Chen 7a7d451acf issue #2129: Reverting changes in cocos2d_specifics.cpp 2013-07-08 15:19:26 +08:00
James Chen 17e1b65646 issue #2129: Adding 'FontDefinition_to_jsval' and reverting some changes. 2013-07-08 15:18:57 +08:00
James Chen db0a15b02f Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix 2013-07-06 15:19:09 +08:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
James Chen 47c28c43c9 Updating auto jsbindings glue codes. 2013-07-05 15:34:45 +08:00
minggo 40effbf3bf issue #2373:fix a compiling error 2013-07-04 13:58:50 +08:00
James Chen cf369c0c66 Merge pull request #3052 from smshuja/pivotjoint-class 
Pivotjoint constructor and pointQueryFirst in Space class will return false instead of invalid shape object
 2013-07-03 19:21:48 -07:00
James Chen 7892f1ac9d Merge pull request #3053 from dumganhar/iss2285-js-motionstreak 
Adding MotionStreak test for TestJavascript.
 2013-07-03 01:36:07 -07:00
James Chen 1a1040bdd5 [manually] Updating auto-generated JS glue codes. 2013-07-03 16:33:34 +08:00
James Chen 75d8e10994 [manual] Updating auto-generated jsbinding glue codes. 2013-07-03 16:27:26 +08:00
James Chen ed7e208895 Revert some codes in cocos2d_specifics.cpp. 2013-07-03 16:07:06 +08:00
James Chen 72344a318e closed #2363: Fixing compilation errors for JS projects. 2013-07-03 14:57:29 +08:00
Shuja Shabandri fee6a2fc87 pointQueryFirst in Space class returns invalid Shape when a shape is not found 2013-07-02 12:24:17 +04:00
Shuja Shabandri 96f8b59b9f PivotJoint class constructor will now take 3 or 4 arguments like in html5 2013-07-02 12:20:33 +04:00
CocosRobot bc6acb6411 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-29 04:35:21 +00:00
James Chen e20de6b6aa Reverting submodules. 2013-06-29 11:45:16 +08:00
Ricardo Quesada b846a3060e cocos2d-x in Mac: 
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
 2013-06-28 19:02:10 -07:00
Ricardo Quesada 9b1684b666 Merge remote-tracking branch 'cocos2d/develop' into js_mac 2013-06-27 22:15:03 -07:00
Ricardo Quesada b0de6d0e8c Project fixes 
In debug: optimization is NONE, and other small fixes for Mac
 2013-06-27 18:14:24 -07:00
Ricardo Quesada b1be161e5d updates to SpiderMonkey v22 2013-06-27 17:34:53 -07:00
James Chen 0f2719fa06 issue #2340: Checking jsc( js compiled) files first. 2013-06-27 17:20:02 +08:00
James Chen 2a688f67c9 closed #2340: Updating spidermonkey library for iOS. 2013-06-27 16:23:00 +08:00
James Chen 9781e10476 closed #2340: Upgrading SpiderMonkey to Firefox v22. 2013-06-27 16:10:38 +08:00
Ricardo Quesada 880a2a53f6 Merge branch 'develop' into js_mac 2013-06-26 18:38:55 -07:00
James Chen 30fa9e80d3 Merge pull request #3012 from dumganhar/ios-project-fix 
Fixing iOS workspace project, using c99 instead of gnu99.
 2013-06-26 02:55:01 -07:00
James Chen 0fdf4b97d6 Fixing iOS workspace project, using c99 instead of gnu99. 2013-06-26 17:52:54 +08:00
CocosRobot b681238425 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-26 09:07:45 +00:00
James Chen 057d5c18a4 issue #2305: sched_yield(); --> std::this_thread::yield(); 2013-06-26 14:55:20 +08:00
James Chen adf6932543 issue #2305: Using std::thread instead of pthread for ScriptingCore. 2013-06-26 14:41:19 +08:00
Ricardo Quesada 297c63cd5e jsbidings for mac 2013-06-25 10:19:55 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00