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

21247 Commits

Author SHA1 Message Date
minggo c579fbf845 Merge pull request #7169 from natural-law/v3 
Solve the error in Xcode project of lua runtime template.
 2014-06-23 16:04:06 +08:00
andyque 808c4bd763 remove unused override method 2014-06-23 15:46:07 +08:00
zhangbin dd49c4ccbc Solve the error in Xcode project of lua runtime template. 2014-06-23 15:41:58 +08:00
andyque e72d89ba2f fix windows tests compile error 2014-06-23 15:21:25 +08:00
andyque 93319f3a3b fix lua ui binding compile error 2014-06-23 14:56:41 +08:00
boyu0 c40c461848 closed #5541: add warning code and comment. 2014-06-23 13:55:52 +08:00
andyque c9bcbfb265 fix addEventListener hidden problem 2014-06-23 12:09:49 +08:00
lvlong e48982aeaa unsigned int -> size_t 2014-06-23 11:12:08 +08:00
lvlong 0ac6b8c96d 1.delete write function from bundle reader. 
2.unsigned int -> size_t.
 2014-06-23 11:10:03 +08:00
heliclei 41c8a5e33b send email notification if build failed 2014-06-23 11:01:41 +08:00
samuele3hu 02e0bad3f1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-23 10:28:05 +08:00
samuele3hu 7de04210c2 Update bindings-generator submodule 2014-06-23 10:27:06 +08:00
heliclei 39ee23795e send email notification if pull request build fail 2014-06-23 10:26:36 +08:00
andyque 87455b0ecb add constness to some function 2014-06-23 10:12:54 +08:00
andyque 8a463e7964 remove Hungry style 2014-06-23 10:02:09 +08:00
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 2014-06-23 09:37:39 +08:00
yangxiao c92ba3f3dc Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-23 09:32:59 +08:00
XiaoYang ea3b7c6c80 Merge pull request #39 from lvlonggame/v3 
add .c3b file and modify warning
 2014-06-23 09:32:25 +08:00
lvlong 75f1ef5288 modify warning 2014-06-23 09:23:09 +08:00
yangxiao 92da41694d Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-23 09:05:03 +08:00
lvlong dfd68f128a c3b file 2014-06-23 09:03:53 +08:00
Timur Losev 196a924f89 - Due to the fact that map::insert doesn't allow to insert an element by existing key, I suggest to use operator []. It allows to change the 
cached value, very helpful on Android platform: when context is lost, the application will reset - rebuild - recache all it's shaders.
 2014-06-22 20:53:01 +03:00
lite3 e3eb5aeddd put duplicate code to processResponse 2014-06-22 12:37:23 +08:00
lite3 ebbcb3ea33 change immediateSend to sendImmediate 2014-06-22 11:39:39 +08:00
lite3 7c65968b56 add immediateSend test 2014-06-22 00:11:20 +08:00
lite3 cb42f549ce fix: request will be delete in thread. 2014-06-22 00:08:02 +08:00
lite3 758a1f5dc4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-21 17:34:11 +08:00
Nite Luo 21330860a9 Fix NodeReader will crash when encountered unknown NodeType 2014-06-20 17:24:34 -07:00
minggo b65991bf85 Merge pull request #7162 from CocosRobot/update_cocosfiles_1403281523 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-21 00:27:24 +08:00
CocosRobot 2c04d00425 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-20 16:25:25 +00:00
minggo dbfbba87de Merge pull request #7161 from MSOpenTech/wp8-v3-fix 
Wp8 v3 fix
 2014-06-21 00:22:51 +08:00
Dale Stammen 113f20094f added building wp8 shaders instructions 2014-06-20 09:12:16 -07:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
Dale Stammen 83c5b7bdb0 updated wp8 precompiled shaders 2014-06-20 09:07:29 -07:00
Dale Stammen aa4ffc33ac updated WP8 shader compiler tool 2014-06-20 09:06:49 -07:00
yangxiao fa231cadb5 merge v3 2014-06-20 22:57:55 +08:00
yangxiao 2a6dfaf91b Merge branch 'newcode' into v3 2014-06-20 22:55:27 +08:00
yangxiao 1e319bc1f8 fix compile bug 2014-06-20 22:38:09 +08:00
yangxiao 1581396810 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-20 18:54:34 +08:00
yangxiao 3096979b1f rename createSubAnimate3D to create 2014-06-20 18:54:09 +08:00
XiaoYang 2371e8e6ae Merge pull request #38 from lvlonggame/v3 
binary loader
 2014-06-20 18:46:52 +08:00
boyu0 2fa266e917 closed #5541: change PhysicsActionTest for rotate action. 2014-06-20 18:42:36 +08:00
boyu0 2fc8889791 issue #5541: change RotateTo/RotateBy for Physics. 2014-06-20 18:40:21 +08:00
Huabing.Xu bb4128036c use quad command for tile map rendering 2014-06-20 18:10:18 +08:00
yangxiao c5e562106f Animate3D support spawn 2014-06-20 17:55:25 +08:00
minggo d99c30a0cc Merge pull request #7155 from natural-law/v3 
Optimize the win32 projects configuration.
 2014-06-20 17:35:32 +08:00
lvlong 478ea8949a Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3 
Conflicts:
	tools/bindings-generator
	tools/cocos2d-console
 2014-06-20 16:14:46 +08:00
lvlong 69436ddd65 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	cocos/3d/CCBundle3DData.h
 2014-06-20 16:02:22 +08:00
lvlong e4bbfad773 1. binary loader is OK. 
2. add some comment.
 2014-06-20 15:30:08 +08:00
andyque 9b945683b5 fix contentSize not set properly problem 2014-06-20 14:55:42 +08:00