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

12877 Commits

Author SHA1 Message Date
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00
James Chen e560de6e4e HelloCpp works. 2013-11-04 21:03:07 +08:00
James Chen 8676523433 Adding CMakeLists.txt 2013-11-04 21:03:07 +08:00
James Chen 8cdd1af982 HelloCpp CMakeLists.txt 2013-11-04 21:03:07 +08:00
James Chen add96f63a6 Adding top level cmakefiles.txt 2013-11-04 21:03:07 +08:00
minggo cde79a9724 use -j10 to build android samples 2013-11-04 18:01:42 +08:00
minggo bca254499e Merge pull request #4083 from minggo/build-script-template 
[ci skip]use python script to build android template projects
 2013-11-04 00:53:40 -08:00
minggo b5838b800d use python script to build template android projects 2013-11-04 16:48:17 +08:00
minggo 20000a6046 Merge pull request #4082 from samuele3hu/developAssetsManager 
[ci skip]issue #3037:Modify vs2012 config
 2013-11-03 22:51:28 -08:00
samuele3 3289ce8fe0 issue #3037:Modify vs2012 config 2013-11-04 14:50:23 +08:00
samuele3 ba6cf00d9b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-11-04 14:47:10 +08:00
samuele3 790be0decc issue #3037:Modify vs2012 config 2013-11-04 14:43:22 +08:00
minggo d1c02e6faa Merge pull request #4078 from minggo/iss3108-signed_char 
closed #3108: add -fsigned-char to make char to signed as default on Android arm architecture
 2013-11-03 22:37:37 -08:00
James Chen 6d6cbc98bb Update travis.yml, only build master and develop branch [ci skip] 2013-11-04 13:46:56 +08:00
James Chen 9d38225daf Merge pull request #4077 from CocosRobot/updategeneratedsubmodule_1383533179 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-11-03 18:49:37 -08:00
minggo f6d82d21d2 closed #3108: add -fsigned-char to make char to signed as default 2013-11-04 10:48:45 +08:00
CocosRobot 1cf0a926e1 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-04 02:46:22 +00:00
minggo 25b0ffe853 Merge pull request #4022 from boyu0/iss2771_physical 
issue #2771: physical
 2013-11-03 18:40:14 -08:00
James Chen d335769e3f Update AUTHORS [ci skip] 2013-11-03 15:37:39 +08:00
James Chen 44bc52cf65 Update CHANGELOG [ci skip] 2013-11-03 15:36:05 +08:00
James Chen a340f88477 Merge pull request #4073 from ledyba/fix_ccuserdefault 
closed #3107: When parsing XML using TinyXML, the data size has to be specified. Otherwise, XMLDocument::Parse(data) will treat data as a null-terminal string. It may cause potential issues.
 2013-11-03 00:34:48 -07:00
James Chen a823e66f8e Update run-script.sh 
Adding soft-link for `samples/Cpp/SimpleGame/proj.android/obj`.
 2013-11-03 14:36:22 +08:00
James Chen 6b8b1fb3c9 Update android-build.py 
Fixing wrong capital letter, `samples/JavaScript` --> `samples/Javascript`
 2013-11-03 14:01:02 +08:00
psi 5443fc0d07 pXmlBuffer is not null terminated 2013-11-03 11:17:04 +09:00
James Chen f3be8ac6a6 Update AUTHORS [ci skip] 2013-11-02 22:16:39 +08:00
James Chen 23faae22ee UPDATE CHANGELOG[ci skip] 2013-11-02 22:16:07 +08:00
James Chen c0683410b3 update CHANGELOG [ci skip] 2013-11-02 22:13:01 +08:00
James Chen e1f821c25d Merge pull request #4068 from michaelcontento/trigger-onKeyPressed-while-down 
Trigger onKeyReleased only after the key has been released[ci skip]
 2013-11-02 07:12:40 -07:00
James Chen 2cd957a6fe Update AUTHORS [ci skip] 2013-11-02 22:10:59 +08:00
James Chen c72927b370 Merge pull request #4072 from dumganhar/eventdispatcher-fix 
closed #3106: EventListeners can't be removed sometimes
 2013-11-02 07:09:10 -07:00
James Chen fd21e3ea38 closed #3106: fixed: EventListeners can't be removed sometimes. 2013-11-02 22:08:08 +08:00
James Chen 8f213420eb closed #3106: Update NewEventDispatcherTest.cpp. 2013-11-02 22:05:04 +08:00
James Chen a4b28353a7 Merge commit 'refs/pull/4069/head' of git://github.com/cocos2d/cocos2d-x into eventdispatcher-fix 2013-11-02 21:47:24 +08:00
James Chen 7dc6513687 Adding more tests for EventDispatcherTest. 2013-11-02 21:47:00 +08:00
psi 5e88ecb622 Merge branch 'fix_event_listener' 2013-11-02 16:04:31 +09:00
psi 06f166f613 why not search _toAddedListeners?? 2013-11-02 16:03:54 +09:00
Michael Contento ffad18a1ed Trigger onKeyReleased only after the key has been released 2013-11-02 06:15:08 +01:00
boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
James Chen f560b11c75 Merge pull request #4066 from CocosRobot/updategeneratedsubmodule_1383310998 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-11-01 06:07:10 -07:00
CocosRobot 6360c40725 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 13:03:20 +00:00
James Chen 01b6e972a0 Update CHANGELOG [ci skip] 2013-11-01 20:58:25 +08:00
James Chen e2f14635e8 Merge pull request #4065 from dumganhar/develop 
closed #3104: Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
 2013-11-01 05:55:32 -07:00
James Chen 50c4261092 closed #3104: Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter. 2013-11-01 20:53:51 +08:00
James Chen 84e8aaf016 Merge pull request #4012 from ledyba/fix_inclusion_phys 
include climits for UINT_MAX
 2013-11-01 04:55:51 -07:00
James Chen 854c0c748e Merge pull request #4062 from dumganhar/develop 
[Android] Updating Android.mk for JSB projects.
 2013-11-01 03:30:38 -07:00
James Chen f31e6a3edb Merge pull request #4060 from CocosRobot/updategeneratedsubmodule_1383300172 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-01 03:28:54 -07:00
James Chen b751c41498 [Android] Updating Android.mk for JSB projects. 2013-11-01 18:27:47 +08:00
James Chen e893ae5697 Using namespace std; for AssetsManagerTest. 2013-11-01 18:27:09 +08:00
minggo 60b0b3c26e Merge pull request #4061 from minggo/iss2905-adjust_folder 
better log
 2013-11-01 03:26:01 -07:00
minggo 32c5755869 better log 2013-11-01 18:24:34 +08:00