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

3429 Commits

Author SHA1 Message Date
minggo 37915cfed6 remove unneeded function, and make protocol an abstract class 2011-12-28 14:46:49 +08:00
gzito 28562c3fb9 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2011-12-27 16:14:19 +01:00
dumganhar 2d4e14ad26 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-12-27 10:22:00 +08:00
YuLei Liao bc52b0dd73 * fix CCAction class 2011-12-25 11:48:37 +08:00
YuLei Liao bbad5a4392 * merge upstream/master to master 2011-12-25 11:48:03 +08:00
dumganhar 2438dba1a8 Merge pull request #643 from dumganhar/issue#903 
Issue#903
 2011-12-23 04:37:24 -08:00
dumganhar a09bebb32b fixed #903: 1.pass 'id' parameter to setTouchInfo function; 
2.when double press happens, deal with it as single press.
 2011-12-23 20:33:42 +08:00
dumganhar 6a8400a350 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-12-23 19:41:25 +08:00
minggo 69bfc7ab48 Merge pull request #642 from minggo/iss919_script 
make script support global variable
 2011-12-23 00:03:04 -08:00
minggo beb57fc486 fixed #919: make script support global variable 2011-12-23 16:00:31 +08:00
minggo afa8e48783 fixed #919: linux template supports global variable 2011-12-23 14:45:41 +08:00
minggo c2761cc84f issue #919:make create project support global variable 2011-12-23 14:15:01 +08:00
minggo ae329f62ca Merge pull request #641 from minggo/iss888_linux_eclipse 
Iss888 linux eclipse
 2011-12-22 19:35:41 -08:00
minggo 4cd5ecc524 Merge pull request #640 from minggo/master 
fixed #892: update pkg and LuaCocos2d.cpp
 2011-12-22 19:32:04 -08:00
minggo d82471478d add run permition 2011-12-23 11:17:20 +08:00
minggo 48aa511116 Merge branch 'master' of https://github.com/minggo/cocos2d-x into iss888_linux_eclipse 2011-12-23 11:13:14 +08:00
minggo 61e87f661b issue #888: fix some typo error 2011-12-23 11:12:06 +08:00
minggo 333342afe2 fixed #892: update pkg and LuaCocos2d.cpp 2011-12-23 11:10:36 +08:00
minggo e287e74a6e fix a typo error 2011-12-23 10:43:39 +08:00
minggo edbbe25a98 issue #888: remove the setting for android building 2011-12-23 10:40:02 +08:00
minggo 3b15f02867 Merge pull request #639 from minggo/iss911 
make CCTextureCache::addUIImage() work ok when key is null
 2011-12-22 00:31:36 -08:00
minggo 12237cf288 fixed #911: add some comment 2011-12-22 16:29:25 +08:00
minggo 7422a424da fixed #911: make CCTextureCache::addUIImage() work ok when key is null 2011-12-22 16:26:56 +08:00
minggo 55f54b3425 Merge pull request #638 from minggo/iss923_addImageAsync 
fixed #923: init iamge type and refactor a little codes
 2011-12-21 23:40:17 -08:00
minggo a96285b617 fixed #923: init iamge type and refactor a little codes 2011-12-22 15:38:31 +08:00
minggo 52a46e01f1 Merge pull request #637 from minggo/iss924_cocosdenshion 
fixed 924: make cocosdenshion thread safe for preloading
 2011-12-21 23:07:41 -08:00
minggo 3a3dcf736b fixed 924: make cocosdenshion thread safe for preloading 2011-12-22 15:06:00 +08:00
minggo 9f02cfd2aa Merge pull request #636 from minggo/iss923_addImageAsync 
fixed #923: cache texture with correct image type
 2011-12-21 18:53:58 -08:00
minggo a0fe048f11 fixed #923: cache texture with correct image type 2011-12-22 10:48:54 +08:00
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