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

27537 Commits

Author SHA1 Message Date
minggo 5a4fbf691b Merge pull request #10234 from CocosRobot/update_lua_bindings_1422338223 
[AUTO]: updating luabinding automatically
 2015-01-27 14:00:36 +08:00
CocosRobot 4792a44a87 [AUTO]: updating luabinding automatically 2015-01-27 05:58:53 +00:00
minggo 880abfe814 Merge pull request #10209 from andyque/fixLoadingBarReloadTexture 
Fix loading bar reload texture issue
 2015-01-27 13:50:38 +08:00
minggo e1afb7c789 Merge pull request #10226 from andyque/removeDuplicateCode 
remove unused code
 2015-01-27 13:50:15 +08:00
minggo 2a94ede427 Merge pull request #10227 from cpascal/add_EditBox_getDescription 
Added override of ui::EditBox::getDescription()
 2015-01-27 13:49:55 +08:00
minggo 434c0baba4 Merge pull request #10219 from geron-cn/fixProjectNodeLoader 
fix bug: fix crash when lack of projectnode file
 2015-01-27 13:41:27 +08:00
geron-cn 390c336a19 FIX animationfio lost after actiontimeline clone 2015-01-27 12:04:14 +08:00
flamefox 5057503299 Merge pull request #2 from cocos2d/v3 
Merge
 2015-01-27 10:49:20 +08:00
flamefox 575f68b724 Merge branch 'v3' of https://github.com/flamefox/cocos2d-x into v3 
Conflicts:
	templates/cocos2dx_files.json
 2015-01-27 10:44:19 +08:00
flamefox f81a2a8990 when bindings-generator on windows，it need this 2015-01-27 10:42:06 +08:00
flamefox 160d046030 when bindings-generator on windows，it need this 2015-01-27 10:31:38 +08:00
andyque 7b81f3a811 remove unused code 2015-01-27 10:17:41 +08:00
cpascal d857164768 Added override of ui::EditBox::getDescription() 2015-01-27 11:10:04 +09:00
cpascal 985db1cd21 Merge remote-tracking branch 'upstream/v3' into v3 2015-01-27 11:04:58 +09:00
Nite Luo 398f0b861d Merge pull request #10220 from darkdukey/billboardTest 
Billboard test-case
 2015-01-26 16:54:41 -08:00
Nite Luo 15adaf2877 save/restore render state 2015-01-26 16:37:11 -08:00
kompjoefriek 722ec8713b Merge remote-tracking branch 'upstream/v3' into v3 2015-01-26 23:18:48 +01:00
kompjoefriek dd694e39d2 Revert "Fixes cocos2d/cocos2d-x/#8414" 
This reverts commit 60fc8de036.
 2015-01-26 23:13:28 +01:00
Nite Luo 55b2504bfd Merge branch 'v3' into billboardTest 2015-01-26 10:53:17 -08:00
flamefox 83643f68e7 Merge pull request #1 from cocos2d/v3 
metge v3
 2015-01-27 02:03:11 +08:00
Vladimir Timofeev 7956297430 cmake+msvc: disable tests and lua bindings by default (temporarily, until tests will be fixed) 2015-01-26 17:28:58 +03:00
geron-cn 937ee25e7b revert plugin 2015-01-26 21:25:11 +08:00
geron-cn d3baae0304 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into fixProjectNodeLoader 2015-01-26 21:21:31 +08:00
geron-cn a1a7273436 fix bug: fix crash when lack of projected file 2015-01-26 21:20:26 +08:00
Vladimir Timofeev 004ee0b785 cmake+msvc: Use inline debug info (/Z7) format. Or internal error may occur because some dependant libs compiled with Z7 format. 2015-01-26 15:29:03 +03:00
yangxiao cc18a3a955 another use case not finished 2015-01-26 18:44:30 +08:00
lvlong bb419719aa fix bug: about caching uniform. 2015-01-26 18:40:00 +08:00
andyque 95e8072afa fixed issue #10183 2015-01-26 18:26:59 +08:00
minggo 81caa9f351 [ci skip] Update CHANGELOG 2015-01-26 18:02:00 +08:00
minggo f54c6c93bb Merge pull request #10215 from andyque/fixIssue10210 
don't release the scale9Image when updateSprites
 2015-01-26 17:58:21 +08:00
andyque 732050d940 don't release the scale9Image when updateSprites 2015-01-26 16:04:43 +08:00
minggo 5dc09d8489 Merge pull request #10208 from pipu/modify_parse_TMXTiledMap 
Checking whether tileset is valid during parses TMXTiledMap.
 2015-01-26 15:52:18 +08:00
minggo 269e91a55d Merge pull request #10211 from super626/usecase 
Usecase for 2d + 3d
 2015-01-26 15:41:06 +08:00
Vladimir Timofeev 86f57f11c6 cmake: eliminate warning about policy on cmake 3.1 2015-01-26 10:17:33 +03:00
Vladimir Timofeev b6201f9328 cmake: try to fix lua-bindings for msvc 2015-01-26 10:09:49 +03:00
andyque 691e1925ca udpate test resource submodule 2015-01-26 15:05:41 +08:00
Vladimir Timofeev 991ea4532d cmake: fix using of external/xxhash for msvc generated project 2015-01-26 10:03:49 +03:00
Vladimir Timofeev 725744744b cmake: add logic to find and link with curl in cpp-tests, because cpp-tests use curl as its own (in file tests/cpp-tests/Classes/CurlTest/CurlTest.cpp) 2015-01-26 10:03:30 +03:00
Vladimir Timofeev 5d27da2887 cmake: add glew include dirs globally, because windows code uses glew from public headers 2015-01-26 10:03:07 +03:00
yangxiao 77716d481d format 2015-01-26 15:03:01 +08:00
Vladimir Timofeev fc5023c9e7 cmake: add ZLIB_INCLUDE_DIRS to include directories before external/unzip compile (fix compilation with msvc) 2015-01-26 10:02:46 +03:00
Vladimir Timofeev 567c5933bb cmake: fix GLEW include dir for msvc prebuilt library 2015-01-26 10:02:27 +03:00
yangxiao 5e1d7449f7 complete use case 1 2015-01-26 14:58:16 +08:00
andyque 12cf9da486 improve loadingbar test 2015-01-26 14:46:45 +08:00
andyque 0e67cfcbff improve loading Bar Test 2015-01-26 14:39:44 +08:00
minggo d94c26006b [ci skip] Update CHANGELOG 2015-01-26 14:11:49 +08:00
minggo cba0e19252 Merge pull request #9922 from joshuastray/fix-order-of-detach-atach-of-textfield 
Change the order of detach and attach of TextField::upadate
 2015-01-26 14:00:58 +08:00
minggo b722ea33da [ci skip] Update CHANGELOG 2015-01-26 13:55:57 +08:00
minggo 4ac50f2c26 Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix 
Fixed sets the page's base URL for WebView doesn't work.
 2015-01-26 13:51:08 +08:00
minggo 38a86ad18a [ci skip] Update CHANGELOG 2015-01-26 13:50:36 +08:00