minggo
|
d48da20b0f
|
synchrolize to master
|
2011-11-18 18:53:53 +08:00 |
U-zhangxm-PC\zhangxm
|
d84b6c25be
|
issue #223: merge bada branch and fix some error
|
2011-11-18 18:45:05 +08:00 |
minggo
|
50a2e2d5e9
|
Merge pull request #574 from minggo/iss854_pthread
remove unneeded files
|
2011-11-17 18:59:03 -08:00 |
minggo
|
5d8043ce7e
|
issue854: remove unneeded files
|
2011-11-18 10:54:36 +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
|
522386a6b7
|
issue #854: pthread work ok on iOS
|
2011-11-18 09:55:47 +08:00 |
minggo
|
cc79e533a3
|
issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync()
|
2011-11-16 11:04:29 +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 |
minggo
|
5273819e83
|
offer a thread safe function to read contents of xml file, and the engine use it internal
|
2011-11-15 10:41:18 +08:00 |
dumganhar
|
0fa48e2cfb
|
Update cocos2dx/platform/CCPlatformMacros.h
|
2011-11-14 11:35:04 +08:00 |
dumganhar
|
7cb27a76ae
|
modify accelerometer and Platform Functions
|
2011-11-13 22:45:41 +08:00 |
dumganhar
|
d8de253542
|
add messagebox support
|
2011-11-13 01:13:25 +08:00 |
dumganhar
|
5704fdc146
|
Merge branch 'testMP_static_lib' into newest
|
2011-11-13 01:05:22 +08:00 |
dumganhar
|
ea3b57ea2c
|
modify multi touch support
|
2011-11-13 00:54:44 +08:00 |
dumganhar
|
8fd2917888
|
fixed a bug that Accelerometer value error if use HVGA resource in WVGA device
|
2011-11-13 00:54:05 +08:00 |
dumganhar
|
2abe0c0d32
|
CCAssert will show system messagebox, this easy for debuging code.
|
2011-11-10 16:49:05 +08:00 |
dumganhar
|
ca3b91855a
|
debug issue #852
|
2011-11-10 16:44:58 +08:00 |
dumganhar
|
920b41271d
|
add TextInput support
|
2011-11-08 15:59:04 +08:00 |
dumganhar
|
0d6ea61b76
|
fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof
|
2011-11-07 18:18:10 +08:00 |
dumganhar
|
7d2a26ec10
|
comment some applog
|
2011-11-07 00:28:09 +08:00 |
dumganhar
|
16fba505b6
|
add multitouch support
|
2011-11-05 11:36:27 +08:00 |
dumganhar
|
2998726364
|
revert language
|
2011-11-02 01:23:07 +08:00 |
dumganhar
|
240aa4c077
|
add russian language support
|
2011-11-01 23:32:26 +08:00 |
dumganhar
|
cf3cecc108
|
revert to normal version
|
2011-11-01 23:02:26 +08:00 |
dumganhar
|
cff6437b76
|
revert to normal ccLanguageType
|
2011-11-01 17:12:39 +08:00 |
dumganhar
|
f43530c010
|
Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada
Conflicts:
CocosDenshion/proj.bada/sdk1.0/.cproject
CocosDenshion/proj.bada/sdk2.0/.cproject
cocos2dx/platform/bada/CCApplication_bada.cpp
|
2011-10-31 09:34:40 +08:00 |
dumganhar
|
853126036d
|
add ogg source for cocosDenshion project
|
2011-10-29 15:38:15 +08:00 |
dumganhar
|
fd90641c49
|
merge testf branch
|
2011-10-29 14:47:13 +08:00 |
Leon
|
b7f0385a2b
|
bundle 64 bit linux static libs
|
2011-10-28 12:19:26 +08:00 |
Leon
|
1b42b1d801
|
Merge remote branch 'upstream/master'
|
2011-10-28 11:37:02 +08:00 |
dumganhar
|
d061e8323d
|
modify project configure
|
2011-10-27 19:22:14 +08:00 |
dumganhar
|
5db8a24389
|
fixed one issue in cocosdenshion
|
2011-10-26 18:38:27 +08:00 |
dumganhar
|
dd73456576
|
Merge branch 'bada' into f
|
2011-10-25 17:40:20 +08:00 |
dumganhar
|
3aef823bd5
|
rename sdk1.2 to sdk1.0
|
2011-10-24 11:00:11 +08:00 |
laschweinski
|
5589335d3a
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1
|
2011-10-22 19:27:35 +08:00 |
laschweinski
|
04633242ba
|
fix a bug in audio player
|
2011-10-22 19:10:50 +08:00 |
dumganhar
|
eb901be664
|
project config change
|
2011-10-21 09:49:57 +08:00 |
dumganhar
|
da794c1613
|
Merge branch 'master' into bada
|
2011-10-21 09:28:29 +08:00 |
Leon
|
5c4a3c3fda
|
Merge remote branch 'upstream/master'
|
2011-10-20 18:34:10 +08:00 |
dumganhar
|
fdbb989ce5
|
make sdk1.2 to sdk1.0
|
2011-10-20 18:31:10 +08:00 |
Walzer
|
67bbbb2800
|
1. relative to bug #754, FontTest should use "fonts/abc.ttf" as external ttf name
2. fixed a tiny bug, FontTest can show font name on the top correctly
|
2011-10-20 14:56:39 +08:00 |
dumganhar
|
6451d8b6bf
|
use ceil to compute viewport
|
2011-10-20 13:44:21 +08:00 |
Leon
|
70a4942ea6
|
fix some warning
|
2011-10-19 15:24:19 +08:00 |
dumganhar
|
3c4c4e515a
|
modify project settings
|
2011-10-18 11:11:09 +08:00 |
dumganhar
|
064014aeae
|
make some special configure
|
2011-10-16 22:44:29 +08:00 |
dumganhar
|
ee53c29e5c
|
switch to 2.0 WVGA
|
2011-10-16 13:23:48 +08:00 |
dumganhar
|
1ffd3a4350
|
add language support
|
2011-10-14 15:54:18 +08:00 |
Walzer
|
47c9020b85
|
fixed #738: caculate label height if not set
|
2011-10-14 14:33:08 +08:00 |
dumganhar
|
3f89f3088b
|
remove mouse test log
|
2011-10-14 09:21:03 +08:00 |