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

2323 Commits

Author SHA1 Message Date
minggo 08b25229ac Merge pull request #453 from minggo/iss622 
fixed #622: add comment of CCUserDefault
 2011-08-04 20:08:16 -07:00
minggo dd43f16c8e fixed #622: add comment of CCUserDefault 2011-08-05 11:02:42 +08:00
minggo 679dda8ec3 use uname -s to invoid warning on mac os 2011-08-05 10:07:14 +08:00
minggo 0551e86d80 Merge https://github.com/clawoo/cocos2d-x 2011-08-05 10:05:20 +08:00
clawoo c4bac4c136 Uncomment the path definitions 2011-08-04 17:17:11 +03:00
Walzer 70c5a1db28 Merge remote branch 'origin/master' 2011-08-04 21:58:08 +08:00
Walzer f7a3dc2150 fixed #658, rename _PROJECTNAMEASIDENTIFIER__AppDelegate.cpp/.h in xcode3 tempaltes to AppDelegate.cpp/.h, keep consistency to xcode4/android templates. 2011-08-04 21:57:48 +08:00
clawoo 7481d3ac4a Make build_native.sh executable when creating a new project 2011-08-04 14:23:12 +03:00
clawoo 9c415f15d4 Change the uname -o param to -s to prevent warnings on OSX 2011-08-04 14:22:05 +03:00
minggo 016c463659 Merge pull request #449 from flyingpacer/savecrash 
fixed #657 Latest git version was broken
 2011-08-04 02:39:33 -07:00
minggo 4d1a1629de Merge pull request #450 from minggo/iss656 
fixed #656
 2011-08-04 02:26:23 -07:00
minggo 76da5f2e84 fixed #656: remove unneeded methods & android can let user set resource path 2011-08-04 17:19:58 +08:00
RongHong 4745b85af9 fixed #657 Latest git version was broken 2011-08-04 16:37:43 +08:00
minggo eaca1d4a71 Merge pull request #448 from liswei/issue347 
issue #347 lost [] in 'delete array'
 2011-08-03 22:54:39 -07:00
liswei bbc4bbeb6c issue #347 lost [] in 'delete array' 2011-08-04 13:47:21 +08:00
minggo ee0c6e56d7 Merge pull request #447 from minggo/master 
[android] fixed #655: fix a bug that CCLabelTTF lost the last characters
 2011-08-03 21:13:12 -07:00
minggo 7fc0dae3d9 [android] fixed #655: fix a bug that CCLabelTTF lost the last characters 2011-08-04 12:08:12 +08:00
minggo 191a17d546 Merge pull request #446 from liswei/issue347 
Issue347  Support custom TTF fonts
 2011-08-03 20:29:09 -07:00
liswei 897dd54b12 fixed #347 add ttf support in win32 2011-08-04 11:23:59 +08:00
minggo 525c67a857 Merge pull request #445 from minggo/master 
modify unneeded codes in hello.lua
 2011-08-03 19:40:51 -07:00
minggo fe6aa7ed13 modify unneeded codes in hello.lua 2011-08-04 10:36:50 +08:00
liswei 1d54c5a305 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue347 2011-08-04 10:03:01 +08:00
minggo 78ffea3049 Merge pull request #443 from natural-law/master 
fixed #513
 2011-08-02 23:35:35 -07:00
minggo 66cfbf84c6 Merge pull request #444 from minggo/iss653 
fixed #653: add CCScheduler::unscheduleScriptFunc()
 2011-08-02 23:33:32 -07:00
minggo 6892787afa fixed #653: add CCScheduler::unscheduleScriptFunc() 2011-08-03 14:15:35 +08:00
natural-law 3a80e51d25 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-08-03 11:39:03 +08:00
natural-law 94f2d8a5e2 fixed #513, CCProgressTimer support sprite generated from CCSpriteFrame. 2011-08-03 11:38:38 +08:00
minggo 6f33190f3b Merge pull request #442 from minggo/iss652 
[android] fixed #652: refactor JniHelper::jstringtochar()
 2011-08-02 19:49:39 -07:00
minggo 78642a39ac [android] fixed #652: refactor JniHelper::jstringtochar() 2011-08-03 10:44:39 +08:00
RongHong 66cd2be65f Merge branch 'master' into savecrash 2011-08-03 09:38:49 +08:00
minggo b9374663cd Merge pull request #440 from flyingpacer/savecrash 
fixed #649 the user could save any domain of the render texture
 2011-08-02 03:16:20 -07:00
minggo 90f403d8a2 Merge pull request #441 from liswei/issue347 
issue #347 add ttf support in wophone
 2011-08-02 03:16:06 -07:00
liswei 79cf8167dc Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue347 2011-08-02 18:04:23 +08:00
liswei 188b168d30 issue #347 add ttf support in wophone 2011-08-02 18:02:27 +08:00
RongHong 584bde9ef1 Merge branch 'master' into savecrash 2011-08-02 17:31:19 +08:00
RongHong 4a8e3f468e fixed #649 the user could save any domain of the render texture 2011-08-02 17:22:57 +08:00
minggo a8abeb5550 Merge pull request #439 from minggo/iss645 
update to v1.0.1
 2011-08-02 01:32:49 -07:00
minggo 792204e908 fixed #645: update pkg file to v1.0.1 2011-08-02 16:21:23 +08:00
minggo 906e6ba519 issue #645: fix a bug of animation test 2011-08-02 15:57:04 +08:00
minggo 09dc164fff issue #645: update to v1.0.1 2011-08-02 15:45:27 +08:00
RongHong 3a3a52c59a fixed #649 the user could save any domain of the render texture 2011-08-02 14:25:58 +08:00
minggo 730ff63c9f rename scene to node 2011-08-02 14:09:23 +08:00
minggo c4d1dedba8 Merge https://github.com/reflog/cocos2d-x into reflog 2011-08-02 14:03:34 +08:00
minggo 9fe868b881 Merge pull request #438 from natural-law/master 
Use the setter to set the value of m_tAnchorPoint.
 2011-08-01 21:39:43 -07:00
minggo 2b4cbff351 Merge pull request #437 from flyingpacer/savecrash 
fixed #648 savebuffer may crash on some machines like Motorola Defy
 2011-08-01 21:39:02 -07:00
natural-law 9a86582cd2 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-08-02 11:06:47 +08:00
natural-law d6221cfa36 Use the setter to set the value of m_tAnchorPoint. 2011-08-02 11:02:02 +08:00
RongHong d575d40ab3 fixed #648 savebuffer may crash on some machines like Motorola Defy 2011-08-02 10:27:52 +08:00
RongHong 335d2d30b4 fixed #648 savebuffer may crash on some machines like Motorola Defy 2011-08-02 10:05:15 +08:00
minggo 6715ee03d7 Merge pull request #436 from minggo/iss347 
Iss347
 2011-08-01 03:29:24 -07:00