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

12917 Commits

Author SHA1 Message Date
James Chen 135e509037 Merge pull request #4101 from dumganhar/cmake-copy-file 
issue #3113: Updating CMakeLists.txt, Improve Copying files.
 2013-11-05 19:19:51 -08:00
James Chen c364c4f083 issue #3113: Updating CMakeLists.txt, Improve Copying files. 2013-11-06 10:57:36 +08:00
minggo 2b551732f0 Merge pull request #4097 from hannon235/fix-android-nativeactivity-amd-support 
[android] update nativeactivity.cpp to work with changes made in commit ...
 2013-11-05 17:48:38 -08:00
Chris Hannon 471dd07f3b [android] update nativeactivity.cpp to work with changes made in commit 0220f27 (AMD support), changing int to long int for the second argument in most touch callbacks 2013-11-05 15:54:31 -05:00
James Chen 5061c7cae4 Merge pull request #4093 from CocosRobot/updategeneratedsubmodule_1383651041 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-05 04:23:25 -08:00
CocosRobot 47e0d343ff [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-05 11:30:43 +00:00
James Chen 64b9cba5d5 Merge pull request #4092 from samuele3hu/developCCS 
issue 2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs'
 2013-11-05 03:24:20 -08:00
samuele3 66256e9ad7 issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs' 2013-11-05 17:48:29 +08:00
James Chen 8c91a8294c Merge pull request #4091 from CocosRobot/updategeneratedsubmodule_1383638832 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-11-05 01:43:08 -08:00
samuele3 b9e5d4bc91 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 17:37:54 +08:00
samuele3 61d8f9673c issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd' 2013-11-05 17:34:25 +08:00
CocosRobot 8c75cd0dfa [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-05 08:07:15 +00:00
James Chen f2f7e61b07 Update CHNAGELOG[ci skip] 2013-11-05 16:04:06 +08:00
James Chen 08dfd66dca Merge pull request #4090 from dumganhar/riq-arm64 
Fix compilation error in PR #4086
 2013-11-05 00:02:04 -08:00
James Chen 963d7f3bd0 Changes the touch id declaration from int to long. 2013-11-05 15:49:58 +08:00
James Chen 11e6a277be Merge commit 'refs/pull/4086/head' of git://github.com/cocos2d/cocos2d-x into riq-arm64 2013-11-05 15:49:48 +08:00
samuele3 b76865c692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 15:11:05 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00
James Chen 7c233212b0 Merge pull request #4089 from CocosRobot/updategeneratedsubmodule_1383633083 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-11-04 22:41:29 -08:00
CocosRobot 5cecc93c3e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-05 06:31:26 +00:00
James Chen e3895f324a Merge pull request #4088 from dumganhar/bindings-generator-fix 
Updating submodule of bindings-generator.
 2013-11-04 22:26:42 -08:00
James Chen a3a2b0274e Updating submodule of bindings-generator. 2013-11-05 14:23:48 +08:00
Ricardo Quesada ba7ed6e578 Fixes some compiler warnings 
The warnings are related to:

* 64-to-32-bit conversion
* shadow variables
 2013-11-04 16:31:36 -08:00
Ricardo Quesada 24ecbc426c removes Hungarian notation 
from CCACtionManager and fixes some 64-bit issues.
 2013-11-04 16:30:50 -08:00
Ricardo Quesada 2f0a19c7a3 Enables more warnings in Xcode project 2013-11-04 16:30:00 -08:00
Ricardo Quesada ab6d620b3d Disables arm64 for the moment 2013-11-04 15:11:20 -08:00
Ricardo Quesada 8fb5fad20d Merge branch 'develop' into arm64 2013-11-04 15:02:35 -08:00
Ricardo Quesada 0350ac7021 arm64 support 2013-11-04 11:53:40 -08:00
James Chen fd2db7b805 Merge pull request #4071 from dumganhar/cmake 
closed #3113: Adding CMake Build System Support, now only support Linux
 2013-11-04 06:12:42 -08:00
James Chen f968169da4 Update run-script.sh 2013-11-04 21:59:03 +08:00
James Chen 6a351711ae [cmake] update run-script.sh 2013-11-04 21:05:29 +08:00
James Chen b1a9843091 [cmake] update run-script.sh 2013-11-04 21:03:09 +08:00
James Chen bc251bcc95 [cmake] Update make-all-linux-projects.sh. 2013-11-04 21:03:09 +08:00
James Chen edb1fc7822 [cmake] Deletes .icf files. 2013-11-04 21:03:09 +08:00
James Chen 733197fa65 [cmake] copy resources works. 2013-11-04 21:03:08 +08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen f17aa8b450 Move the library of fmod to external folder. 2013-11-04 21:03:08 +08:00
James Chen daa91ad413 [CMake] Update library dependency. 2013-11-04 21:03:07 +08:00
James Chen 59adba1a6d Updating physics/CMakeLists.txt 2013-11-04 21:03:07 +08:00
James Chen c085412636 [CMake] TestLua and HelloLua is ok. 2013-11-04 21:03:07 +08:00
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