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
|
697368cf20
|
support lua
|
2011-05-31 14:04:14 +08:00 |
Walzer
|
58a63f7ec0
|
[airplay] following MaxAksenov's suggestion, I set HelloWorld & Tests to landscape as default. Users had to rotate the simulator in airplay's surface configuration.
|
2011-05-30 14:14:19 +08:00 |
Walzer
|
78f87f1207
|
Merge remote branch 'origin/master'
|
2011-05-26 10:29:43 +08:00 |
Walzer
|
03b1bb6c52
|
fix a typo in CCTextFieldTTF. add comment for in helloworld/AppDelegate.cpp
|
2011-05-26 10:08:05 +08:00 |
minggo
|
a5c294ed69
|
fixed #501: let UI rotate HelloWorld to landscape
|
2011-05-24 18:13:54 +08:00 |
minggo
|
073260e0a9
|
[android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0
|
2011-05-19 11:26:57 +08:00 |
yangws
|
e895d9d073
|
TextInputTest compile ok on android and merge last master code.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/platform/android/Cocos2dJni.cpp
tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
tests/test.ios/test.xcodeproj/project.pbxproj
tests/test.win32/test.win32.vcproj
|
2011-04-26 18:04:07 +08:00 |
natural-law
|
e2ce006db2
|
fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach.
|
2011-04-22 10:57:46 +08:00 |
yangws
|
12254f95f0
|
fixed #395 Add initInstance code for all platform in msvc templates.
|
2011-03-17 11:27:51 +08:00 |
natural-law
|
7c6147421b
|
[wophone]fixed #377,Replace the word "uphone" with "wophone".
|
2011-03-09 17:28:35 +08:00 |
minggo
|
b5a99f90df
|
issue #375: rename file names and object names
|
2011-03-07 17:11:57 +08:00 |
minggo
|
661bae2797
|
merge natural-law-iss370
|
2011-03-04 16:32:54 +08:00 |
natural-law
|
aef83b2660
|
[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.
|
2011-03-02 17:45:04 +08:00 |
minggo
|
4379a1c96f
|
Move ccxApplication to cocos2dx/platform on ios.
|
2011-03-02 17:05:22 +08:00 |
yangws
|
7bc7d32001
|
fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication
|
2011-03-01 12:41:57 +08:00 |
natural-law
|
4362a5f381
|
[uphone]issue #316,Resolution auto adjustment.
|
2011-02-19 17:44:43 +08:00 |
natural-law
|
60e9ae873c
|
Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316
Conflicts:
HelloWorld/AppDelegate.cpp
tests/AppDelegate.cpp
|
2011-02-19 10:19:14 +08:00 |
yangws
|
85b9c9ae21
|
Retina display support and scale with keep w/h rate ok on win32.
|
2011-02-18 18:30:22 +08:00 |
natural-law
|
8035fc366c
|
[uphone]Support read image file from zip file.
|
2011-02-17 16:16:50 +08:00 |
natural-law
|
e4063fd190
|
[uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device.
|
2011-02-17 14:31:52 +08:00 |
yangws
|
1a17f3ea55
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
cocos2dx/platform/win32/CCXApplication_win32.cpp
tests/test.win32/test.win32.vcproj
|
2011-01-22 17:52:06 +08:00 |
yangws
|
bc9bfdc30c
|
Move win32/CCXApplication to platform_support
|
2011-01-22 16:24:54 +08:00 |
yangws
|
333f0b5574
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
HelloWorld/AppDelegate.cpp
cocos2dx/particle_nodes/CCParticleSystem.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
tests/AppDelegate.cpp
|
2011-01-20 11:18:35 +08:00 |
yangws
|
ee50078b3e
|
implement FPS limitation on UPhone.
|
2011-01-20 10:49:30 +08:00 |
walzer
|
9347fadc71
|
[win32] fixed #322, FPS control on win32
|
2011-01-19 18:23:42 +08:00 |
yangws
|
804dc4ef7c
|
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/win32/CCXBitmapDC.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
|
2011-01-19 15:29:08 +08:00 |
yangws
|
79b711a758
|
move CCXBitmapDC from cocos2d/platform to platform_support.
|
2011-01-19 14:23:26 +08:00 |
natural-law
|
f992838f96
|
[uphone]fixed #293,Modify the absolute path method in CCFileUtils.
|
2011-01-18 18:21:06 +08:00 |
natural-law
|
acff950860
|
[uphone]fixed #315,remove the way which use resource in ResourceMap.
|
2011-01-14 17:42:37 +08:00 |
Walzer
|
e058e07d48
|
fix compile err & warnings at HelloWorld.iphone
|
2010-12-21 07:41:23 +08:00 |
minggo
|
ddaa654333
|
fixed #260
|
2010-12-18 18:23:31 +08:00 |
yangws
|
96115bc26e
|
fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device.
fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build.
Signed-off-by: yangws <yangws@cocos2d-x.org>
|
2010-12-03 15:27:55 +08:00 |
Walzer
|
b4152fa700
|
fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android
|
2010-11-27 18:25:31 +08:00 |