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

2667 Commits

Author SHA1 Message Date
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
Walzer 20db7b0fa2 Merge pull request #470 from walzer/master 
add support for pvr ccz format
 2011-08-15 23:00:06 -07:00
Walzer c0fdb2b794 Merge pull request #469 from minggo/master 
make HelloLua work ok on win32 release
 2011-08-15 20:56:50 -07:00
Walzer 3afe6ebfb2 fixed #638, add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work. 2011-08-16 11:56:17 +08:00
Walzer 7e4f44e9ff Merge commit '507de610ebffa759fabf4054ab1b02d934c51834' 2011-08-16 11:45:28 +08:00
minggo 9c67c5a71e make HelloLua work ok on win32 release 2011-08-16 11:21:57 +08:00
Walzer 507de610eb Merge pull request #467 from minggo/master 
make HelloLua work ok on win32
 2011-08-15 01:41:13 -07:00
minggo c6cb8f4980 make HelloLua work ok on win32 2011-08-15 16:23:23 +08:00
Walzer 0881668cc2 fixed #661. Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well 2011-08-15 12:10:11 +08:00
minggo 3b1ecfd3ff Merge pull request #465 from GMTDev/patch-1 
Fixed problems with iPhone Retina mode TMX Tiled map support. Uses "Conte
 2011-08-14 18:23:44 -07:00
Walzer 82dc0d02aa Merge commit 'bfcf75553e618f7604d97936a99376519a9da6f4' 2011-08-14 09:39:56 +08:00
Walzer bfcf75553e add FontLabel to HelloLua.xcodeproj 2011-08-13 11:31:11 +08:00
Walzer 59cef8a474 Merge pull request #466 from walzer/master 
Remove deprecated methods, HelloLua compilation succeed now.
 2011-08-12 19:54:45 -07:00
Walzer b326b85808 HelloLua compile succeed in xcode4 2011-08-12 22:42:58 +08:00
GavT f47df23363 Fixed problems with iPhone Retina mode TMX Tiled map support. Uses "ContentScaleFactor" to divide down some Rect coordinates and changed some "setPositionInPixels" to "setPosition" too. See bug #661 http://www.cocos2d-x.org/issues/661 
Also added "float m_fContentScaleFactor" in the class CCTMXLayer.h
 2011-08-11 20:47:54 -07:00
Walzer bb1202251e Merge commit '4aa33b094239d8f04758e8c6f42f94ab19b13226' 2011-08-11 15:30:28 +08:00
Walzer 4aa33b0942 Merge pull request #463 from minggo/master 
fixed #668
 2011-08-10 19:32:44 -07:00
Walzer 6d3941ebc1 Merge pull request #464 from leon-li/master 
fix some warnings under xcode 4.0 llvm clang
 2011-08-10 19:32:16 -07:00
Leon 771e2349c5 fix some warnings under xcode 4.0 llvm compiler 2011-08-10 22:39:02 +08:00
minggo e912bd4304 Merge pull request #462 from walzer/RootViewController4xcode3templates 
issue #540, add RootViewController into xcode3 templates; rename _XXX_Pre
 2011-08-10 00:14:14 -07:00
minggo 9a884ffda6 [iOS] fixed #668: CCLabelBMFont looks ok in retina mode 2011-08-10 15:07:34 +08:00
Walzer 547905465b issue #540, add RootViewController into xcode3 templates; rename _XXX_Prefix.pch to Prefix.pch; remove MIT license in user code. 2011-08-10 14:45:13 +08:00
Walzer 1ed6a4422c Merge pull request #461 from walzer/master 
Bug #658, rename _XXX_AppController.* to AppController.*
 2011-08-09 21:00:17 -07:00
Walzer 46808db7fd issue #658, rename _PROJECTNAMEASIDENTIFIER__AppController.* to AppController.* in xcode3 template. Left cases: untested in xcode3; have no RootViewController in xcode3 templates. 2011-08-10 11:35:44 +08:00
Walzer 709e93931a Merge from cocos2d/cocos2d-x commit '7fab63f9b63f275535f0a0b68cd29bc593e5218c' 2011-08-10 11:18:20 +08:00
minggo 7fab63f9b6 Merge pull request #460 from minggo/iss667 
[iOS]fixed #667
 2011-08-09 19:29:44 -07: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 5e5151b41e Merge pull request #459 from minggo/iss643 
[android] swap axes according to the orientation
 2011-08-09 00:55:34 -07:00
minggo ada4c2af80 [android] fixed #643: swap axes according to the orientation 2011-08-09 15:50:42 +08:00
minggo 08797014e9 fix a bug that cause error when loading libtest.so on android 2011-08-09 13:56:09 +08:00
Walzer 6eba0b658f fixed #651, add CCFileUtils to doxygen api document 2011-08-08 23:05:47 +08:00
Walzer 945e5fde00 issue #633, add test case for play effect repeatly, force the volume of effect&bgm between 0.0~1.0 in SimpleAudioEngine.mm. 2011-08-08 21:40:33 +08:00
minggo bde465e902 Merge pull request #458 from minggo/iss665 
fixed #665: add test of RenderTextureSave
 2011-08-07 23:13:38 -07:00
minggo 2b5635898a fixed #665: add test of RenderTextureSave 2011-08-08 14:06:03 +08:00
minggo 7a0e8b4a0a Merge pull request #457 from minggo/iss642 
fixed #642: CCRenderTexture::saveBuffer() works ok on iOS
 2011-08-07 20:08:16 -07:00
minggo bca2efef50 Merge pull request #456 from liswei/issue347 
fixed #347 fixed 'AddFontResource' path error!
 2011-08-07 20:07:02 -07:00
minggo 41ea2e98a1 fixed #642: CCRenderTexture::saveBuffer() works ok on iOS 2011-08-08 11:01:47 +08:00
liswei 70e19d7245 fixed #347 fixed 'AddFontResource' path error! 2011-08-08 10:32:21 +08:00
Walzer 976d886263 Merge pull request #455 from giom/master 
Lua AddSearchPath issue #647
 2011-08-05 18:43:44 -07:00
minggo 2d5a04b9ca Merge pull request #454 from flyingpacer/608 
fixed #608 rendertexture disappears after going to background
 2011-08-04 23:55:26 -07:00
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
RongHong 5f08bb24fe Merge branch 'master' into 608 2011-08-05 10:59:40 +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