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

234 Commits

Author SHA1 Message Date
minggo 21737d2ce0 issue #347: update xcode3 template for ttf support 2011-07-29 10:27:49 +08:00
minggo cfb3765035 issue #347: iOS support font defined by ttf file 2011-07-29 10:15:10 +08:00
minggo 50038b7cc2 Merge https://github.com/cocos2d/cocos2d-x into iss347 2011-07-28 18:06:20 +08:00
minggo 648117ebb5 issue #347: android can use ttf file 2011-07-28 17:20:37 +08:00
natural-law a7404dc2bf fixed #639, Initialize the m_tPosition of CCParticleSystem with the setter. 2011-07-28 16:16:51 +08:00
minggo 1bb9e8139a issue 33: iOS & Android support looping playing effect 2011-07-26 15:52:41 +08:00
minggo b308effdc5 [android] fixed #631: Send \n to engine when user input nothing 2011-07-26 11:41:28 +08:00
minggo 13a1629299 fixed #624: insert white space in front of \n 2011-07-22 12:10:41 +08:00
minggo 640d811809 [android] fixed #618: invoke java code(System.exit()) to finish programe 2011-07-19 16:01:22 +08:00
minggo dd42936bb3 [android] fixed #610: remove the support of ndk-r4 2011-07-14 10:37:40 +08:00
minggo fb436a6339 [Android] break string & wrap word 2011-07-11 15:02:41 +08:00
Max Aksenov fd04420c9b [airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator.... 2011-07-09 13:04:29 -07:00
Walzer 80c819d8b6 Merge remote branch 'origin/master' 2011-07-04 16:25:29 +08:00
Walzer d325f1991e [ios] 1. debug builds can run on device (add “Valid Architectures") 2. add correct header search paths for HelloLua release build 2011-07-04 16:25:11 +08:00
natural-law 7d7f3a9241 fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
minggo 25b3b15151 Merge pull request #339 from minggo/iss549 
[Android] fixed #549: Add comments for playEffect()
 2011-06-30 18:28:08 -07:00
minggo 67b85322ed [Android] fixed #549: Add comments for playEffect() 2011-07-01 09:24:40 +08:00
minggo 12f816687d Merge pull request #336 from liswei/master 
update wophone setup project (such as helloworld,tests)
 2011-06-29 20:08:01 -07:00
liswei 39fb944297 update wophone setup project (such as helloworld,tests) 2011-06-30 09:36:51 +08:00
minggo 6c47f53b13 [Android] fixed #547: line wrap OK on Android 2011-06-29 15:45:30 +08:00
minggo e8853583df Merge pull request #329 from minggo/master 
Fix some bug
 2011-06-27 18:23:26 -07:00
yangws 3b6265aa58 Compile ok on vs2010 2011-06-27 17:02:58 +08:00
minggo 5e15545dbd [Android] fix an error when string is 2011-06-27 16:01:25 +08:00
natural-law 72f17ecbdf fixed #542, Record the volume user specified though the background music is not playing. 2011-06-27 11:43:27 +08:00
Walzer 688131c958 [android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests 2011-06-25 12:11:40 +08:00
Walzer 00568c229a [android] back to shared library link 2011-06-25 11:21:16 +08:00
minggo a02f7c75d9 [Android] modify android template to work on new codes 2011-06-24 17:24:01 +08:00
minggo e8fda66ccc Merge https://github.com/cocos2d/cocos2d-x 2011-06-24 13:55:52 +08:00
minggo 8440d6a267 [android] fixed #364: show string correct & line break ok 2011-06-24 13:55:00 +08:00
Walzer 8f770ec929 issue #540 for HelloWorld/ios, split main.m, add pause/resume/startAnimation/stopAnimation controls 2011-06-24 11:22:11 +08:00
minggo 10cdd7f798 [android] fixed #364: line break ok on Android 2011-06-23 14:44:20 +08:00
minggo 71c13b34bf Merge https://github.com/cocos2d/cocos2d-x into iss535 2011-06-22 17:00:11 +08:00
minggo 1122a7c7d0 [android] use Android widget Bitmap other than skia to drawstring 2011-06-22 16:58:50 +08:00
yangws 01f277674e Add icon for Helloworld and tests on Android. 2011-06-22 13:59:31 +08:00
yangws 4d8596169e Sync java code in Helloworld and tests. 2011-06-22 11:37:42 +08:00
minggo 4f7db6b134 fixed #528: modify HelloWorld to works ok 2011-06-22 10:18:51 +08:00
Walzer 175e9394bc Merge https://github.com/minggo/cocos2d-x into lua 2011-06-21 15:22:00 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
natural-law cfee246959 fixed #323, Add an interface to get the current language. 2011-06-17 10:49:02 +08:00
minggo 25de09e34b lua support ok on win32 2011-06-15 15:50:16 +08:00
minggo 732f64901c HelloWorld remove lua support on Android 2011-06-15 14:31:51 +08:00
minggo f7f6371666 HelloWorld remove lua support on iOS 2011-06-15 14:28:57 +08:00
minggo 92b22c7ad0 HelloWorld remove support on win32 2011-06-15 14:04:26 +08:00
minggo 49f1518893 fix a bug when compile in android 2011-06-14 15:43:45 +08:00
minggo a7a22e528b remove the usage of NDController 2011-06-14 14:46:39 +08:00
minggo 83e1e0ebd1 tests run ok when it don't enable lua 2011-06-01 20:29:05 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo dedbd638d3 lua runs ok on Android 2011-06-01 14:35:28 +08:00
minggo 5f5dc0a04b HelloWorld with lua works ok on ios 2011-05-31 15:39:54 +08:00
minggo 0d27381cdd format the file 2011-05-31 14:49:05 +08:00