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

19885 Commits

Author SHA1 Message Date
bofeng-song e1ec7a9377 Merge pull request #1 from cocoscodeide/v3 
meger ide
 2014-05-13 13:58:02 +08:00
minggo 4bb9fb2396 [ci skip] 2014-05-13 13:56:42 +08:00
minggo a75550aaba [ci skip] 2014-05-13 13:55:29 +08:00
minggo 4356727465 Merge pull request #6619 from myourys/v3 
update cpp-default-template for android *Eclipse*
 2014-05-13 13:52:28 +08:00
Nite Luo 0b7b9f6131 Merge branch 'v3' into reparentChildren 2014-05-12 22:52:19 -07:00
Nite Luo e1f82c174b add TestCase for reparentChildren bug 2014-05-12 22:50:31 -07:00
minggo 75196d96ce Merge pull request #6696 from andyque/issue5121 
issue 5121, fix loading bar init flicker and refator percentage
 2014-05-13 13:45:01 +08:00
James Chen e265364bc2 Merge pull request #6697 from CocosRobot/update_lua_bindings_1399952323 
[AUTO]: updating luabinding automatically
 2014-05-13 13:10:31 +08:00
andyque 7049fd253d closed #5121, add const to getPercent method 2014-05-13 12:06:28 +08:00
andyque b2397f4059 issue #5005, fix widget hittest problem 2014-05-13 12:04:43 +08:00
heliclei 471f218acf add config item to control whether start autorun 2014-05-13 11:47:32 +08:00
CocosRobot bf6ed6eb8b [AUTO]: updating luabinding automatically 2014-05-13 03:39:46 +00:00
minggo ccb55448da Merge pull request #6685 from andyque/refactor5118 
closed #5118, remove WidgetType and refactor LayoutType to Type
 2014-05-13 11:35:36 +08:00
andyque 7db02fc0e9 closed #5121, change percentage from int to float 2014-05-13 10:34:08 +08:00
Ricardo Quesada a3aed414fa Merge pull request #6694 from ricardoquesada/shader_fixes 
GLProgramState fixes
 2014-05-12 19:20:05 -07:00
andyque 5e01c61d8b closed #5118, fix indent 2014-05-13 10:15:29 +08:00
andyque 9125673c1c issue #5121, fix LoadingBar percentage when initialize 2014-05-13 10:13:08 +08:00
Ricardo Quesada 012f1020ca GLProgramState fixes 
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
 2014-05-12 19:12:56 -07:00
andyque c2f7c10f1c closed #5118, refactor, improving variable name 2014-05-13 09:56:10 +08:00
heliclei 98f1c6768c Merge remote-tracking branch 'upstream/v3' into autotest-autorun 2014-05-13 07:53:49 +08:00
Ricardo Quesada 5d24b3d99a Merge pull request #6693 from MSOpenTech/wp8-v3-fix2 
Fixes for WP8 V3 build recently broken by recent commits
 2014-05-12 10:06:32 -07:00
Dale Stammen 78df412669 updated project files to latest version of cocos2d 2014-05-12 09:27:52 -07:00
Dale Stammen 34b0245cfe updated WP8 precompiled shaders 2014-05-12 09:27:27 -07:00
Dale Stammen bad71e38d0 fixed for ABSOLUTE and RELATIVE winrt compiler reserved words 2014-05-12 09:26:39 -07:00
Dale Stammen 50336dca40 updated to latest version of cocos2d 2014-05-12 09:25:37 -07:00
Dale Stammen 5c5b0184ab updated winrt shader compiler app to latest version 2014-05-12 09:23:48 -07:00
James Chen f2664d1c36 Merge pull request #6692 from dumganhar/value-copy-or-move-contructor-fix 
Value: initialize Value with Type::None when its move and copy contructor is called.
 2014-05-12 23:39:26 +08:00
James Chen 602d89126f Value: initialize Value with Type::None when its move and copy 
contructor is called.
Memory leak fix in `operator =(Value&&)` move assignment.
 2014-05-12 23:32:51 +08:00
James Chen 22b925e054 Update README.md, add travis build status of mac host 2014-05-12 22:30:28 +08:00
James Chen d77a285b76 Merge pull request #6691 from dumganhar/travis-mac-support 
mac support for travis ci
 2014-05-12 22:01:04 +08:00
James Chen e3ccf41ed9 Only build 'merge build' 2014-05-12 21:59:32 +08:00
James Chen 91d684d077 Updates travis script to add mac host support 2014-05-12 21:55:11 +08:00
James Chen 36c4a407ee Adds travis_mac.yml 2014-05-12 21:54:24 +08:00
heliclei 1aabedb316 support auto start tests 2014-05-12 21:47:55 +08:00
James Chen 1c732bfd94 Merge pull request #6690 from CocosRobot/update_cocosfiles_1399892708 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-12 19:06:01 +08:00
CocosRobot 79b679a3b0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-12 11:05:12 +00:00
James Chen 9eb2af752c Merge pull request #6688 from lmskater/add-lua-runtime-bin 
[Jenkins][ci skip] Add lua-runtime-bin to support pull request build
 2014-05-12 19:00:26 +08:00
James Chen eb9fbea7be Merge pull request #6686 from dumganhar/download-runtime 
Updates download-deps.py to support  to download several zip files. (external and lua-runtime-bin)
 2014-05-12 19:00:15 +08:00
minggo b8be364ae2 Merge pull request #6687 from dumganhar/value-fix 
Null ptr check in value assignment
 2014-05-12 18:59:07 +08:00
James Chen 528848765a Merge pull request #6684 from CocosRobot/update_cocosfiles_1399888755 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-12 18:51:17 +08:00
lm f5a134a86e [Jenkins][ci skip] Add lua-runtime-bin to support pull request build 2014-05-12 18:49:52 +08:00
James Chen b24f742c92 Null ptr check in value assignment 2014-05-12 18:45:36 +08:00
James Chen 90024ee112 Updates download-deps.py 2014-05-12 18:12:31 +08:00
andyque ebffc66a83 closed #5118, fix CCSGUIReader setAnchorPoint 2014-05-12 18:07:13 +08:00
andyque a0a4df5ac5 closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
CocosRobot e9cf6060be [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-12 09:59:17 +00:00
James Chen 9265a56f43 Updates .gitignore. 2014-05-12 17:58:27 +08:00
minggo 9ab2dae212 Merge pull request #6635 from dumganhar/iss4660-unicode 
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
 2014-05-12 17:57:25 +08:00
James Chen 8115b09d29 Adds config.json for runtime 2014-05-12 17:55:57 +08:00
James Chen 5dc69026ac Updates download-deps.py to support download several files. 2014-05-12 17:53:51 +08:00