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

867 Commits

Author SHA1 Message Date
James Chen fce5deb0ec Refactoring mainmenu.lua. 2013-04-07 15:56:05 +08:00
James Chen ef731879f1 Merge pull request #2291 from dumganhar/iss1944-remove-associate-nativeobj 
fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
 2013-04-06 20:20:33 -07:00
James Chen 684c659ba7 Merge pull request #2311 from dumganhar/iss2002-more-luatest 
fixed #2002: Adding Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest for TestLua
 2013-04-06 19:45:28 -07:00
James Chen 6e1cf1e951 fixed #2002: Adding EffectsAdvancedTest for TestLua. 2013-04-07 10:38:56 +08:00
minggo 2436d87cb3 Merge pull request #2256 from waiter/master 
Add CCRemoveSelf Action
 2013-04-06 19:09:17 -07:00
James Chen 85b0fd306a Adding CocosDenshionTest. 2013-04-06 14:32:46 +08:00
James Chen 63c0ede945 Removing a comment. 2013-04-06 14:00:59 +08:00
James Chen 5171e11765 Adding FontTest for TestLua. 2013-04-06 14:00:17 +08:00
James Chen 17b948367a Adding ZwoptexTest. 2013-04-05 23:34:46 +08:00
James Chen e754909c5f Adding RenderTexture test for TestLua. 2013-04-05 17:13:46 +08:00
James Chen 2bff6d6480 Adding Texture2dTest. And format some lua codes. 2013-04-05 16:13:04 +08:00
James Chen 425b95152c Merge pull request #2295 from SevInf/master 
fixed #1999: CCEditBox iOS enchantments/bugfixes
 2013-04-03 07:37:29 -07:00
Sergej Tatarincev 202edc1597 CCEditBox test for separate font name/size setters 2013-04-03 17:20:01 +03:00
James Chen 031e77ccbe Updating SceneTest.lua. 2013-04-03 18:31:00 +08:00
James Chen 818a570b7f fixed #1998: Adding SceneTest.lua for TestLua. 2013-04-03 18:14:03 +08:00
James Chen 229d4329a5 fixed #1997: Adding IntervalTest for TestLua. 2013-04-03 17:00:05 +08:00
James Chen 2d9f8ca8de fixed #1814: MenuTest for Testlua is ok. 2013-04-03 16:29:16 +08:00
James Chen 686775300d fixed #1994: ActionManagerTest.lua is ok. 2013-04-03 11:59:17 +08:00
James Chen 6d6bc03465 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1944-remove-associate-nativeobj 2013-04-03 10:27:01 +08:00
James Chen c54ee96705 issue #1994: Adding actionManagerTest.lua. 2013-04-03 10:20:12 +08:00
James Chen 46b26cffd3 fixed #1993: Adding ParallaxTest for TestLua. 2013-04-02 18:20:14 +08:00
James Chen a73395507c fixed #1942: LayerTest for TestLua is ok. 2013-04-02 17:52:08 +08:00
James Chen ec7a2f4c5c fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore. 2013-04-02 11:35:55 +08:00
James Chen 930487f6f7 Updating layerTest.lua. 2013-04-02 11:28:31 +08:00
James Chen d0300d429c issue #1942: Adding LayerTest, first commit. 2013-04-01 18:05:35 +08:00
James Chen a7f1fba762 TileMapTest.lua is ok. 2013-04-01 17:39:27 +08:00
James Chen 57a76a3a86 Using universal config for TestLua. 2013-04-01 17:39:27 +08:00
James Chen be4d15fbba Updating LabelTest.lua 2013-04-01 17:39:26 +08:00
James Chen 9ea35977db new tile map tests 2013-04-01 17:39:26 +08:00
James Chen 4a1eab5101 CCLOG -> cclog 2013-04-01 17:39:26 +08:00
James Chen 205123f661 Adding TileMapTest.lua 2013-04-01 17:39:26 +08:00
James Chen d401fb3771 labeltest.lua finish. 2013-04-01 17:39:25 +08:00
James Chen 8854fc046f BitmapFontMultiLineAlignment is ok. 2013-04-01 17:39:25 +08:00
James Chen 5a623b9b07 Some tests in LabelTest.lua are ok. 2013-04-01 17:39:25 +08:00
James Chen a388f401bf Updating LabelTest.lua. 2013-04-01 17:39:25 +08:00
waiter c9e36438a8 Add ActionRemoveSelf in TestCpp/ActionTest 
Add ActionRemoveSelf in TestCpp/ActionTest
 2013-04-01 10:18:26 +08:00
James Chen 374024cefd Updating JS Test. OpenGLTest works ok now. 2013-03-28 16:58:36 +08:00
James Chen 4220fd4ca5 fixed #1936: Updating project configuration for TestJavascript. 2013-03-28 16:55:23 +08:00
James Chen 201dc74ecb fixed #1936: Updating obfuscate.xml. 2013-03-28 16:54:49 +08:00
James Chen b6556bd41f fixed #1936: Updating the obfuscated file, game.js in TestJavascript. 2013-03-28 16:54:18 +08:00
Rohan Kuruvilla 57fd3cdb9c Modifying JS files to load OpenGL bindings. Also modify AppDelegate and Project files and generator template 2013-03-27 23:59:29 -07:00
James Chen 8c5f278d06 Updating mainMenu.lua 2013-03-26 18:18:37 +08:00
James Chen 567e1fa15f Adding LabelTest.lua. Three tests in LabelTest works ok. 2013-03-26 18:14:14 +08:00
Rohan Kuruvilla 596acfda09 Adding all CocosPlayer Android resource folders for CCB and updating to latest version 2013-03-25 01:28:13 -07:00
Rohan Kuruvilla 6b428aa3eb Updating CocosPlayer to latest version. Includes following changes: 
1. Adding support for changing orientation
2. Updating communication protocol to latest CocosPlayer protocol. Including UUID and filelist messages
3. Fixing unzipping of ccb files to maintain proper directory structure
 2013-03-25 01:24:24 -07:00
James Chen c9cdb81020 Removing unused codes. 2013-03-25 14:30:25 +08:00
James Chen f7b2ca2125 Fixing compilation errors when enable CC_ENABLE_PROFILERS. 2013-03-25 11:47:27 +08:00
billy1380 fc806d0496 added sample game xcode project for mac 2013-03-23 17:21:26 +00:00
billy1380 cdfe693583 - changed cocos2d mac project to support universal build and x86 
- fixed issues associated with that
 2013-03-23 16:04:51 +00:00
James Chen 54bd3c1925 Updating JSTest. 2013-03-22 15:11:56 +08:00