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

923 Commits

Author SHA1 Message Date
minggo 6378d10d5d issue #3713:add test case for autorelease pool 2014-01-21 17:47:59 +08:00
James Chen ccecaeb94f Merge pull request #5125 from Dhilan007/develop_label 
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
 2014-01-21 00:58:21 -08:00
minggo a6ec66c340 Merge pull request #5126 from liang8305/use_multiple_build_process 
get number of cpu, using multiple concurrent job processes;
 2014-01-19 19:50:48 -08:00
Dhilan007 9f9e289f8c update xcode project. 2014-01-20 11:30:35 +08:00
liang8305 bf99e10c10 get number of cpu, using multiple concurrent job processes; 2014-01-20 10:37:01 +08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority... 
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
 2014-01-18 11:38:06 -08:00
James Chen d309ae76d0 issue #3628: Adds missing files for iOS and Mac. 2014-01-17 11:13:40 +08:00
James Chen 4302f3886d issue #2789: Adds performance test for Vector and CCArray. 2014-01-17 10:02:12 +08:00
Huabing.Xu 21d586d4ca Merge branch 'develop' into develop_renderer_tileMapTest 
* develop: (24 commits)
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  More renderer optimizations
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG [ci skip]
  Sprite: removed _hasChildren
  Compilation fix: Updates cocos_files.json and removes unused  in template.
  use data.isNull() instead of !data.getBytes()
  Update VS project file.
  Updates CHANGELOG
  SpriteBatchCommand and ParticleBatchCommand use the BatchCommand
  Updates Xcode, Android and Linux project
  fixes #3720
  Renderer performance fixes
  Console::log(format, va_args) is private
  fix compiling error
  Relieve inherit from LabelProtocol
  closed #3688, Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
  add check data valid in getStringFromFile
  ...
 2014-01-16 12:47:32 +08:00
Ricardo Quesada 65602a4574 Updates Xcode, Android and Linux project 
with new BatchCommand
 2014-01-15 16:06:47 -08:00
Huabing.Xu 19705fcf37 issue #3640: add performance test->renderer LargeTileMap test 2014-01-15 11:27:57 +08:00
martell 66caa13550 Added clang support for Mingw64 2014-01-11 13:26:04 +00:00
James Chen f5ae2bbacc Merge pull request #4932 from boyu0/iss3401_physical_lua_binding 
issue #3401: physical lua binding
 2014-01-06 23:48:47 -08:00
boyu0 cf146b32cf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2014-01-07 10:16:44 +08:00
Ricardo Quesada d15768d630 Removes RELASE_NOTES 2014-01-06 16:28:24 -08:00
chengstory b4118a7ccc fixed #3582 
1.  add #include "cocostudio/CCComBase.h" into  CocoStudio.h
 2014-01-05 03:55:10 +08:00
chengstory aae6d27c74 fixed #3582 
1.  revert ComRender::create(cocos2d::Node *node, const char *comName).
 2014-01-05 03:11:32 +08:00
chengstory bac600ab9f fixed #3582 
1.  create Component By  component Factory.
 2014-01-05 02:22:32 +08:00
James Chen 052f24cceb [ci skip] Updates TestLua project for iOS and Mac. 2014-01-04 17:33:21 +08:00
James Chen 4c3fa3da49 Merge pull request #4865 from dumganhar/testjs-bugfix 
Some fixes for TestJavascript
 2014-01-03 23:34:08 -08:00
James Chen 046384ca1f Uses blue folder for iOS & Mac resources to prevent adding new resources. 2014-01-04 14:22:57 +08:00
James Chen 9bb558ad46 Removes wrong resource in TestJavascript project. 2014-01-04 13:54:25 +08:00
James Chen e65c6b8e53 Merge pull request #4841 from dumganhar/template-container-unit-test 
Template container unit test
 2014-01-03 20:01:25 -08:00
James Chen 5072e63f89 issue #3577: Updates project file for mac and ios. 2014-01-04 11:41:06 +08:00
chengstory 7f8224b621 Merge branch 'develop' into #3480 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
 2014-01-03 19:36:22 +08:00
Dhilan007 8e2c51d31e update vs project for split spine binding. 2014-01-03 15:29:50 +08:00
samuele3hu 07a3efb585 Update the lua test cases about the GUI 2014-01-03 10:39:19 +08:00
chengstory 77dca5958f issue #3480 upload Samples resources. 2014-01-03 02:03:05 +08:00
samuele3hu d802518413 Rename Cocos2dStudio.lua to CocoStudio.lua 2014-01-02 15:51:25 +08:00
samuele3hu a2b706c87c Rename some common script files to keep consistent 2014-01-02 15:18:32 +08:00
samuele3hu b8d4010ae5 Develop branch adds lua trigger for CocoStudio 2014-01-02 12:00:37 +08:00
boyu0 0a06d93328 issue #3401: physical lua banding script and auto script 2014-01-02 11:45:11 +08:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00
heliclei 7696a5f2cc move ghprb.py to tools/jenkins-scripts/ 2013-12-30 21:40:28 +08:00
jiusheng 0cf0ad26d2 add github pull request builder for Jenkins 2013-12-30 21:11:32 +08:00
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-12-26 12:55:52 +08:00
James Chen 444389e92d [GUI] Updates Mac project. 2013-12-26 10:44:41 +08:00
chengstory 8afdf88d25 Test triiger 3.0 2013-12-26 01:17:04 +08:00
CaiWenzhi 96279c12dc Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 18:32:15 +08:00
yinkaile d72c9d94d7 upload trigger code. 2013-12-25 17:40:54 +08:00
samuele3hu 45cfe00ec4 Modify iOS project set and some manual lua binding 2013-12-25 13:47:22 +08:00
CaiWenzhi 2ae8576e0f Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 10:40:05 +08:00
chengstory e4e22b52cb Merge branch 'develop' into #3456 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 2013-12-24 22:05:13 +08:00
chengstory 64f0987fea issue #3456 ios test rapidjson. 2013-12-24 21:23:24 +08:00
James Chen 0305ff15db Merge pull request #4625 from dabingnn/develop_NewClippingNode 
Develop new clipping node
 2013-12-23 23:20:38 -08:00
James Chen 451d76f6b0 Merge pull request #4611 from dumganhar/spine-test 
Merge PR #4572, Spine JS test support.
 2013-12-23 22:55:58 -08:00
Huabing.Xu e7facf9f85 remove NewClippingNode feature function into ClippingNode 2013-12-24 14:08:57 +08:00
Huabing.Xu 24ac743a3c remove class NewSpriteBatchNode 2013-12-24 11:03:59 +08:00
CaiWenzhi 6dd55921aa Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-24 10:44:57 +08:00
Huabing.Xu 8d58e43ad2 remove Class NewSprite 2013-12-24 09:40:00 +08:00
James Chen 05f6a5b09b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test 2013-12-23 22:05:20 +08:00
James Chen 8c0f6ba80e Adds `SpineTest` to iOS, Mac projects. 2013-12-23 21:13:23 +08:00
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-23 20:28:51 +08:00
Huabing.Xu 1dd2c1c20c remove NewTextureAtlas 2013-12-23 20:11:50 +08:00
Huabing.Xu 487e0b21af update Xcode project file& android.mk 2013-12-23 18:03:08 +08:00
CaiWenzhi a19000b49f Add samples 2013-12-23 15:35:35 +08:00
CaiWenzhi 9aa85d2bd6 Remove NodeRGBA inherit 2013-12-23 15:02:52 +08:00
Dhilan007 d1972b3d17 support generate APK by script in template project and unify help message for usage. 2013-12-22 17:48:35 +08:00
Ricardo Quesada fd8c7e9a5d Removes CCCamera 
Not needed anymore.
 2013-12-20 19:24:56 -08:00
James Chen 0db2067f97 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine 2013-12-20 20:11:41 +08:00
byeonggee.seo d5ea2d22a5 undo my mistake 2013-12-20 19:45:50 +09:00
byeonggee.seo ef1709bc3d Add SpineTest to TestJavascript 1 2013-12-20 19:20:13 +09:00
byeonggee.seo 0a30a9a604 spine simple JS binding supported 2013-12-20 16:10:15 +09:00
Huabing.Xu d51ad36613 Merge branch 'develop' into develop_gridNode 
* develop: (67 commits)
  Adds const in ShaderTest2.h
  Skew works again!
  [AUTO] : updating submodule reference to latest autogenerated bindings
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Reverts submodule.
  Updates submodule of bindings-generator.
  Adds `std::for_each` test in invocation
  Reverts bindings-generator.
  fixed not render
  iterator in Sprite fixes
  update vs project for removes unneeded files
  getNodeToParentTransform fixes
  Node cleanup
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Improves SpriteTest
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Android and Linux fixes
  removes `using namespace std` from header file
  Removes unneeded files
  change play arguments
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-19 17:20:22 +08:00
byeonggee.seo e673bd80bb new spine runtime applied 2013-12-19 10:50:37 +09:00
Ricardo Quesada 903844c7bd Removes unneeded files 
New functionality is merged into the 'official' classes
 2013-12-18 11:44:45 -08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00
Huabing.Xu 25fc3d3c2a Merge branch 'develop' into develop_gridNode 
* develop: (105 commits)
  update armature to new render
  iOS & Mac project fix.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  use size_t replace unsigned int for record redeque::size returned value.
  issue #2171: Updates CMakeLists.txt.
  issue #2171: Binds New renderer classes, ignores NewTextureAtlas.
  issue #2171: Adds header files of renderer in cocos2d.h.
  issue #2171: Reorder renderer files for iOS & mac project.
  issue #2171: small fix in ccTypes.h
  issue #2171: Don’t ‘using namespace std;’ in header file.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #2171: Ignores Director::getFrustum.
  issue #2171: Fixing compilation errors for Linux port.
  issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
  issue #2171: [New Renderer] Fixing compilation errors for Android.
  [Win32] fix argument type. - argument of interface is ssize_t.
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  Add mouse scrolling support for extension test
  issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/cocos2d.vcxproj.filters
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-17 18:16:05 +08:00
James Chen d3a4dbab08 iOS & Mac project fix. 2013-12-17 16:34:05 +08:00
James Chen 5d248ef77a issue #2171: Reorder renderer files for iOS & mac project. 2013-12-17 15:40:17 +08:00
Huabing.Xu 6aa2908c13 rename： 
1. class: GridNode->NodeGrid
2. function: setNodeGrid->setGrid  getNodeGrid->getGrid setGridTarget->setTarget
3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp
 2013-12-16 14:21:05 +08:00
Huabing.Xu 2be1a640fa update Xcode project file 2013-12-13 10:58:31 +08:00
Ricardo Quesada 3b66d09bf5 Merge branch 'develop' into newRenderer 2013-12-10 11:10:55 -08:00
Ricardo Quesada aa00137fde Merge branch 'develop' into newRenderer 2013-12-09 11:10:00 -08:00
James Chen 8b69994d5c issue #2790: Removes CCBValue. 2013-12-09 17:55:56 +08:00
James Chen d8061477c1 issue #2790: Removes CCSort.h/.cpp from projects. 2013-12-07 14:21:01 +08:00
Ricardo Quesada 97fb43b8d7 Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-06 11:19:12 -08:00
Ricardo Quesada 73b1e3bb9e Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCSprite.cpp
 2013-12-06 09:37:08 -08:00
Ricardo Quesada dcf4eacd92 update project 2013-12-05 22:24:51 -08:00
minggo 19c86c0e4f Merge pull request #4434 from martell/msys2 
Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW
 2013-12-05 22:23:45 -08:00
Ricardo Quesada e699a3b765 Uses MV in Quad Command 2013-12-05 19:04:01 -08:00
Nite Luo 42de943662 Fix Bug for Sprite performance test 2013-12-05 14:25:45 -08:00
Ricardo Quesada f68dcd9969 Merge branch 'develop' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/tests.h
 2013-12-05 11:47:46 -08:00
James Chen b0af2667f8 Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-05 12:48:32 +08:00
minggo ba62c88682 Merge pull request #4420 from dumganhar/iss2790-template-container 
[ci skip]issue #2790: (ONLY FOR REVIEW NOW)Template Containers for Reference counted classes, Value for Pure Data
 2013-12-04 20:06:24 -08:00
martell e5ada6f377 added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors 2013-12-05 03:37:27 +00:00
Ricardo Quesada f42aef0af8 Moves CCConsole.* to base/ 2013-12-04 18:09:23 -08:00
James Chen 3649530f97 issue #2790: Moves CCValue.h/.cpp to base folder. 2013-12-04 16:02:54 +08:00
James Chen 3136ffc3dd issue #2790: Adds CCValue.h/.cpp. 2013-12-04 16:02:51 +08:00
James Chen d2bddee11e issue #2790: Adds CCMap.h. 2013-12-04 16:01:56 +08:00
James Chen 80004548c8 issue #2790: Adds CCVector.h to Xcode project. int —> long 2013-12-04 15:56:08 +08:00
boyu0 98779b0a9f issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h 2013-12-04 14:36:32 +08:00
Ricardo Quesada a34352cef7 Console is working! 2013-12-03 18:46:54 -08:00
Nite Luo 6862d59bb2 Add NewRenderTexture to convert RenderTexture to use new renderer 2013-12-02 17:23:52 -08:00
Nite Luo fbadb3329a Merge branch 'develop' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-02 10:55:31 -08:00
Ricardo Quesada dbcae0af1e Merge branch 'develop' into console 2013-12-02 09:57:53 -08:00
martell 1a94e393af Setup for testing for every windows user 2013-11-30 09:36:22 +00:00
boyu0 cfe522283c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0 2013-11-28 12:19:07 +08:00
boyu0 1c55c207bf update project setting 2013-11-28 11:55:18 +08:00
boyu0 72f2d68edd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-27 17:47:37 +08:00
boyu0 2b43e72e7c issue #2771: fix vs compile errors, change project setting 2013-11-27 17:33:33 +08:00
Huabing.Xu ea46e1c658 change test case 2013-11-27 14:30:38 +08:00
Ricardo Quesada 534fd9600e Adds CCConsole. 
it doesn't work... just the skeleton
 2013-11-26 18:58:36 -08:00
Huabing.Xu 3da196ea43 add Frustum culling to new Sprite 2013-11-27 10:35:12 +08:00
Nite Luo 92b57c79ba Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCClippingNode.h
	cocos/2d/CCLayer.h
 2013-11-26 11:56:03 -08:00
minggo 6c7cb0bf23 Merge pull request #4359 from Dhilan007/androdi_build 
[ci skip]add proceed java compilation and generate apk.
 2013-11-26 01:47:14 -08:00
boyu0 99d904363a issue #2771: delete all the box2d implementation in physics parts. 2013-11-26 13:47:42 +08:00
Dhilan007 881d43fe3b add proceed java compilation and generate apk. 2013-11-26 11:58:01 +08:00
Nite Luo 19b8ba89e2 Merge branch 'develop' into newRenderer 2013-11-25 10:21:02 -08:00
boyu0 e55c81c9b6 upgrade box2d from 2.2.1 to 2.3.0 2013-11-25 14:50:11 +08:00
boyu0 f2dabe77ec issue #2771: add some method implements with box2d in PhysicsWorld 2013-11-25 10:08:52 +08:00
Nite Luo b67ec6618f Finish converting LayerColor start working on particle system 2013-11-22 17:14:24 -08:00
samuele3 3a69ee301b issue #3228: Resolve TestLua and HelloLua test samples compile error on the Xcode 4.6.2 when choose Mac platform 2013-11-22 14:06:48 +08:00
Nite Luo f438e83104 Merge branch 'develop' into newRenderer 2013-11-20 11:14:28 -08:00
Ricardo Quesada 0d750cdbaf Adds virtual destructors on Interfaces 
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to  Interface classes

And also enables  'warn on  missing virtual destructors'
 2013-11-19 16:57:23 -08:00
Nite Luo e5ebcb2845 Merge branch 'develop' into newRenderer 2013-11-18 10:22:16 -08:00
Dhilan007 8b14575d7e bind gui and studio. 2013-11-18 16:54:52 +08:00
Nite Luo c5f9434331 Merge branch 'develop' into newRenderer 2013-11-15 11:33:38 -08:00
Nite Luo 566767da60 Add NewDrawNode 2013-11-15 11:29:11 -08:00
samuele3 ec9bc0069f Modify template of lua ios_mac config and some bugs 2013-11-15 13:48:34 +08:00
Nite Luo a70cad8c97 Merge branch 'develop' into newRenderer 2013-11-14 10:36:43 -08:00
Nite Luo 4f1858fa8a Crate NewClipping Node 2013-11-14 10:35:28 -08:00
Nite Luo f17af1f319 Add group command 2013-11-13 17:31:12 -08:00
samuele3 26c3266711 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-13 10:15:24 +08:00
Nite Luo 37d3601fd0 Merge branch 'develop' into newRenderer 2013-11-12 11:56:17 -08:00
Nite Luo ab8b61aaec Create NewSpriteBatchNode to use NewRender 2013-11-12 11:18:49 -08:00
Dhilan007 d43bc3f75d remove unnecessary print 2013-11-12 17:53:23 +08:00
Dhilan007 e182328d51 fix incomplete copy resource 2013-11-12 16:25:39 +08:00
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-11-12 15:30:36 +08:00
Ricardo Quesada a5eeff4f4f fixes for android create 
improves the message.
fixes some grammar errors
 2013-11-11 16:09:32 -08:00
Nite Luo a28f3f6f03 Merge branch 'develop' into newRenderer 2013-11-11 12:04:28 -08:00
minggo b868c3f1dc Merge pull request #4173 from minggo/remove-makefile 
[ci skip]remove makefiles
 2013-11-11 02:19:16 -08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
samuele3 7cfe890d5d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-11 17:04:37 +08:00
samuele3 06c7d3e96d issue #2868:Add ccd lua test samples 2013-11-11 17:03:43 +08:00
James Chen 20b350a58b Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
James Chen 4fba832fb1 Return non-zero if ndk build fails. 2013-11-09 21:05:17 +08:00
Nite Luo fa9d8fe077 Add CustomCommand 2013-11-08 12:06:39 -08:00
Nite Luo be71eb8626 Merge branch 'develop' into newRenderer 
Conflicts:
	.gitignore
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/2d/CCDirector.cpp
 2013-11-07 17:24:57 -08:00
samuele3 16d572c04f issue #2868:Add manual lua binding files 2013-11-07 23:22:11 +08:00
Nite Luo 3108d499e5 use placeholder logic to generate material id 2013-11-06 14:24:56 -08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 
Conflicts:
	cocos/gui/UIHelper.h
 2013-11-06 16:13:10 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
James Chen c364c4f083 issue #3113: Updating CMakeLists.txt, Improve Copying files. 2013-11-06 10:57:36 +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
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
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
Nite Luo e4ffd250cb Simple implementation of RenderCommand and RenderQueue 2013-11-04 09:14:22 -08:00
James Chen bc251bcc95 [cmake] Update make-all-linux-projects.sh. 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 e560de6e4e HelloCpp works. 2013-11-04 21:03:07 +08:00
minggo b5838b800d use python script to build template android projects 2013-11-04 16:48:17 +08:00
minggo 25b0ffe853 Merge pull request #4022 from boyu0/iss2771_physical 
issue #2771: physical
 2013-11-03 18:40:14 -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
boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +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
minggo d4210c77bb Merge pull request #4058 from samuele3hu/developAssetsManager 
issue #3037:Add assetsmananger lua binding and a releated test sample
 2013-11-01 02:50:47 -07:00
boyu0 6d37aa8cd5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-01 17:39:09 +08:00
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac 
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
 2013-11-01 02:33:28 -07:00
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2013-11-01 17:17:21 +08:00
minggo 81c16d9a0e fix a bug when building AssetsManagerTest 2013-11-01 17:03:15 +08:00
minggo 0a59d9eb3e fix assetsmansger path 2013-11-01 16:44:04 +08:00
James Chen 9177f78e5e Merge pull request #4046 from dumganhar/ios-mac-project-fix 
iOS and Mac project fix[ci skip]
 2013-11-01 00:24:08 -07:00
James Chen ed10b92a60 Fix of including wrong include files. 2013-11-01 15:19:10 +08:00
samuelhu e93bcca13e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 2013-11-01 14:44:21 +08:00
samuelhu 8580b16638 Modify let the libluajit.a of mac only support 64bit 2013-11-01 14:40:35 +08:00
samuelhu b0fdb66d2d Modify the all luajit build scripts and let libluajit.a of mac only support 64bit 2013-11-01 14:38:14 +08:00
minggo be1afb502b Merge pull request #4041 from minggo/iss2905-adjust_folder 
can run build-android.python in any path
 2013-10-31 23:28:23 -07:00
minggo d98c6f8de6 can run build-android.python in any path 2013-11-01 14:27:29 +08:00
samuelhu f3ff7955a8 issue #3037:Modify platform build config 2013-11-01 11:18:02 +08:00
samuelhu de4aaeda2d issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-31 22:06:34 +08:00
samuelhu 4031556398 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
 2013-10-31 21:57:24 +08:00
samuelhu 5891f00967 issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-31 21:52:28 +08:00
boyu0 dec749a692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-31 18:20:32 +08:00
boyu0 2efef34144 issue #2771: fix vs compile errors 2013-10-31 18:18:02 +08:00
samuelhu faf3b30e9b issue #3069:Add LuaObjectCBridge and related test sample 2013-10-31 15:20:53 +08:00
Nite Luo fe04448c8d Merge folder changes from develop 2013-10-30 23:19:36 -07:00
minggo 9e5420c954 Merge pull request #4029 from minggo/iss2905-adjust_folder 
use build/android-build to build android samples, and update readme
 2013-10-30 03:30:03 -07:00
minggo da9f7c912b use build/android-build to build android samples, and update readme 2013-10-30 18:27:56 +08:00
minggo 93cde4d814 Merge pull request #4027 from minggo/iss2905-adjust_folder 
add script to build android samples
 2013-10-29 23:22:26 -07:00
minggo 4d9b05a67d add script to build android samples 2013-10-30 14:19:07 +08:00
samuelhu 70082ddc29 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
samuelhu 3508213615 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-10-29 11:45:19 +08:00
samuelhu a4d028e905 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 11:40:41 +08:00
James Chen b4eb970589 [JSB] Fixing compilation errors for iOS and Mac projects. 2013-10-25 10:50:03 +08:00
samuelhu d7689073e0 issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-24 11:12:21 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
Dhilan007 9a0fa3c181 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-21 16:27:49 +08:00
samuelhu 0cffe51219 fix libluajia.a search path bug 2013-10-18 18:08:05 +08:00
samuelhu 4ccb13f5d0 fix libluajia.a search path bug 2013-10-18 17:37:04 +08:00
Dhilan007 6ce34288e0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 15:53:26 +08:00
minggo 5f65cdc3c0 fix xcode compiling error and simplify android.mk 2013-10-18 15:39:09 +08:00
Dhilan007 6f39f903e3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 16:23:19 +08:00
James Chen 34fe2ba02c Added missing icons for some iOS and Mac samples. 2013-10-17 14:12:43 +08:00
Dhilan007 546bc3aa32 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 11:33:10 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
Dhilan007 d82c2ca060 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 09:39:48 +08:00
Ricardo Quesada 28de91d965 more Xcode fixes 2013-10-16 11:45:58 -07:00
Dhilan007 a91621ae5a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:51:02 +08:00
Dhilan007 c6344875de Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:30:51 +08:00
James Chen b5233fc18d issue #2905: [iOS Mac] Updating project configurations. 2013-10-16 17:27:30 +08:00
James Chen 225738ecc5 issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
James Chen 00ee416006 issue #2905: [iOS Mac] All js games work now. 2013-10-16 16:21:55 +08:00
Dhilan007 3d1f734326 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 15:44:43 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
James Chen 039a2c93e1 issue #2905: [iOS Mac]Removing 'include' folder in 'external' group. Otherwise, it will find wrong included file. 2013-10-16 11:30:56 +08:00
James Chen 65f33461bc issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now. 2013-10-16 11:19:42 +08:00
Dhilan007 5116e91c4b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905 2013-10-16 11:00:22 +08:00
Ricardo Quesada 8cad67a3e1 small fixes for the Xcode projects 2013-10-15 13:36:03 -07:00
Dhilan007 2865ad798b issues #2905:Updating project configuration for folder change. 2013-10-15 10:18:37 +08:00
James Chen 9f89879e5e issue #2905: [iOS, Mac] Always search user path. 2013-10-14 17:43:59 +08:00
James Chen 16c88363f5 issue #2905: Updating project configuration for SimpleGame. 2013-10-14 17:16:39 +08:00
James Chen 438fe70287 issue #2905: [iOS, Mac] HelloCpp works now. 2013-10-14 15:53:14 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00