James Chen
|
be129913a8
|
issue #1166: Updated the project configuration for VS2010, android, ios port.
|
2012-04-16 13:02:44 +08:00 |
James Chen
|
a71e5be0d8
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data
Conflicts:
cocos2dx/shaders/CCGLProgram.cpp
|
2012-04-16 12:45:47 +08:00 |
Phenix Yu
|
e623cd6357
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
cocos2dx/include/CCTexture2D.h
cocos2dx/include/ccMacros.h
cocos2dx/textures/CCTexture2D.cpp
lua/cocos2dx_support/LuaCocos2d.cpp
|
2012-04-15 15:46:01 +08:00 |
James Chen
|
d01f1277af
|
optimize data struct.
|
2012-04-14 19:11:57 +08:00 |
Phenix Yu
|
61a7ca71c5
|
fixed getContentSize pass by reference issue
update project setting for release mode
|
2012-04-14 17:13:38 +08:00 |
James Chen
|
2b5af66974
|
updated win32 projects configuration release version.
|
2012-04-10 23:09:58 +08:00 |
Phenix Yu
|
a05757f741
|
update for msvc2010
|
2012-04-09 00:10:12 +08:00 |
James Chen
|
85c13998ee
|
issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
|
2012-03-26 16:46:23 +08:00 |
James Chen
|
15e03f8b14
|
issue #1056: Remove old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project.
Update CCDICT_FOREACH implementation.
|
2012-03-20 21:08:52 +08:00 |
minggo
|
7ccb38556e
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20
|
2012-03-20 16:10:53 +08:00 |
minggo
|
74aaf4c6ca
|
issue #1056:gles20 runs ok on android
|
2012-03-20 16:10:12 +08:00 |
James Chen
|
6ce06bd906
|
issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
|
2012-03-20 15:04:53 +08:00 |
James Chen
|
9203b60fb0
|
add CCDictionary based on UTHASH, improve the performance.
|
2012-03-19 14:53:44 +08:00 |
James Chen
|
e021ae9821
|
#1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files.
|
2012-03-16 17:56:19 +08:00 |
James Chen
|
275891dfb0
|
issue #1056: synchronise cocos2d-iphone-2.0-rc0a
|
2012-03-16 13:42:53 +08:00 |
James Chen
|
9e89171557
|
issue #1056: Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.
|
2012-03-15 10:42:22 +08:00 |
James Chen
|
b8d760064d
|
issue #1056: Add CCVertex.h CCVertex.cpp, implement CCMotionStreak.
|
2012-03-14 16:10:01 +08:00 |
James Chen
|
aefdb852a2
|
issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
|
2012-03-14 14:55:17 +08:00 |
James Chen
|
bd59979495
|
add gles2.0 libraries for win32.
add CCGLProgram, ccGLState, CCShaderCache.
add third library---kazmath
|
2012-03-12 15:22:03 +08:00 |
James Chen
|
f8ff388e8d
|
rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources.
test ok on win32 and android
|
2012-02-14 18:04:56 +08:00 |
James Chen
|
c3d23a7923
|
issue #972: Modify project setting for all platforms. Use new icons for ios template.
|
2012-02-14 15:13:54 +08:00 |
James Chen
|
81ec2c8586
|
issue #972: add support for CCNotificationCenter, and add the test demo for it.
modify the project setting for VS2008 and VS2010
|
2012-02-10 11:48:33 +08:00 |
Wartortle
|
aa06de2fb3
|
Second half of commit for adding Accelerometer simulation to Win32.
|
2012-02-06 11:38:53 +00:00 |
dumganhar
|
a909be3264
|
remove selector_protocol.h for vs2010 project
|
2012-01-30 18:27:03 +08:00 |
dumganhar
|
a773e4fb96
|
move SelectorProtocol to CCObject
|
2012-01-08 21:03:16 +08:00 |
minggo
|
cdc842051f
|
issue #892: use RTTI to simplify codes, work ok on win32
|
2011-12-07 14:28:22 +08:00 |
minggo
|
efa9275d7f
|
save the codes for testing
|
2011-11-21 12:04:21 +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 |
minggo
|
3e080476f3
|
[win32] fixed #620: change the output of lua to a lib
|
2011-07-20 15:21:51 +08:00 |
Walzer
|
d2b44a203f
|
issue #536, build success on win32
|
2011-07-19 16:03:42 +08:00 |
minggo
|
760ec3201e
|
[win32] modify for vs2010
|
2011-07-12 18:05:44 +08:00 |
natural-law
|
7d7f3a9241
|
fixed #562, Upgrade folder sprite_nodes to rc3.
|
2011-07-01 16:11:31 +08:00 |
yangws
|
3b6265aa58
|
Compile ok on vs2010
|
2011-06-27 17:02:58 +08:00 |
minggo
|
022e2b9998
|
issue #528: refactor ok on win32
|
2011-06-20 17:31:38 +08:00 |
minggo
|
9c49e27bf1
|
add extensions & tools directory
|
2011-06-14 14:31:25 +08:00 |
minggo
|
83e1e0ebd1
|
tests run ok when it don't enable lua
|
2011-06-01 20:29:05 +08:00 |
minggo
|
697368cf20
|
support lua
|
2011-05-31 14:04:14 +08:00 |
unknown
|
97142d4a59
|
Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010
|
2011-05-19 21:11:29 +08:00 |
yangws
|
aba77f4cae
|
issue #489 modified for vs2008.
|
2011-05-13 14:13:30 +08:00 |
yangws
|
c73c1a9ab6
|
compile ok in vs2010
|
2011-05-12 16:15:10 +08:00 |
minggo
|
7e40957e04
|
Merge https://github.com/cocos2d/cocos2d-x into iss455
|
2011-05-06 16:29:44 +08:00 |
minggo
|
2c0bd49513
|
issue #455: CCUserDefault ok on win32 & Android
|
2011-05-06 15:31:51 +08:00 |
yangws
|
a5da2bd226
|
Split TextInputTest to Default test and Action test. Compile ok on vs2010.
|
2011-05-04 14:13:15 +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
|
5d2ac1fc0c
|
fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
|
2011-04-21 14:46:15 +08:00 |
yangws
|
d11bd85d00
|
CCTextFieldTTF works on win32.
|
2011-04-19 09:32:33 +08:00 |
minggo
|
3d6fd051ab
|
issue #449: refactor CCTransition
|
2011-04-11 16:09:14 +08:00 |
minggo
|
37bb33d9e5
|
fixed #452: refactor CCDirector CCNode CCGrid
|
2011-04-11 15:10:09 +08:00 |
natural-law
|
d4dbedca4d
|
fixed #451,remove the code of support mac platform.
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
|
2011-04-11 11:24:10 +08:00 |