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

107 Commits

Author SHA1 Message Date
minggo 61e87f661b issue #888: fix some typo error 2011-12-23 11:12:06 +08:00
minggo e287e74a6e fix a typo error 2011-12-23 10:43:39 +08:00
minggo b7fbd4fc13 issue #919: supporting global variable 2011-12-20 16:50:39 +08:00
minggo 857ce1d505 fixed #921: fix a bug that accelerometer axes inverted in android tablet 2011-12-19 16:29:26 +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
minggo a3986a9e21 issue 892: add cpp flag to support rtti on android 2011-12-07 16:51:54 +08:00
minggo cddaa3fea2 fixed #885: make SimpleAudioEngine::setEffectVolume() take effect immediately on android 2011-12-01 12:12:14 +08:00
minggo bd595516b8 issue #781: add new functions for sound 2011-11-25 09:56:06 +08:00
minggo 6aedc258b4 fixed #838: tests and HelloLua support x86 2011-11-23 15:51:30 +08:00
minggo a7d6c90adb Merge pull request #571 from jbyu/master 
fix memory-leak for lua engine
 2011-11-17 18:53:14 -08:00
minggo 775c7ff847 Merge pull request #573 from minggo/iss854_pthread 
support pthread
 2011-11-17 18:40:30 -08:00
minggo 522386a6b7 issue #854: pthread work ok on iOS 2011-11-18 09:55:47 +08:00
minggo dd8a2deeaf fixed #758: fix the bug that TTF fonts cause low memory on android 2011-11-16 11:40:24 +08:00
Phenix Yu 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 2011-11-15 14:43:55 +08:00
Phenix Yu 441f8e6da9 Merge branch 'master' of https://github.com/jbyu/cocos2d-x 
Conflicts:
	cocos2dx/CCScheduler.cpp
	lua/cocos2dx_support/LuaEngine.cpp
	lua/cocos2dx_support/LuaEngine.h
 2011-11-15 14:00:52 +08:00
Walzer e3c39fe835 fixed #753, visual orientation is wrong on ios5 simulator 2011-10-19 21:43:25 +08:00
minggo 2490388f28 remove unneeded packages 2011-10-19 20:03:18 +08:00
minggo 68d03de677 fixed #743: let nativeInit() get correct screensize when running on device with software android buttons 2011-10-19 19:55:23 +08:00
minggo 2d3bfd4a1a fixed #755: get x y coordinate from existing array to avoid crashing on sunsumg devices 2011-10-19 17:01:35 +08:00
minggo 464fd19e59 avoid memory leak for lua and invoke unscheduleScriptFunc 2011-09-28 17:27:43 +08:00
minggo 8c63344c16 merge cocos2d-x master 2011-09-28 15:32:30 +08:00
minggo 3912be7f9d not get value of ok button from xml file 2011-09-28 15:27:31 +08:00
minggo 6e08502e9d fixed #736: remove android:installLocation in AndroidManifest.xml 2011-09-27 16:56:45 +08:00
minggo 5ff9bd0c9e remame BitMapTotalHeight to bitmapTotalHeight 2011-09-19 18:15:47 +08:00
seanlin 6d8225b7bd fixed #724, different results of CCLabelTTF on android & win32 2011-09-19 16:47:39 +08:00
minggo ae403153c7 fixed #719: update java code to HelloLua & tests 2011-09-15 16:18:50 +08:00
minggo a70995c220 fixed #717: add R.java of HelloLua 2011-09-15 14:23:18 +08:00
minggo 194f47bc54 fixed #718: get button value from string.xml & add copyright for java codes 2011-09-15 14:17:07 +08:00
Macarse 208bce312e Replaced LinearLayout with FrameLayout 2011-09-13 20:25:07 -03:00
Macarse afd1a7a6d9 External storage 2011-09-13 05:42:34 -03:00
minggo a739dcbd6c fixed #707: add Cocos2dxLuaLoader.cpp & Cocos2dxLuaLoader.h into vs2010 project 2011-09-05 18:11:10 +08:00
minggo edb86b1154 issue #707: require works ok on iOS 2011-09-05 17:42:08 +08:00
minggo d6cc12ffe4 issue #707: require works ok on android 2011-09-05 17:13:52 +08:00
minggo ae21fcaf48 [android] fixed #670: pause & resume effect when app enter background & foreground 2011-08-22 16:58:54 +08:00
minggo 24340826e1 fix compile error of release version of HelloLua 2011-08-18 20:14:43 +08:00
Phenix Yu ed42bc388c fixed lua memory leak 2011-08-18 12:26:33 +08:00
Walzer ac94c31077 Merge pull request #473 from minggo/master 
Do some fixes for win32
 2011-08-17 04:01:38 -07:00
minggo ab781654d7 all tests works ok on vs2010 & fix a bug that HelloLua may crashed on win32 when it eixt 2011-08-17 18:24:36 +08:00
Walzer a8835649fe preload sound effect in HelloLua 2011-08-17 17:08:06 +08:00
Walzer 375faa09e6 add archs i386 to HelloLua.xcodeproj, and don't playEffect repeatly in hello.lua (so noisy...) 2011-08-17 11:23:50 +08:00
sunzhuoshi 82c5c0f9c8 Fixed "HelloLua" makefile on Android 2011-08-17 01:06:22 +08:00
sunzhuoshi 60eb5b7cb4 Fixed "HelloLua" project file(s) on win32 2011-08-17 00:39:10 +08:00
sunzhuoshi 9a9cb02405 Added CocsDenshion lua support and tested with HelloLua on iOS 
The test music and sound effect come from "tests" project
 2011-08-16 23:56:41 +08:00
minggo 9c67c5a71e make HelloLua work ok on win32 release 2011-08-16 11:21:57 +08:00
minggo c6cb8f4980 make HelloLua work ok on win32 2011-08-15 16:23:23 +08:00
Walzer bfcf75553e add FontLabel to HelloLua.xcodeproj 2011-08-13 11:31:11 +08:00
Walzer b326b85808 HelloLua compile succeed in xcode4 2011-08-12 22:42:58 +08:00
minggo d386116255 [iOS]fixed #667: call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground 2011-08-10 10:24:06 +08:00
minggo ada4c2af80 [android] fixed #643: swap axes according to the orientation 2011-08-09 15:50:42 +08:00
minggo 76da5f2e84 fixed #656: remove unneeded methods & android can let user set resource path 2011-08-04 17:19:58 +08:00