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

97 Commits

Author SHA1 Message Date
mustime 6cc4eb8878 issue #1425: remove copying Resources files commands in VS10 2012-08-27 10:04:30 +08:00
mustime 1b70d8193f Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua 
Conflicts:
	samples/TestLua/proj.win32/TestLua.win32.vcxproj
 2012-08-27 10:00:00 +08:00
James Chen 1a5dd4fbb0 Updated vs2010 project configuration for TestLua. 2012-08-24 18:42:03 +08:00
James Chen 86d1d457a1 Added vs2008 project for TestLua. 2012-08-24 18:27:47 +08:00
minggo cb93713433 Merge pull request #1234 from minggo/gles20 
use absolute path in CCFileUtils
 2012-08-24 02:58:33 -07:00
minggo bcd691ad9f use absolute path in CCFileUtils 2012-08-24 17:55:29 +08:00
minggo cf1d61f3de Merge pull request #1232 from minggo/gles20 
fix compiling error of linux
 2012-08-24 01:09:37 -07:00
mingo ba4d75a60e issue #1445: fix compiling error of linux 2012-08-24 15:53:26 +08:00
James Chen 8e67592df2 Updated project configures of blackberry port. 2012-08-24 14:57:44 +08:00
James Chen 85304b9441 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua 2012-08-24 10:27:20 +08:00
mustime 4c7ad0d0d1 issue #1425: testlua project 2012-08-24 10:23:23 +08:00
mustime f55aedb5e9 issue #1425: add android proj on TestLua 2012-08-24 10:18:59 +08:00
mustime f67b513d08 issue #1425: add android proj on TestLua 2012-08-24 10:07:15 +08:00
James Chen 26a31b21b3 issue #1429: Removed mGLView variable in HelloCpp/HelloLua/TestJavascript class. 2012-08-24 00:24:04 +08:00
James Chen ee3e68014b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox 2012-08-24 00:16:11 +08:00
James Chen 1685e5c497 issue #1429: Used java code to implement keyboard layout. 2012-08-24 00:15:15 +08:00
minggo 83606d7691 Merge pull request #1212 from mustime/testlua 
Testlua
 2012-08-23 03:08:25 -07:00
minggo 37cb691600 fix some bugs while testing 2012-08-23 18:01:28 +08:00
mustime 36a99a099e issue #1425: add TestLua project 2012-08-23 16:10:50 +08:00
James Chen 06038163ca iss1429: Finished using Dialog to implement CCEditBox for android port. 
Next step:
	Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
 2012-08-23 15:34:57 +08:00
minggo d83cdbda09 fixed #1441: put hd and ipad resources into separate directory 2012-08-23 14:20:32 +08:00
James Chen a437099779 issue #1429: Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox. 2012-08-23 09:42:28 +08:00
James Chen 9553031196 fixed #1112: Lua support for blackberry port. 2012-08-22 18:48:57 +08:00
James Chen dbd02b2726 Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_lua 2012-08-22 18:28:11 +08:00
James Chen bcbd161398 issue #1429: First commit CCEditBox for android port. 2012-08-22 09:47:04 +08:00
Dale Ducharme d76d9a6451 Adding lua scripting to BlackBerry port. 2012-08-21 13:32:28 -04:00
James Chen fac3e9c8de issue #1437: fixed some compile errors. 2012-08-21 17:25:03 +08:00
James Chen 3eecc283d0 Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer 2012-08-21 16:57:41 +08:00
minggo ba2049d086 iss1438_android_template 2012-08-21 16:45:23 +08:00
minggo 07ddd43695 issue #1437:make CCApplication::sharedApplication() return pointer 2012-08-21 15:28:43 +08:00
minggo cfdc50fb60 issue #1437:make CCEGLView::sharedOpenGLView() return pointer 2012-08-21 14:58:31 +08:00
minggo e2140aea0b Merge pull request #1205 from minggo/gles20 
use CCSprite::createWithSpriteFrame() to create a sprite
 2012-08-20 02:29:34 -07:00
minggo c854562b03 use CCSprite::createWithSpriteFrame() to create a sprite 2012-08-20 17:28:17 +08:00
James Chen 0861877594 kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle. 2012-08-20 16:32:22 +08:00
James Chen 7eb5d85298 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb 2012-08-20 15:49:24 +08:00
James Chen 6c9b4d3357 fixed #1420: Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs. 2012-08-20 15:49:02 +08:00
minggo a8f2c74b9e change TARGET_OS_IPHONE to TARGET_OS_MAC in TestCpp mac project 2012-08-20 15:42:56 +08:00
Dale Ducharme 4004a8ac61 Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
James Chen f7fd4fc2bf issue #1429: Fixed a bug in EAGLView.mm. 2012-08-17 15:24:33 +08:00
James Chen d3338a70e5 issue #1429: Updated EditBoxTest and fix a bug about callback function. 2012-08-17 14:29:07 +08:00
James Chen ce9c744f21 fixed #1419: cocos2dx-test ~> TestCpp 2012-08-16 18:20:00 +08:00
James Chen 48fa8a4e88 fixed #1419: Update eclipse project configurations for linux port. 2012-08-16 18:09:01 +08:00
James Chen de2c00b7ae issue #1405: fixed some compile error on win32 and linux. 2012-08-16 11:30:25 +08:00
minggo bcf61cdf26 issue #1405:use enum to distinguish target 2012-08-16 10:21:15 +08:00
James Chen 0fce637ec7 issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest. 2012-08-15 14:33:56 +08:00
mustime 42208f93aa issue #1425: change the interfaces in .pkg files to satisfy the current 
version
 2012-08-10 18:14:04 +08:00
James Chen 03c2366821 Merge branch 'minggo_res' of https://github.com/dumganhar/cocos2d-x into gles20 2012-08-09 17:50:39 +08:00
James Chen 6e2cace72d Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res 2012-08-09 17:19:20 +08:00
James Chen a7ce8f2e21 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into minggo_res 2012-08-09 17:16:10 +08:00
James Chen 3ff21fe275 fixed #1424: http wrapper compiled ok on win32. 2012-08-09 17:04:55 +08:00