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

15826 Commits

Author SHA1 Message Date
Ricardo Quesada 83f16e25e3 merge from develop 2014-01-22 11:44:48 -08:00
Ricardo Quesada c1fb0a697c Merge pull request #5167 from martell/size_t 
Fixed x64 builds of testcpp with long to size_t changes
 2014-01-22 11:32:47 -08:00
martell 50176a038f Fixed x64 builds of testcpp with long to size_t changes 2014-01-22 19:21:25 +00:00
Ricardo Quesada 1b6dfcda40 Merge branch 'develop' into cceglview_in_desktop 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-01-22 11:21:16 -08:00
heliclei 04ee67481a set pr status at post build stage 2014-01-23 00:21:58 +08:00
pandamicro 7e4f82db1d Issue #3806: Update shared tests_v3.0 of js test cases 2014-01-22 22:57:34 +08:00
pandamicro 29fcf46497 Fixed #3806: Update tests 3.0 2014-01-22 22:41:30 +08:00
pandamicro 913360e526 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-22 22:32:44 +08:00
pandamicro d6df71cc11 Fixed #3806: Change parameters to const & 2014-01-22 22:31:26 +08:00
James Chen 45bbbca8c6 Merge pull request #5164 from Dhilan007/develop_label 
close #3642:fix bounding box of new label is incorrect.
 2014-01-22 06:23:39 -08:00
Huabing.Xu 159f44a5dc issue #3812: performance improvement, 1. add vector reserve 2. use C++11 range loop 2014-01-22 18:24:23 +08:00
James Chen c984416d3e Merge pull request #5165 from CocosRobot/updategeneratedsubmodule_1390384981 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-22 02:04:00 -08:00
CocosRobot e900504e8b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 10:03:04 +00:00
Dhilan007 ec297a2c31 close #3642:fix bounding box of new label is incorrect. 2014-01-22 18:01:37 +08:00
Dhilan007 a2f5146731 close #3642:fix bounding box of the new label is a bit off. 2014-01-22 17:45:56 +08:00
James Chen 351814c0be Merge pull request #5158 from Dhilan007/develop_label 
Label:remove unused code and optimization performance.
 2014-01-22 01:24:48 -08:00
James Chen 1b89a058fa Merge pull request #5160 from samuele3hu/developBugFix 
fix:Update the some test cases for lua
 2014-01-22 01:21:50 -08:00
James Chen 49481172e9 Update AUTHORS [ci skip] 2014-01-22 17:18:36 +08:00
James Chen 292c5a17c6 Merge pull request #5161 from pyrasis/develop 
[Win32] fix localStorageGetItem crash when column text is NULL.
 2014-01-22 01:17:32 -08:00
samuele3hu e1476c8d60 fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache() 2014-01-22 17:09:33 +08:00
Huabing.Xu cc39ca4f16 issue #3812: rename convertToWorldCoordiantes->convertToWorldCoordinates 2014-01-22 17:09:13 +08:00
zhangbin 462b9a7ace issue #2572, Optimize the code of test case for issue 2572. 2014-01-22 17:04:54 +08:00
James Chen 573bab945d Merge pull request #5162 from CocosRobot/updategeneratedsubmodule_1390381054 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-22 01:02:22 -08:00
CocosRobot f9615d891e [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 08:57:36 +00:00
minggo 9c6a65baba Merge pull request #5156 from minggo/deprecate-function 
deprecated some functions in Object
 2014-01-22 00:51:50 -08:00
Lee, Jae-Hong e5d45583b7 [Win32] fix localStorageGetItem crash when column text is NULL. 2014-01-22 17:37:29 +09:00
Huabing.Xu 7ea9a4f025 issue #3812: remove member variable _lastCommand 2014-01-22 16:03:04 +08:00
Huabing.Xu 5bbd48a9bf issue #3812: remove member variable _firstCommand, remove comment codes 2014-01-22 15:52:00 +08:00
samuele3hu e848167b25 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-22 15:44:33 +08:00
samuele3hu c4d2f1d83c fix:Add the deprecated function for the “dumpCachedTextureInfo” and update the related test case 2014-01-22 15:41:46 +08:00
zhangbin 3c2ef04f2b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-22 15:39:28 +08:00
zhangbin 3007f34240 issue #2572, Add test case for issue 2572. 2014-01-22 15:38:59 +08:00
Huabing.Xu 5397618aab Merge branch 'develop' into develop_refactor_culling 
* develop: (127 commits)
  issue #3677: Wrong include fix.
  issue #3677: File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.
  issue #3677: Updates Windows project to add PerformanceEventDispatcherTest.
  issue #3677: Updates Android.mk and CMakeLists.txt.
  issue #3677: Adds EventDispatcher performance test.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG [ci skip]
  Update CHANGELOG [ci skip]
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3713: every autorelease will cause a release operation
  do not mix github access token with jenkins job trigger token
  issue #3781, Update travis-scripts, llvm-installing parts no need now.
  issue #3713: use reference in loop
  issue #3781, Minor fix & update submodule.
  closed #3808: EditBox on Mac works again.
  issue #3713:fix memory leak of autoreleas pool
  closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context
  global Z order uses floats
  ActionsProgress test include fixes
  Removed unused code and files.
  ...

Conflicts:
	cocos/2d/renderer/CCRenderer.cpp
 2014-01-22 15:37:25 +08:00
heliclei e12e80298d update github api url and jenkins job trigger url 2014-01-22 15:23:29 +08:00
Dhilan007 4095ab36b6 update xcode project. 2014-01-22 15:22:46 +08:00
samuele3hu 0d8d517c2b fix:Update the TestLua/TouchesTest by using the new event-dispatcher 2014-01-22 15:18:47 +08:00
Huabing.Xu cf6785ffcf issue #3812: using std::vector<QuadCommand*> to hold current batched command 2014-01-22 15:18:27 +08:00
Dhilan007 65c2e03721 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-22 15:08:05 +08:00
James Chen 668a855484 Merge pull request #5157 from dumganhar/iss3677-eventdispatcher-perf 
issue #3677: Adds EventDispatcher performance test.
 2014-01-21 22:58:01 -08:00
Dhilan007 df21bbf7df 1.remove unused code 
2.reduce calculation amount.
3.reduces expenses of function calls
 2014-01-22 14:57:11 +08:00
James Chen 444a30e226 issue #3677: Wrong include fix. 2014-01-22 14:12:25 +08:00
James Chen 32572e257e issue #3677: File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp. 2014-01-22 14:10:42 +08:00
James Chen e3e248c0f0 issue #3677: Updates Windows project to add PerformanceEventDispatcherTest. 2014-01-22 13:53:54 +08:00
minggo 4381685a9d deprecated some functions in Object 2014-01-22 13:47:29 +08:00
James Chen 43a10f951b issue #3677: Updates Android.mk and CMakeLists.txt. 2014-01-22 13:35:52 +08:00
James Chen cecb20f824 issue #3677: Adds EventDispatcher performance test. 2014-01-22 13:33:40 +08:00
Hanju Kim 64ab0c0e35 Merge remote-tracking branch 'remotes/upstream/develop' into develop 
Conflicts:
	cocos/2d/CCFontDefinition.cpp
 2014-01-22 14:15:21 +09:00
James Chen 0da326e07f Merge pull request #5155 from CocosRobot/updategeneratedsubmodule_1390364448 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-21 20:46:07 -08:00
CocosRobot 97b473731d [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 04:20:57 +00:00
James Chen b4c2871496 Update CHANGELOG [ci skip] 2014-01-22 12:03:23 +08:00