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

3450 Commits

Author SHA1 Message Date
minggo db1ead3cd4 Merge pull request #635 from minggo/iss903_touch 
issue #903: fix a compiling error
 2011-12-21 17:57:19 -08:00
minggo 21f05c2d6f issue #903: fix a compiling error 2011-12-22 09:56:09 +08:00
minggo 0f7c8abfc1 Merge pull request #634 from minggo/iss919_script 
issue #919: supporting global variable
 2011-12-20 21:51:20 -08:00
minggo bb4b1d02bb Merge pull request #608 from GMTDev/patch-2 
issue #903: Update CCTouch to include the ID/PID of the touch
 2011-12-20 21:48:30 -08:00
GavT 36f8e43dd8 Update cocos2dx/include/CCTouch.h 2011-12-20 20:40:48 -08:00
gzito a39be9506f Defines documentation to avoid warning in Marmalade 2011-12-20 22:34:23 +01:00
gzito d37417f7da Re-added libXml2 2011-12-20 22:10:01 +01:00
gzito 4550e2cba7 Lowered memory requirement for HelloWorld 2011-12-20 22:07:09 +01:00
gzito 298f12e7a3 Removed libxml2 (precompiled version) 2011-12-20 22:05:01 +01:00
minggo b7fbd4fc13 issue #919: supporting global variable 2011-12-20 16:50:39 +08:00
minggo 257241c487 Merge pull request #633 from minggo/master 
fixed #922:
 2011-12-19 23:08:26 -08:00
minggo 01cf5793ad fixed #922: rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method 2011-12-20 14:59:15 +08:00
minggo 28d0737bf3 fixed #917: implement CCFileUtils::getFileDataFromZip() on iOS 2011-12-20 14:18:53 +08:00
minggo 5764b0edb3 Merge pull request #632 from minggo/iss893_memory_warning 
fixed #893: free cached data when receivint memory warning on iOS
 2011-12-19 19:44:55 -08:00
minggo 80e6c16913 fixed #893: free cached data when receivint memory warning on iOS 2011-12-20 11:35:50 +08:00
minggo 4149b6c624 Merge pull request #631 from minggo/iss915_msvc 
fixed #915: update codes generated by msvc template
 2011-12-19 19:09:27 -08:00
minggo 4caa719415 fixed #915: update codes generated by msvc template 2011-12-20 11:07:54 +08:00
dumganhar a8d5b6544a Merge pull request #629 from gzito/master 
Optimized ttf to bitmap, cached last loaded ttf & fixed ttf alpha. Other minor fixes. Added authors info.
 2011-12-19 18:46:07 -08:00
minggo a1de1a93ba Merge pull request #630 from minggo/iss920_export 
fixed #920: export functions in CCAffineTransform
 2011-12-19 18:42:30 -08:00
minggo faa8b59b6d fixed #920: export functions in CCAffineTransform 2011-12-20 10:39:10 +08:00
minggo 670d21df00 Merge pull request #628 from minggo/iss921_accelerometer 
fixed #921
 2011-12-19 17:58:41 -08:00
gzito 59bccb6bf8 Added last loaded font caching & minor fixes 2011-12-19 23:08:35 +01:00
gzito e3c5d6886e Added authors info 2011-12-19 22:57:04 +01:00
gzito e389ae5469 Optimized CCImage and fixed alpha value 2011-12-19 22:56:44 +01:00
minggo 857ce1d505 fixed #921: fix a bug that accelerometer axes inverted in android tablet 2011-12-19 16:29:26 +08:00
minggo a08ae8ef12 Merge pull request #627 from minggo/iss884_cocosdenshion 
fixed #884: make classOfCocos2dxActivity as a global reference
 2011-12-19 00:06:08 -08:00
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