230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
4068be84e9
Refactored project folders.
2012-04-19 11:46:08 +08:00
3c0653ffa7
fixed #1164 : 1. Add the render mode which uses VBO without VAO in CCParticleSystemQuad.
...
2. delete some unused codes for win32 port.
3. Add CC_REBIND_INDICES_BUFFER macro.
2012-04-13 17:24:50 +08:00
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +08:00
3475108953
issue #1056 : Updated Android.mk, fixed a bug in CCImage.h.
2012-03-27 13:48:14 +08:00
35d93328b9
issue #1056 : 1.Fixed a bug of double delete TouchDispatcher.
...
2. Modified the last parameter of glDrawElements. It will cause crash on some devices if the last parameter which means Indices's pointer is zero.
2012-03-21 21:53:03 +08:00
f529bcd659
issue #1056 : Move some singletons to CCDirector. It is easily managed by CCDirector.
2012-03-21 17:35:20 +08:00
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
aa06de2fb3
Second half of commit for adding Accelerometer simulation to Win32.
2012-02-06 11:38:53 +00:00
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
267cce29a9
Added testing ability for case when application enters background and returns in foreground on windows platform.
...
When application minimized applicationDidEnterBackground() called, when restored applicationWillEnterForeground().
Also break; forgotten in WM_KEYDOWN.
2011-09-22 13:11:51 +04:00
0ad5ec3557
fixed typo for win32 keypad testing ability
2011-09-22 10:27:10 +04:00
5537ba7e9e
Added keypad testing ability for windows platform. Shift+F1 emulated Back key pressing, and Shift+F2 emulated Menu key pressing
2011-09-21 16:21:11 +04:00
ed42bc388c
fixed lua memory leak
2011-08-18 12:26:33 +08:00
59f37ddb5d
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
2011-06-27 10:55:45 +08:00
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +08:00
f8dc140840
change CCLabelTTF accept string from gb2312 to utf8.
2011-04-27 18:19:47 +08:00
252f3efe1a
CCIMEDispatcher works on android.
2011-04-22 16:33:41 +08:00
d11bd85d00
CCTextFieldTTF works on win32.
2011-04-19 09:32:33 +08:00
b1ab937ec3
fix MouseEvent bug
2011-04-07 11:05:44 +08:00
2015e468ca
fixed #417 When mouse pressed， capture it in EGLView.
2011-03-26 11:34:18 +08:00
f0661a2679
fix 4 bugs:
...
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
2011-03-11 11:04:22 +08:00
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
James Chen