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

11812 Commits

Author SHA1 Message Date
samuele3hu 3a334b7478 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen 2013-09-13 11:42:04 +08:00
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
minggo d74adcf5e4 Merge pull request #3587 from Dhilan007/develop 
Fix not hide status on ios7
 2013-09-12 19:31:42 -07:00
LinWenhai 368d668e7b Update RootViewController.mm 
fix not hide status on ios7
 2013-09-13 09:42:26 +08:00
LinWenhai 644c3ebff5 Update RootViewController.h 
Fix not hide status bar on iOS 7
 2013-09-13 09:40:43 +08:00
James Chen 9e144f32fa Merge pull request #3580 from seemk/vc12_fix 
Fixed compilation on VC12 (VS2013 RC)
 2013-09-12 07:19:13 -07:00
Siim Kallas 4e1e69e873 Fixed compilation on VC12 (VS2013 RC), std::min and std::max require <algorithm> 2013-09-11 19:00:48 +03:00
James Chen a0db624e66 Merge pull request #3576 from CocosRobot/updategeneratedsubmodule_1378893493 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-09-11 02:58:54 -07:00
CocosRobot a812aa9cb2 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-11 09:58:16 +00:00
James Chen 2603e4acf4 Merge pull request #3540 from samuele3hu/TableView 
issue #2764:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
 2013-09-11 02:52:38 -07:00
minggo c07556fdfb Merge pull request #3570 from chengstory/#4551 
#4551
 2013-09-10 01:55:52 -07:00
chengstory bdfde89ef8 Merge branch '#develop' into #4551 
Conflicts:
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
 2013-09-10 16:25:31 +08:00
minggo 7e3b262c62 Merge pull request #3569 from CocosRobot/updategeneratedsubmodule_1378778871 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-09 22:59:16 -07:00
minggo 31ce15ea46 Merge pull request #3571 from dabingnn/new_shader_test 
issue #2782 shader test sprite
 2013-09-09 22:55:53 -07:00
chengstory e04a47b807 1. update mkfile. 2013-09-10 13:08:05 +08:00
chengstory 9bf6ab1e16 1. fixes error of 34 line in android.mk. 2013-09-10 11:50:08 +08:00
chengstory 8b509c456f 1. add shadernode.cpp to linux, nacl mk files. 2013-09-10 11:47:02 +08:00
Huabing.Xu 8e35e7cc27 issue #2782: shadertestSprite change test case textures and add normal sprite for comparison 2013-09-10 11:45:38 +08:00
chengstory 100228b4ae 1. fixes failed to build on linux. 2013-09-10 11:21:18 +08:00
chengstory 669de88e73 1. remove any unused functions. 2013-09-10 11:02:50 +08:00
Huabing.Xu 2912260b3a issue #2782: shadertestSprite linux and windows version 2013-09-10 11:00:57 +08:00
CocosRobot 54c5e63916 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-10 02:07:54 +00:00
minggo 410125feba [skip ci] 2013-09-10 10:06:06 +08:00
minggo 2a5c3ff7e4 Merge pull request #3548 from nakosung/multi_assets 
exposed AssetsManager to javascript and added multiple-assetsManager support
 2013-09-09 19:01:53 -07:00
zhangcheng 98fce2fa84 1. update Samples on develop branch. 2013-09-10 09:53:15 +08:00
Huabing.Xu 5801e9118c issue #2782: remove a blank test case 2013-09-10 09:38:12 +08:00
Huabing.Xu f2fc710f86 issue #2782: shadertestSprite android make file 2013-09-10 09:32:03 +08:00
Nako Sung 31e3faaa4f Update AppDelegate.cpp 2013-09-09 22:38:37 +09:00
Huabing.Xu 8a86a883d0 issue #2782: update mac version, update test case title 2013-09-09 21:33:01 +08:00
zhangcheng 99f32077d2 1. upload SceneTest Resources. 2013-09-09 19:52:07 +08:00
zhangcheng 1115d0d3f9 1. merge scenereader Armature merge to cocos2dx 3.0. 2013-09-09 19:51:26 +08:00
Huabing.Xu d7d914feb1 Merge branch 'develop' into new_shader_test 2013-09-09 18:18:31 +08:00
Huabing.Xu d763de3d3c new shader test code 2013-09-09 17:49:13 +08:00
Huabing.Xu 5c3809b98c add fragment shaders 2013-09-09 17:48:34 +08:00
성낙호 bf4eaa7e7c merged 2013-09-09 18:20:16 +09:00
성낙호 3a4c9f9fb0 men leak fixed (life-cycle management was hand downed to scene-graph) 2013-09-09 17:07:32 +09:00
James Chen 6944043648 Merge pull request #3561 from CocosRobot/updategeneratedsubmodule_1378695345 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-09 00:42:23 -07:00
CocosRobot a4ca30b9c3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-09 02:55:48 +00:00
minggo c5b113c35e Merge pull request #3554 from ricardoquesada/fileutils_perf_improvements 
Fileutils perf improvements
 2013-09-08 19:50:12 -07:00
minggo 90bac02af2 Merge pull request #3558 from dumganhar/warning-fixes 
[develop] Warning fixes.
 2013-09-08 18:44:21 -07:00
James Chen ba9fdc5774 Reverts samples/Cpp/HelloCpp/proj.win32/main.cpp 2013-09-08 11:30:50 +08:00
James Chen b8c82ae5a9 [develop] Warning fixes. 2013-09-08 11:26:38 +08:00
James Chen cd6b50811a Merge pull request #3551 from natural-law/develop 
Change the linked commit of submodule plugin.
 2013-09-07 06:24:25 -07:00
Ricardo Quesada 8078a574c2 snapshopTextures are no longer supported 
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:55:36 -07:00
Ricardo Quesada 487f65af2e Replaces `Dictionary` with `std::unordered_map` 
I did some performance tests, and `std::unordered_map` is more performant than `Dictionary`.

I need to do more tests, but so far, the results are good.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:55:11 -07:00
Ricardo Quesada 7d8261c722 Optimization + standardization in FileUtils 
Since `FileUtils` was using `std::string` internally, it is more efficient to accept `const std::string &` as parameter than `char *` to avoid the creation of unneeded strings.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:54:08 -07:00
Ricardo Quesada 028deae846 Adds const in FileUtils 
`const` was missing in some getters

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:52:55 -07:00
Ricardo Quesada 2d2e15d275 Key should start with '/' to gain performance 
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:51:47 -07:00
Ricardo Quesada 3a0e957e9e compatible with cocos2d c++ guidelines 2013-09-06 19:02:24 -07:00
Ricardo Quesada bf6750067f little optimization. 
string is created when needed
 2013-09-06 19:00:12 -07:00