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

29468 Commits

Author SHA1 Message Date
James Chen 07f6774cee Crash fix for referring a non-existent layer in tmx. 2015-05-20 11:29:52 +08:00
Ricardo Quesada 5d90a8725e Merge pull request #11903 from ricardoquesada/cleaner_code_properties 
Terrain uses StateBlock
 2015-05-19 18:07:50 -07:00
Ricardo Quesada 5924a917a1 Terrain uses StateBlock 
cleaner code, conforms to new way of setting the state
 2015-05-19 17:18:44 -07:00
Ricardo Quesada 703852de69 Merge pull request #11902 from CocosRobot/update_lua_bindings_1432076290 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-19 16:56:46 -07:00
CocosRobot 61aad4581a [AUTO]: updating luabinding & jsbinding automatically 2015-05-19 23:02:24 +00:00
Ricardo Quesada c28c1ffbfb Merge pull request #11901 from ricardoquesada/cleaner_code_properties 
Properties fixes
 2015-05-19 15:48:08 -07:00
Ricardo Quesada aa027fbe0f Properties fixes 
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
 2015-05-19 13:51:52 -07:00
minggo 43b5983abe [ci skip]update AUTHORS 2015-05-19 11:46:04 +08:00
minggo fedd3c46e1 [ci skip]update CHANGELOG 2015-05-19 11:44:06 +08:00
minggo bb3ad7d249 Merge pull request #11677 from tankorsmash/patch-1 
Fix setSprite never updating progress on ProgressTimer
 2015-05-19 11:42:20 +08:00
minggo 38773e2164 Merge pull request #11869 from samuele3hu/v3_updateccs 
Fix the bug that tableCellSizeForIndex of tableview get the wrong result  in the Lua
 2015-05-19 09:26:09 +08:00
minggo e3e78b039a Merge pull request #11851 from andyque/fixIssue11769 
Copy missing text color property of ui::Text.
 2015-05-18 18:14:29 +08:00
minggo e429edec3e Merge pull request #11882 from CocosRobot/update_cocosfiles_1431937160 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-18 16:20:27 +08:00
CocosRobot 181f225eb7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-18 08:19:22 +00:00
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +08:00
minggo 204877351f Merge pull request #11879 from joshuastray/js-tests 
[ci skip]added missing terrain/particle/sprite3d tests
 2015-05-18 16:04:57 +08:00
minggo 20da707b90 Merge pull request #11881 from CocosRobot/update_lua_bindings_1431932345 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-18 16:04:28 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00
WenhaiLin 54b6260dfd Rename module 2015-05-18 15:17:05 +08:00
CocosRobot 3e08ec4c11 [AUTO]: updating luabinding & jsbinding automatically 2015-05-18 07:04:27 +00:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00
minggo f30cb9ac19 Merge pull request #11877 from CocosRobot/update_lua_bindings_1431927557 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-18 14:48:42 +08:00
minggo 7b76d5fc41 Merge pull request #11871 from walzer/v3 
fixed #11821, after release StateBlock::_defaultState, set it to null.
 2015-05-18 14:47:16 +08:00
joshuastray 06846b5b1a added some missing tests 2015-05-18 14:44:33 +08:00
CocosRobot 9572de26d4 [AUTO]: updating luabinding & jsbinding automatically 2015-05-18 05:43:08 +00:00
WenhaiLin 68188f7424 Add native code for AS project. 2015-05-18 13:41:58 +08:00
minggo 59ff1cf7f3 Merge pull request #11874 from CocosRobot/update_cocosfiles_1431927353 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-18 13:39:02 +08:00
CocosRobot fd55bb8e68 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-18 05:35:55 +00:00
minggo ff3d28e6d7 Merge pull request #11870 from joshuastray/matierial 
add material system tests for js
 2015-05-18 13:33:30 +08:00
minggo c2f245733c Merge pull request #11872 from xiaofeng11/v3 
Fix ArmatureAnimation crash
 2015-05-18 13:32:52 +08:00
minggo 8068a2c220 Merge pull request #11836 from dabingnn/v3_CameraMaskFor2DAnd3DRendering 
V3 camera mask for2 d and3 d rendering
 2015-05-18 13:32:26 +08:00
XiaoFeng be20666b65 Fix ArmatureAnimation crash 2015-05-18 12:08:26 +08:00
walzer 02f295dfbf fixed #11821, after release StateBlock::_defaultState, set it to null, because developers would reconstruct it. 2015-05-18 10:44:49 +08:00
joshuastray 00dd854578 add material system tests for js 2015-05-18 10:44:15 +08:00
Huabing.Xu 384041a950 improve the perfermance of clear background for camera 2015-05-18 10:31:17 +08:00
WenhaiLin 7caa6bb2fc Update Copyright. 2015-05-18 09:59:50 +08:00
samuele3hu da2314b00a Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua 2015-05-18 09:41:35 +08:00
minggo 56070da720 Merge pull request #11864 from flashjay/patch-3 
Update AssetsManager.cpp
 2015-05-18 09:34:22 +08:00
minggo 2dbe375380 Merge pull request #11868 from joshuastray/bullet-preprocessor-macro 
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
 2015-05-18 09:33:00 +08:00
minggo 0eeeded6a6 Merge pull request #11861 from MSOpenTech/v3-winrt-js 
fixed include paths for arm builds
 2015-05-18 09:32:28 +08:00
minggo d9107f8830 Merge pull request #11858 from samuele3hu/v3_updateccs 
Update CocoStudioUIEditorTest for Lua to shorten csb file name and replace some deprecated functions.
 2015-05-18 09:32:06 +08:00
joshuastray ead74ac89e add CC_ENABLE_BULLET_INTEGRATION=1 to js project 2015-05-17 23:11:17 +08:00
HuaYang Huang 8212b1398f Update AssetsManager.cpp 
fix: crash when default constructor params packageUrl, versionFileUrl,.. is NULL
fix: percent
 2015-05-16 11:48:34 +08:00
unknown 91432f0ddf fixed include paths for arm builds 2015-05-15 15:35:36 -07:00
samuele3hu 562c711cda Update CocoStudioUIEditorTest for Lua and replace some deprecated functions. 2015-05-15 18:26:21 +08:00
minggo e99b99cc79 Merge pull request #11853 from joshuastray/fix-resource-path 
fix resource path for js-tests
 2015-05-15 16:53:47 +08:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00
joshuastray 4d0ada1cac fix resource path for js-tests 2015-05-15 16:23:43 +08:00
minggo 8f7a023233 Merge pull request #11848 from VisualSJ/v3-build 
Add VideoPlayer and webview tests
 2015-05-15 16:19:56 +08:00
minggo 200f42a4b9 Merge pull request #11852 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-05-15 16:07:32 +08:00