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

335 Commits

Author SHA1 Message Date
samuele3hu 582e961f2a Replace getContentSize with getVirtualRendererSize related with Button in the CocoStudioGuiTest 2014-04-21 18:28:05 +08:00
minggo 0a5b92c56f Merge pull request #6305 from samuele3hu/developAudio 
fix the bug that exit layer can’t end the SimpleAudioEngine
 2014-04-21 14:40:40 +08:00
samuele3hu 914516a4e0 fix the compile error about luabindings and add the `RichText` test cases. 2014-04-18 11:54:57 +08:00
samuele3hu 1331fff62c fix the bug that exit layer can’t end SimpleAudioEngine 2014-04-17 10:36:08 +08:00
boyu0 b53961b78d issue $4771: fix lua test and fix some bugs 2014-04-15 13:40:44 +08:00
James Chen 427ca4ecf0 Small fix in Lua test. 2014-04-11 05:45:18 -07:00
zhangbin 99766cdd03 fix the error show of ` FontTest` 2014-04-11 20:17:34 +08:00
zhangbin 0eee9bc288 Solve the incorrect effect of some transition test case in lua-tests. 2014-04-11 20:02:11 +08:00
boyu0 b69b14382e Rename lua cc.Label:create to cc.Label:createWithTTF and cc.Label.createWithSystemFont 2014-04-11 15:25:18 +08:00
samuele3hu c687b97c6e fix the crash invoked by deprecated `create` function of `Label` 2014-04-10 23:36:25 +08:00
samuele3hu 2800133c99 Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF` 2014-04-10 14:54:14 +08:00
James Chen 5615717617 issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
samuele3hu 7de6552f54 Update the NewEventDispatcherTest 2014-04-09 16:22:03 +08:00
samuele3hu dbd01051d8 close #4721:clone for EventListeners of lua didn't clone the related property 2014-04-09 14:26:05 +08:00
samuele3hu b68f6bf65e fix the error about `draw` of GLNode and modify the related test cases 2014-04-03 17:02:14 +08:00
samuele3hu bff1d6c2a6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-03 11:15:59 +08:00
samuele3hu b9ff51782f Synchronize LabelTest of cpp to lua to fix some bug and add more tests 2014-04-03 11:08:59 +08:00
samuele3hu 0c93c6ae60 fix error that “lua-test/opengltest/shader retro effect” test case have no effect 2014-04-02 15:34:26 +08:00
samuele3hu 056303ea35 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-29 14:58:45 +08:00
samuele3hu 219a91a641 Add the omitted socket script for lua-tests 2014-03-29 14:58:23 +08:00
samuele3hu 403e96b943 Use the New Label in the Extension test case 2014-03-29 10:34:52 +08:00
samuele3hu a387f60f80 Update the font size for new label test display 2014-03-28 23:32:11 +08:00
samuele3hu 7ca207f993 Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised. 2014-03-28 17:18:41 +08:00
andyque 57d8f155df issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
minggo dfb3b6719c Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator 
build lua.a for arm64bit and iOS simulator 64 bit architectures, change ...
 2014-03-15 01:22:28 +08:00
boyu0 f23db68151 build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files. 2014-03-15 01:19:06 +08:00
samuele3hu a05d6a55e2 fix: Make Close Menu invisible for iOS platform 2014-03-14 17:38:58 +08:00
samuele3hu 4aef65d4b7 fix the error that AssetManager test case can’t find correct resource path 2014-03-14 09:48:48 +08:00
samuele3hu 9713a246ee Replace cc.LabelBMFont:create with cc.Label:createBMFont 2014-03-12 18:33:28 +08:00
samuele3hu 1c32c6d96f Replace cc.LabelTTF:create with cc.Label:create 2014-03-12 17:51:34 +08:00
samuele3hu d06bb83f19 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 
Conflicts:
	tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
 2014-03-12 14:33:39 +08:00
samuele3hu 9c95c1e456 Replace cc.LabelTTF:create with cc.Label:create 2014-03-12 14:27:52 +08:00
James Chen 4a55e98adf [lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added. 2014-03-12 14:06:57 +08:00
andyque 0634a1accd fix lua resource path 2014-03-12 10:19:41 +08:00
James Chen b88de91a15 Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00