4244fdb62b
fixed #643 , swap accelerometer input x/y according to the orientation (on ios devices)
2011-08-17 20:11:33 +08:00
ac94c31077
Merge pull request #473 from minggo/master
...
Do some fixes for win32
2011-08-17 04:01:38 -07:00
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
dbf3a94200
modified: HelloWorld/HelloWorldScene.cpp
...
modified: tests/AppDelegate.cpp
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-17 18:09:51 +08:00
a8835649fe
preload sound effect in HelloLua
2011-08-17 17:08:06 +08:00
d721f4d3c0
Merge pull request #472 from minggo/iss680
...
fixed #680
2011-08-17 01:06:39 -07:00
4532220ca8
fix xcode3 templates
...
1. remove setDeviceOrientation since we use RootViewController now
2. fix a typo in box2d template
3. modify _XXX_Prefix.pch to Prefix.pch in proj file
2011-08-17 16:02:56 +08:00
e39d551294
fixed #680 : fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed
2011-08-17 15:00:32 +08:00
4894f8c6ab
update xcode3 templates
2011-08-17 14:08:47 +08:00
3b97f4d73a
fix all xcode4 templates before version release.
...
1. modify version description in install-teampltes-xcode.sh
2. replace the deprecated methods in box2d/HelloWorldScene.cpp
3. fix the error usage in hello.lua
4. add effect & BGM in HelloLua
5. update baisc cocos2dx library file list
2011-08-17 12:13:13 +08:00
e338779fb8
update version string in doxygen config
2011-08-17 11:38:10 +08:00
5d20ebe24b
modified: HelloWorld/AppDelegate.cpp
...
modified: HelloWorld/HelloWorldScene.cpp
modified: cocos2dx/cocoa/CCNS.cpp
modified: cocos2dx/include/CCActionInstant.h
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
modified: cocos2dx/platform/CCAccelerometer_platform.h
modified: cocos2dx/platform/CCApplication_platform.h
modified: cocos2dx/platform/CCArchOptimalParticleSystem.h
modified: cocos2dx/platform/CCCommon.cpp
modified: cocos2dx/platform/CCEGLView_platform.h
modified: cocos2dx/platform/CCGL.cpp
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
modified: cocos2dx/platform/CCPlatformConfig.h
modified: cocos2dx/platform/CCPlatformMacros.h
modified: cocos2dx/platform/CCSAXParser.h
modified: cocos2dx/platform/CCStdC.h
modified: cocos2dx/support/CCUserDefault.cpp
modified: cocos2dx/support/data_support/ccCArray.h
modified: tests/AppDelegate.cpp
deleted: tests/Res/music.mid
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-17 11:36:54 +08:00
d73e8a5fd0
update authors, add zhuoshishun
2011-08-17 11:36:09 +08:00
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
286f92fc43
fix at smoke test, add arch=i386 into HelloWorld.xcodeproj, otherwise the proj cannot run in xcode4 + simulator
2011-08-17 11:09:12 +08:00
9eceb590d5
Merge pull request #471 from sunzhuoshi/master
...
fixed #679 : Added CocosDenshion lua support, tested with "HelloLua" on iOS, win32 and Android
2011-08-16 18:32:02 -07:00
82c5c0f9c8
Fixed "HelloLua" makefile on Android
2011-08-17 01:06:22 +08:00
60eb5b7cb4
Fixed "HelloLua" project file(s) on win32
2011-08-17 00:39:10 +08:00
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
20db7b0fa2
Merge pull request #470 from walzer/master
...
add support for pvr ccz format
2011-08-15 23:00:06 -07:00
c0fdb2b794
Merge pull request #469 from minggo/master
...
make HelloLua work ok on win32 release
2011-08-15 20:56:50 -07:00
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
7e4f44e9ff
Merge commit '507de610ebffa759fabf4054ab1b02d934c51834'
2011-08-16 11:45:28 +08:00
9c67c5a71e
make HelloLua work ok on win32 release
2011-08-16 11:21:57 +08:00
507de610eb
Merge pull request #467 from minggo/master
...
make HelloLua work ok on win32
2011-08-15 01:41:13 -07:00
c6cb8f4980
make HelloLua work ok on win32
2011-08-15 16:23:23 +08:00
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
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
2eafb827cf
avoid memory leaking from lua script module
2011-08-14 17:26:51 +08:00
82dc0d02aa
Merge commit 'bfcf75553e618f7604d97936a99376519a9da6f4'
2011-08-14 09:39:56 +08:00
bfcf75553e
add FontLabel to HelloLua.xcodeproj
2011-08-13 11:31:11 +08:00
59cef8a474
Merge pull request #466 from walzer/master
...
Remove deprecated methods, HelloLua compilation succeed now.
2011-08-12 19:54:45 -07:00
b326b85808
HelloLua compile succeed in xcode4
2011-08-12 22:42:58 +08:00
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
bb1202251e
Merge commit '4aa33b094239d8f04758e8c6f42f94ab19b13226'
2011-08-11 15:30:28 +08:00
4aa33b0942
Merge pull request #463 from minggo/master
...
fixed #668
2011-08-10 19:32:44 -07:00
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
771e2349c5
fix some warnings under xcode 4.0 llvm compiler
2011-08-10 22:39:02 +08:00
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
9a884ffda6
[iOS] fixed #668 : CCLabelBMFont looks ok in retina mode
2011-08-10 15:07:34 +08:00
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
1ed6a4422c
Merge pull request #461 from walzer/master
...
Bug #658 , rename _XXX_AppController.* to AppController.*
2011-08-09 21:00:17 -07:00
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
709e93931a
Merge from cocos2d/cocos2d-x commit '7fab63f9b63f275535f0a0b68cd29bc593e5218c'
2011-08-10 11:18:20 +08:00
7fab63f9b6
Merge pull request #460 from minggo/iss667
...
[iOS]fixed #667
2011-08-09 19:29:44 -07:00
d386116255
[iOS]fixed #667 : call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground
2011-08-10 10:24:06 +08:00
5e5151b41e
Merge pull request #459 from minggo/iss643
...
[android] swap axes according to the orientation
2011-08-09 00:55:34 -07:00
ada4c2af80
[android] fixed #643 : swap axes according to the orientation
2011-08-09 15:50:42 +08:00
08797014e9
fix a bug that cause error when loading libtest.so on android
2011-08-09 13:56:09 +08:00
6eba0b658f
fixed #651 , add CCFileUtils to doxygen api document
2011-08-08 23:05:47 +08:00
Walzer