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

7842 Commits

Author SHA1 Message Date
minggo 6b78e2f341 Merge pull request #2145 from minggo/iss1803-spritetest-lua 
issue #1803:add SpriteBatchNodeOffsetAnchorScale
 2013-03-12 03:42:54 -07:00
minggo e9df9918f7 issue #1803:add SpriteBatchNodeOffsetAnchorScale 2013-03-12 18:21:34 +08:00
Neo Kim b2a78d9264 Comment out 'setVisible()' 2013-03-12 18:53:43 +09:00
Neo Kim ec8241058c Workaround for some problems due to UITextField of CCEditBoxImplIOS is attached as a view above OpenGL view. It has a topmost touch priority higher than any other CCNode objects, and also cannot be veiled by any other CCNode objects. 
In this change, UITextField is visible only when the CCEditBox is in edit mode. And in non-edit mode, UITextField is hidden and CCLabelTTF is shown instead with all same attributes at the same place.
 2013-03-12 18:23:12 +09:00
James Chen ae1c64573e Merge pull request #2046 from rohankuruvilla/eclipse 
fixed #1827: Eclipse Project import - Documentation Added and Tested.
 2013-03-12 01:36:17 -07:00
James Chen 2be1347dc7 Merge pull request #2141 from dumganhar/master 
Updating the template of muti-platform-js and iOS template.
 2013-03-11 07:48:55 -07:00
James Chen f465a72ab6 Updating iOS Template. 2013-03-11 22:47:48 +08:00
James Chen 32a8eb45f4 Updating the template of muti-platform-js. 2013-03-11 22:44:10 +08:00
minggo 79cda8296c Merge pull request #2140 from minggo/refactor-ccuserdefault 
Refactor ccuserdefault
 2013-03-11 03:38:00 -07:00
James Chen 7f2c7eead2 Merge pull request #2138 from CocosRobot/updategeneratedsubmodule_1362994431 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-11 02:36:35 -07:00
CocosRobot ee768ba814 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-11 17:34:03 +08:00
James Chen c780f2ff78 Merge pull request #2137 from dumganhar/iss1748-jsb-chipmunk-sqlite 
fixed #1748: Separating js extension from cocos2dx.hpp/cpp.
1) Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original cocos2dx.hpp/cpp. Developer could remove redundant jsbinding native codes now.
2) cocos2dx.hpp/cpp ~> jsb_cocos2dx_auto.hpp/cpp
3) Adding jsb_cocos2dx_extension_manual.hpp/cpp
 2013-03-11 02:31:40 -07:00
James Chen 2a032bc6c9 fixed #1748: Updating win32 project setting. 2013-03-11 17:24:33 +08:00
James Chen 32f0cf5993 Updating the submodule reference of JS tests. 2013-03-11 17:21:01 +08:00
James Chen a250d83513 Updating the submodule of cocos2d-js-tests. 2013-03-11 17:13:35 +08:00
minggo 1d51f9a3d7 issue #1529:CCUserDefault work ok on Android 2013-03-11 16:45:20 +08:00
James Chen 69b2b13325 fixed #1748: Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original `cocos2dx.hpp/cpp`. 
Developer could remove redundant jsbinding codes now.
 2013-03-11 16:39:28 +08:00
minggo ac888fee01 issue #1529:CCUserDefault supports default value on iOS 2013-03-11 14:45:07 +08:00
James Chen 0bccb2caff Update AUTHORS 2013-03-11 14:15:52 +08:00
James Chen 6829f82893 Merge pull request #2107 from SevInf/patch-1 
fixed #1823: Using shared NodeLoaderLibrary in CCBReader bindings.
 2013-03-10 23:14:56 -07:00
minggo 5c107f289e Merge pull request #2136 from yuezang/feature_1803 
issue #1803:add spritetest lua test case
 2013-03-10 23:05:54 -07:00
wangshuai 78d5c480b7 add spritetest lua test case 2013-03-11 13:49:09 +08:00
James Chen faf4e63ee4 Update AUTHORS 2013-03-11 13:43:49 +08:00
James Chen 3f709c3edb Merge pull request #2134 from AsadR/remove-all-notifications-for-target 
fixed #1822: Added CCNotificationCenter::removeAllObservers(CCObject *target).
 2013-03-10 22:41:59 -07:00
James Chen 6ac16d9db5 Update AUTHORS 2013-03-11 11:19:54 +08:00
James Chen ca15cfb2b3 Merge pull request #2108 from csy1988525/master 
fixed #1821: The display result is wrong when invoking CCControlButton:: setHighlighted.
 2013-03-10 20:18:08 -07:00
James Chen 8b56396ee2 Update AUTHORS 2013-03-11 11:06:12 +08:00
James Chen 30e304961f Merge pull request #2126 from sbc100/make_run_for_linux 
fixed #1820: Adding 'make run' target for linux projects.
 2013-03-10 20:04:40 -07:00
James Chen b8a97463fe Update AUTHORS 2013-03-11 10:52:57 +08:00
James Chen f9c8bd58d1 Merge pull request #2124 from sbc100/fix_make_all 
fixed #1819: Fix package installation in make-all-linux-project.
 2013-03-10 19:39:54 -07:00
James Chen d8eb1403ac Merge pull request #2135 from dumganhar/master 
Updated iOS template.
 2013-03-10 19:16:45 -07:00
James Chen bdd9915847 Updated iOS template. 2013-03-11 10:14:27 +08:00
Asad ur Rehman c1a8059998 Added CCNotificationCenter::removeAllObservers 
This is a helper method that removes all observers with a particular
target. It can be used in destuctors to ensure no observers trigger
callbacks on objects that no longer exist.
 2013-03-10 19:34:01 +05:00
James Chen c4e64fcd8c Merge pull request #2133 from dumganhar/master 
Fixed compilation error for MAC port.
 2013-03-10 00:37:05 -08:00
James Chen a889322a47 Fixed compilation error for MAC port. 2013-03-10 16:34:41 +08:00
James Chen fc1177220f Merge pull request #2132 from CocosRobot/updategeneratedsubmodule_1362903160 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-10 00:15:07 -08:00
CocosRobot 50f1ca7956 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-10 16:12:51 +08:00
James Chen 8572dd013b Merge pull request #2131 from dumganhar/master 
Deleting all files in 'scripting/javascript/bindings/generated' except '.git' and 'README'.
 2013-03-10 00:12:01 -08:00
James Chen db943ddb90 Deleting all files in 'scripting/javascript/bindings/generated' except '.git' and 'README'. 2013-03-10 16:10:16 +08:00
James Chen 86d729d291 Merge pull request #2130 from CocosRobot/updategeneratedsubmodule_1362895391 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-09 22:04:33 -08:00
CocosRobot 3b183c0517 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-10 14:03:20 +08:00
James Chen 1059267bee Merge pull request #2129 from dumganhar/master 
fixed #1808: Updated the submodule of cxx-generator and fixed some compilation errors after that.
 2013-03-09 22:01:21 -08:00
James Chen fc5f7547a3 fixed #1808: Adding config section 'script_control_cpp' and set it to 'no'. 2013-03-10 14:00:30 +08:00
James Chen 1a42e85219 fixed #1808: Updated the submodule of cxx-generator and fixed some compilation errors after that. 2013-03-10 13:55:29 +08:00
Zhe Wang 51a2c3acf5 Merge pull request #2125 from sbc100/fix_readme 
Update GLES version notes in README.mdown
 2013-03-09 16:56:37 -08:00
Bite d7c7846274 fix CCScale9Sprite bugs when parsing rotated spriteframe from plist file that texture packer generate. 2013-03-09 16:23:24 +08:00
Bite ef809da4a5 Merge pull request #3 from cocos2d/master 
merge from cocos2d-x
 2013-03-08 23:59:56 -08:00
James Chen 5799316167 Merge pull request #2127 from sbc100/tolua_build_system 
fixed #1818: Cleanup the tolua++ bindings build system.
 2013-03-08 19:55:43 -08:00
Sam Clegg c0b150c859 Cleanup the tolua++ bindings build system. 
Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.

Update README file with current instructions.

Re-generate output file using new build system.

Add build.sh and build.bat for building on POSIX and
win32 respectively.
 2013-03-08 11:09:10 -08:00
Sam Clegg 9eb9524659 Add 'make run' target for linux projects. 
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
  build system.
- Remove redundant main.h files.
 2013-03-08 10:01:03 -08:00