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

3824 Commits

Author SHA1 Message Date
minggo a4e694e5fb Merge pull request #625 from Bahamut/patch-1 
fixed #506: Added the "" delimiters so it will work with long filename paths with spaces
 2011-12-18 23:03:55 -08:00
minggo 0f5dd0dbb1 fixed #884: make classOfCocos2dxActivity as a global reference 2011-12-19 15:00:51 +08:00
Bahamut dc687ac8b4 Added the "" to the calls so it can accept paths with spaces under windows (android default installation path is of this kind, so under windows it wont work if you dont modify this files) 2011-12-19 06:50:20 +01:00
YuLei Liao 668c59ebbd Merge branch 'luafix-0.10.0' 2011-12-17 12:02:43 +08:00
YuLei Liao 318a4c5ba8 merge upstream/master to master 2011-12-17 12:02:24 +08:00
YuLei Liao c7553b90b5 * improve tolua_stack_dump() 2011-12-17 11:18:33 +08:00
Walzer fa3bbac3c7 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-12-16 15:51:50 +08:00
Walzer ff883f1cdf Remove HelloWorld/iphone/HelloWorld.xcodeproj, it's merged from bada branch. The correct one is ios/HelloWorld.xcodeproj. 2011-12-16 15:50:58 +08:00
dumganhar 2f63d6a158 Merge pull request #624 from dumganhar/issue#918 
fixed #918: modify filter of airplay to marmalade.
 2011-12-15 19:11:49 -08:00
dumganhar af221f8710 fixed #918: modify filter of airplay to marmalade. 2011-12-16 11:08:37 +08:00
minggo ffe8890498 Merge pull request #621 from minggo/iss892_RTTI 
issue #892: use RTTI instead of selectorRetain() and selectorRelease()
 2011-12-15 18:52:46 -08:00
dumganhar 3136aca5fc Merge pull request #623 from dumganhar/pullrequest#611 
Process Pullrequest#611
 2011-12-14 21:07:19 -08:00
dumganhar 8298e0b6ff Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 
Conflicts:
	tests/test.marmalade/test.mkb
 2011-12-15 13:03:07 +08:00
dumganhar a64b81f97b Merge pull request #622 from dumganhar/pullrequest#619 
Fixed some issue on blackberry port
 2011-12-14 19:42:08 -08:00
dumganhar f3b7b519fc Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pullrequest#619 2011-12-15 11:38:15 +08:00
dumganhar 265558d9c7 Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619 2011-12-15 11:36:42 +08:00
minggo 15fca8b4b4 issue #892: use RTTI instead of selectorRetain() and selectorRelease() 2011-12-15 10:26:31 +08:00
minggo 8813d94257 Merge pull request #617 from minggo/issue906 
remove unneeded code in CCImage_android.cpp
 2011-12-14 18:08:24 -08:00
Didiet Noor 0f8da500c2 Restored Accidentally removed marmalade line from CocosDenshion Test 2011-12-15 02:05:25 +08:00
Didiet Noor 00e504356a Fixing Warning on CLang 3.0 on XCode 4.2 2011-12-15 01:46:55 +08:00
Didiet Noor 8c69c70fc3 Fixed Path Issues on QNX, CocosDenshion Test back to original 2011-12-15 00:31:17 +08:00
Didiet Noor 54eb8e01f1 Merge branch 'guava' into dev 2011-12-14 21:27:31 +08:00
Didiet Noor f5d41d21b2 Added CDT Project and Modifying CocosDenshion for QNX 2011-12-14 21:26:47 +08:00
Didiet Noor bc7ff13d48 Merge branch 'guava' into dev 2011-12-14 16:58:43 +08:00
Didiet Noor 7f7ef29b21 Fixes on QNX project accidentally including marmalade 2011-12-14 16:50:26 +08:00
Didiet Noor 73cb063b2a Modified gitignore to exclude device debug and device release on Blackberry Playbook 2011-12-14 16:27:59 +08:00
Didiet Noor 426bfdbdca Removing static Resource Path on CocosDenshion for qnx 2011-12-14 16:23:18 +08:00
Walzer 7d01aa0c74 HelloWorld, Test and HelloLua can succefully compiled by xcodebuild commenline with -sdk iphonesimulator4.3 now. The key is GCC_VERSION="", you can not skip this null value, otherwise the commendline will use GCC4.2 as default, can generate tons of errors. 2011-12-13 22:25:51 +08:00
Walzer 6d17d711b5 fix a bug that xcodebuild -sdk iphone4.3simulator -configuration Debug cannot build successfully. The tiny error is that we use GCC4.2 in debug build. 2011-12-13 18:03:27 +08:00
dumganhar 5dc96704e9 Merge pull request #618 from dumganhar/issue908_marmalade 
merged marmalade port to latest Cocos2d-x source
 2011-12-12 18:32:18 -08:00
dumganhar 0a9e922e8f #fixed 908: Merge marmalade to latest cocos2d-x source 
add blackberry author.
 2011-12-13 10:09:06 +08:00
dumganhar c80002a1b0 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into marmalade 2011-12-13 10:03:10 +08:00
dumganhar 625d299717 Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade 2011-12-13 10:01:29 +08:00
gzito d4ea6d4ef5 Rollback changes about CCDirector::sharedInstance as pointer 
Optimized a little bit CCImage::initWithString
Fixed CCApplication::run in order to handle closing Marmalade simulator
 2011-12-12 14:50:35 +01:00
dumganhar e7a653b71d delete helloworld project on airplay platform 2011-12-12 19:05:57 +08:00
dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source 
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade

Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/support/zip_support/ioapi.cpp
 2011-12-12 17:46:21 +08:00
minggo ba462e99a6 fixed #906: remove unneeded code in CCImage_android.cpp 2011-12-12 17:02:21 +08:00
minggo aea75de4cf Merge pull request #616 from dumganhar/blackberry 
add Blackberry port, support Playbook Tablet
 2011-12-12 00:58:11 -08:00
dumganhar baf3755142 remove some '__QNX__' macros 2011-12-12 16:14:12 +08:00
dumganhar dea2713f51 fixed #907: add blackberry port 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry

Conflicts:
	cocos2dx/platform/CCSAXParser.h
 2011-12-12 11:49:49 +08:00
minggo 95b43ac563 Merge pull request #614 from minggo/issue892_RTTI 
Use RTTI to simplify codes
 2011-12-11 19:40:34 -08:00
minggo 8c5c3300aa Merge pull request #612 from dumganhar/issue904 
Issue904
 2011-12-11 19:33:07 -08:00
styck b1cdb6543d Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language 
Added tests for Marmalade and enabled language and font testing
 2011-12-11 17:18:01 -08:00
gzito cc2ad0c514 Added marmalade support, removed airplay 2011-12-11 10:24:38 +01:00
gzito 47e108a8c5 Added marmalade support, removed airplay 2011-12-11 10:19:41 +01:00
styck f3b662a5a8 marmalade updates 2011-12-10 22:29:39 -08:00
styck dc6476ebe0 marmalade updates 2011-12-10 21:54:07 -08:00
styck 9fc2061c6b mamarlade updates 2011-12-10 21:20:15 -08:00
styck bcf63d0e96 Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
gzito 2be5240a5d Fixed CCFileUtils::getWriteblePath on Marmalade 2011-12-10 16:34:54 +01:00