minggo
d1f92b8da4
Merge pull request #1239 from mustime/testlua
...
Testlua
2012-08-27 02:45:29 -07:00
James Chen
ef906cd2ba
Merge pull request #1247 from dumganhar/gles20
...
Updated Makefiles for linux port.
2012-08-27 01:45:26 -07:00
James Chen
dd26a2fcd8
Updated Makefiles for linux port.
2012-08-27 16:43:02 +08:00
minggo
0e81fd0568
fixed #1442 : use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC
2012-08-27 16:11:07 +08:00
James Chen
28150573c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-27 13:48:55 +08:00
James Chen
7ccb720104
Resource file searching implementation for blackberry.
...
Updated the package names of blackberry samples.
2012-08-27 13:48:17 +08:00
mustime
be116f5352
issue #1425 : update TestLua project
2012-08-27 11:43:47 +08:00
minggo
c7d365ca1c
Merge pull request #1231 from donaldalanmorrison/gles20
...
Gles20
2012-08-26 20:17:40 -07:00
James Chen
3d0b5bf455
fixed some warnings in java codes for android port.
2012-08-27 10:21:43 +08:00
YuLei
a38b8d4a00
[Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function
...
[Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler()
[Lua] update luabinding
2012-08-25 17:08:33 +08:00
YuLei
8b54355aa1
[Lua] update luabinding
...
[Lua] add LuaValue, LuaDict, LuaArray
2012-08-25 15:05:59 +08:00
Donald Alan Morrison
5075a83271
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/kazmath/src/ray2.c
2012-08-25 00:00:27 -07:00
Donald Alan Morrison
857608495c
Plugged CoreFoundation memory leaks identified by Static Analyzer.
2012-08-24 23:34:20 -07:00
Donald Alan Morrison
9f1899978e
Fixed potential memory leak identified by Static Analyzer.
2012-08-24 21:39:41 -07:00
James Chen
6c4bdc238f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-24 18:02:34 +08:00
James Chen
2eeca6f000
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-24 18:02:00 +08:00
James Chen
369eb3daa3
[WIN32] Enabled retina. Updated the implementation of fullPathFromRelativePath.
2012-08-24 18:01:16 +08:00
minggo
cb93713433
Merge pull request #1234 from minggo/gles20
...
use absolute path in CCFileUtils
2012-08-24 02:58:33 -07:00
minggo
bcd691ad9f
use absolute path in CCFileUtils
2012-08-24 17:55:29 +08:00
minggo
cf1d61f3de
Merge pull request #1232 from minggo/gles20
...
fix compiling error of linux
2012-08-24 01:09:37 -07:00
mingo
ba4d75a60e
issue #1445 : fix compiling error of linux
2012-08-24 15:53:26 +08:00
James Chen
e011be88d8
fixed a bug in CCFileUtils.cpp of blackberry port.
2012-08-24 14:35:51 +08:00
James Chen
5e5b71a396
fixed a bug in CCEGLView.cpp.
2012-08-24 14:35:24 +08:00
Donald Alan Morrison
3ee17b1a23
Merge with c9674e85e8
. The diff revealed
...
there was no actual conflict, so only a dot was added to the comment so
git would accept the commit (otherwise "nothing to commit"); and thus the
history is preserved.
2012-08-23 22:32:33 -07:00
Donald Alan Morrison
82bb62f8e3
MSVC++2010 doesn't accept C99-style named-initialization like clang.
2012-08-23 20:58:25 -07:00
minggo
f8df93c59c
Merge pull request #1228 from mustime/testlua
...
Testlua
2012-08-23 19:15:50 -07:00
minggo
fa0dbb7c65
Merge pull request #1226 from Squallium/gles20
...
Wrong access to CCApplication::sharedApplication() pointer
2012-08-23 19:11:07 -07:00
mustime
c9674e85e8
fixed a compile error on WIN32
2012-08-24 10:10:14 +08:00
mustime
f67b513d08
issue #1425 : add android proj on TestLua
2012-08-24 10:07:15 +08:00
James Chen
998cb276ba
Merge pull request #1224 from dumganhar/android_editbox
...
issue #1429 : CCEditBox for android port
2012-08-23 18:53:24 -07:00
minggo
56ce6869d6
Merge pull request #1227 from donaldalanmorrison/gles20
...
Gles20
2012-08-23 18:32:39 -07:00
Squallium
bd09615a26
Wrong access to CCApplication::sharedApplication() pointer
2012-08-23 22:53:16 +02:00
Donald Alan Morrison
e3094d80d0
Silenced LLVM SA Warning/Error regarding static singleton pattern. Added dealloc method.
2012-08-23 13:41:54 -07:00
James Chen
ee3e68014b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox
2012-08-24 00:16:11 +08:00
James Chen
1685e5c497
issue #1429 : Used java code to implement keyboard layout.
2012-08-24 00:15:15 +08:00
James Chen
7f2c9f6fb4
issue #1429 : Removed some used codes.
2012-08-23 23:09:12 +08:00
minggo
83606d7691
Merge pull request #1212 from mustime/testlua
...
Testlua
2012-08-23 03:08:25 -07:00
minggo
37cb691600
fix some bugs while testing
2012-08-23 18:01:28 +08:00
mustime
b815504d69
issue #1425 : change the design of CCCallFunc::create(int nHandler)
2012-08-23 16:27:22 +08:00
James Chen
06038163ca
iss1429: Finished using Dialog to implement CCEditBox for android port.
...
Next step:
Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
2012-08-23 15:34:57 +08:00
minggo
23bd0268cf
Merge pull request #1217 from zeaster/gles20
...
fixed #1298 : double firing CCCallFunc action in CCSequence
2012-08-23 00:34:06 -07:00
minggo
0c5cec0056
fixed #1441:fix a logical error in CCFileUtils::fullPathFromRelativePath()
2012-08-23 14:26:39 +08:00
minggo
d83cdbda09
fixed #1441 : put hd and ipad resources into separate directory
2012-08-23 14:20:32 +08:00
James Chen
a437099779
issue #1429 : Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox.
2012-08-23 09:42:28 +08:00
yichao.zhang
988a8d8a60
fixed #1298 : do not update last action when it is done in IntervalAction
2012-08-22 19:48:32 +08:00
minggo
99b81e3e38
Merge pull request #1216 from minggo/iss1439_synchronize
...
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 00:52:54 -07:00
minggo
3b442dfc0f
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 15:51:25 +08:00
minggo
3b1bfa5852
Merge pull request #1215 from minggo/iss1440_ccsprite_displayFrame
...
fixed #1440:convert offert point to pixel
2012-08-21 23:30:37 -07:00
minggo
2a9d29ba21
fixed #1440:convert offert point to pixel
2012-08-22 14:29:23 +08:00
mustime
1ffdbc1639
issue #1425 : add standard comment on CCCallFunc::create(int nHandler) and
...
CCCallFuncN::create(int nHandler)
2012-08-22 14:21:48 +08:00
James Chen
bcbd161398
issue #1429 : First commit CCEditBox for android port.
2012-08-22 09:47:04 +08:00
mustime
d01842a37b
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-08-22 09:39:21 +08:00
mustime
57659d1584
issue #1425 : modifing pkg files for Lua
2012-08-21 18:42:35 +08:00
minggo
ce274cfb4f
Merge pull request #1209 from minggo/iss1437_return_pointer
...
make CCEGLView::sharedOpenGLView() and CCApplication::sharedApplication() return pointer
2012-08-21 02:47:47 -07:00
James Chen
4c2702fcef
issue #1437 : fixed some compile errors for blackberry port.
2012-08-21 17:42:56 +08:00
James Chen
fac3e9c8de
issue #1437 : fixed some compile errors.
2012-08-21 17:25:03 +08:00
minggo
e939285c93
change version
2012-08-21 17:03:01 +08:00
minggo
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
minggo
cfdc50fb60
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
2012-08-21 14:58:31 +08:00
minggo
19f4356c0b
Merge pull request #1207 from aninggo/patch-2
...
Update cocos2dx/include/ccConfig.h
2012-08-20 20:08:52 -07:00
ningxu
5baa19992d
Update cocos2dx/include/ccConfig.h
2012-08-21 10:56:12 +08:00
Donald Alan Morrison
81d8dd0eb2
Silenced a false-positive warning from the LLVM Static Analyzer with initialization.
...
The warning is caused because the code has a series of if statements not chained with else clauses -- code that works as-is, but scares the SA. Probably not worth the effort to refactor...the optimizing compiler probably removes a temporary variable.
2012-08-20 18:30:12 -07:00
Donald Alan Morrison
7d66f62881
Removed a Static Analyzer Warning about immutable NSNotification object ownership by changing a property from assign to copy.
2012-08-20 18:09:51 -07:00
Donald Alan Morrison
61a5b2a742
Plugged a memory leak identified by LLVM Static Analyzer.
2012-08-20 16:48:07 -07:00
Donald Alan Morrison
c482a246be
Plugged potential memory leak found by LLVM Static Analyzer.
2012-08-20 16:40:26 -07:00
Donald Alan Morrison
abe45e53b5
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 16:16:00 -07:00
Donald Alan Morrison
d6ec91807c
For Release Builds:
...
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "NS_BLOCK_ASSERTIONS=1",
+ "NDEBUG=1",
+ );
For All Builds:
+ WARNING_CFLAGS = "-fdiagnostics-show-option";
2012-08-20 16:11:11 -07:00
Donald Alan Morrison
75ae8d2201
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 14:54:12 -07:00
Donald Alan Morrison
c75f73aa41
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:33:34 -07:00
Donald Alan Morrison
70f383ec2f
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 14:30:37 -07:00
Donald Alan Morrison
4f80c54884
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:26:35 -07:00
Donald Alan Morrison
9a8d1ca8b8
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:18:12 -07:00
Donald Alan Morrison
cbeb2bb1b9
Silenced warning of function override by category implementation, by surrounding with a clang pragma.
2012-08-20 14:08:49 -07:00
Donald Alan Morrison
e6e0684ecb
Added explicit cast to silence warning of implicit cast.
2012-08-20 14:01:48 -07:00
ningxu
84a946f676
Update cocos2dx/platform/mac/CCGL.h
...
add VAO support
2012-08-20 23:07:43 +08:00
James Chen
fd1343b951
Updated win32 template and fix a bug in win32/CCEGLView.cpp.
2012-08-20 17:08:29 +08:00
James Chen
0861877594
kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle.
2012-08-20 16:32:22 +08:00
James Chen
7eb5d85298
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb
2012-08-20 15:49:24 +08:00
James Chen
6c9b4d3357
fixed #1420 : Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs.
2012-08-20 15:49:02 +08:00
minggo
738f150ecd
fixed #1377:reset texture parameter of CCTMXLayer after coming to foreground on android
2012-08-20 14:06:29 +08:00
James Chen
b63d4d7702
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_bb
2012-08-20 11:40:23 +08:00
James Chen
63888a7eb5
issue #1432 : MutiTouchTest crashes on IOS if putting more than 5 fingers on the screen.
2012-08-20 10:38:21 +08:00
Dale Ducharme
4004a8ac61
Cocos2dx for gles2.
2012-08-17 17:45:21 -04:00
James Chen
f7fd4fc2bf
issue #1429 : Fixed a bug in EAGLView.mm.
2012-08-17 15:24:33 +08:00
James Chen
d3338a70e5
issue #1429 : Updated EditBoxTest and fix a bug about callback function.
2012-08-17 14:29:07 +08:00
minggo
316c484936
Merge pull request #1173 from mustime/bug1284
...
issue #1284 : add detection for I9100 model
2012-08-16 18:39:28 -07:00
James Chen
797c15b9a2
Merge pull request #1188 from dumganhar/gles20
...
fixed #1419 : Updated eclipse project configurations for linux port.
2012-08-16 03:22:40 -07:00
James Chen
48fa8a4e88
fixed #1419 : Update eclipse project configurations for linux port.
2012-08-16 18:09:01 +08:00
minggo
756a7e3b0c
Merge pull request #1186 from minggo/gles20
...
remove some unneeded codes
2012-08-15 23:53:22 -07:00
minggo
714b9ef838
remove some unneeded codes
2012-08-16 14:51:58 +08:00
James Chen
3c33c43fd4
fixed a bug in CCActionInterval.cpp.
...
CCSequence::create(pAction2, CCDelayTime::create(d1 - d2)); ~> CCSequence::createWithTwoActions(pAction2, CCDelayTime::create(d1 - d2));
2012-08-16 14:29:27 +08:00
James Chen
605f63f2b7
Merge branch 'gles20' into minggo_iss1405
2012-08-16 12:04:44 +08:00
minggo
416ce6b91d
fixed #1430 : add some comment
2012-08-16 11:45:52 +08:00
minggo
6a9da80292
fixed #1430 : compute correct label's width or height when its value is 0
2012-08-16 11:43:44 +08:00
James Chen
de2c00b7ae
issue #1405 : fixed some compile error on win32 and linux.
2012-08-16 11:30:25 +08:00
minggo
bcf61cdf26
issue #1405:use enum to distinguish target
2012-08-16 10:21:15 +08:00
minggo
4a97f52cd4
issue 1405:implement CCFileUtils::getResourceDirectory() on iOS
2012-08-15 16:03:55 +08:00
James Chen
0fce637ec7
issue #1429 : First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.
2012-08-15 14:33:56 +08:00
mustime
0933a032e9
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1284
2012-08-14 09:41:18 +08:00
mustime
89f0508043
issue #1284 : add detection for I9100 model
2012-08-13 17:14:33 +08:00
Walzer
d99b7463b7
Merge pull request #1172 from walzer/gles20
...
fix the out-of-range crash in CCArray::randomObject()
2012-08-11 08:34:58 -07:00
Walzer
9681c8d690
fix the out-of-range crash in CCArray::randomObject()
2012-08-11 23:31:51 +08:00
Walzer
e964e861f2
Merge pull request #1162 from tongpengfei/gles20
...
fixed linux FontTest vertical alignment
2012-08-11 07:32:32 -07:00
Walzer
a77a4eac03
add more details in doxygen comments.
2012-08-10 13:58:34 +08:00
James Chen
ba78ac7d6d
issue #1405 : Remove unused method 'CCEGLView::getFrameSize' for ios port.
2012-08-09 18:28:49 +08:00
James Chen
03c2366821
Merge branch 'minggo_res' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-09 17:50:39 +08:00
James Chen
6e2cace72d
Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res
2012-08-09 17:19:20 +08:00
James Chen
a7ce8f2e21
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into minggo_res
2012-08-09 17:16:10 +08:00
pengfei tong
82a2b9819c
[LOG] remove noused code
2012-08-09 16:57:16 +08:00
pengfei tong
075a2a6a8a
Merge branch 'test' into gles20
2012-08-09 16:41:24 +08:00
pengfei tong
188e267e7a
[FIX] FontTest vertical alignment
2012-08-09 16:35:43 +08:00
pengfei tong
11be0edb06
[FIX] FontTest vertical alignment
2012-08-09 16:08:16 +08:00
minggo
c31415b7bd
issue #1405:resolution supports on mac
2012-08-09 14:34:20 +08:00
James Chen
826dfe4102
issue #1405 : multi resolution works ok on win32. Add CCFileUtils::getResourceDirectory() method.
2012-08-09 12:49:33 +08:00
Walzer
7863375cf8
issue #1424 , http wrapper compiled pass on linux
2012-08-09 11:15:06 +08:00
Walzer
08198c082e
issue #1424 , http wrapper has been tested on iOS, mac, android port.
2012-08-09 10:45:11 +08:00
minggo
c34812567f
issue #1405 : modify macro names and comment and add getVisibleSize and getVisibleOrigin in CCDirector
2012-08-09 10:23:39 +08:00
minggo
cc39dc55f4
issue #1405:remove unneeded functions of CCFileUtils
2012-08-08 18:39:33 +08:00
minggo
3395bba327
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
2012-08-08 17:42:45 +08:00
minggo
3853611e62
issue #1405:support loading resources from directory defined by developer
2012-08-08 17:42:04 +08:00
minggo
f6115d5667
issue #1405:zoom out work ok
2012-08-07 18:24:45 +08:00
minggo
5d8f909af4
issue #1405:multi resolution works ok
2012-08-07 14:29:46 +08:00
minggo
9ccf3cefdf
fixed #1417:add header search path and add CCTouch.cpp into mac project
2012-08-06 11:08:06 +08:00
James Chen
e9aa3743fa
issue #1405 : muti-resolution works ok on linux.
2012-08-03 13:56:18 +08:00
James Chen
ed69b62461
fixed #1419 : Update cocos2d.h.
2012-08-03 11:16:34 +08:00
James Chen
086e63103d
fixed #1419 : Merge gles20 linux port.
...
There are still some issues:
1. CocosDeshionTest crash.
2. FontTest result is not correct.
2012-08-03 11:07:59 +08:00
James Chen
9c26e38563
Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20
2012-08-03 10:10:33 +08:00
pengfei tong
a37fd743e0
[FIX] testjs
2012-08-02 16:23:31 +08:00
pengfei tong
c82c8412a8
[LOG] fix makefile
2012-08-02 13:19:40 +08:00
pengfei tong
b93d0b5ebf
[LOG] add linux port
2012-08-02 13:02:59 +08:00
minggo
5399aac590
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
2012-08-02 10:50:15 +08:00
minggo
426a52447d
issue #1405:correct touch coordinate when enable retina with retina supportted device
2012-08-01 18:44:10 +08:00
minggo
0b2396c54b
issue #1405:support three type of resolution
2012-08-01 16:56:12 +08:00
Walzer
cc3d850892
fixed #1416 , add object orientated APIs for CCGeometry, replace "CCFloat" with "float"
2012-08-01 15:30:12 +08:00
Walzer
dc37896ed9
change the param sequence of CCLabelTTF::create and initWithString, according to JS APIs
2012-08-01 13:24:23 +08:00
Walzer
ba224cc283
add CCTouch.cpp into proj.win32, android.mk, xcode4 template.
2012-07-31 23:32:19 +08:00
Walzer
0431cb455b
fixed #1413 , add CCTouch::getLocation(), getDelta() method
...
return OpenGL coordinates directly, to make the usage more convenient.
2012-07-31 17:41:53 +08:00
mustime
1a55b7c5ba
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381
2012-07-27 18:29:57 +08:00
mustime
5bc130dee7
issue #1381 : change the setContentSize interface in CCScrollView
2012-07-27 18:20:11 +08:00
mustime
9949a34669
issue 1381: change setContentSize(CCSize size) to setContentSize(const
...
CCsize & size) in CCNode
2012-07-27 16:57:56 +08:00
minggo
7bfc88c568
Merge pull request #1130 from mustime/bug1284
...
issue #1284 : using OpenSL for playing effects on I9100
2012-07-26 20:31:51 -07:00
mustime
bfc53e3453
issue #1284 : using OpenSL for playing effects on I9100
2012-07-26 15:30:09 +08:00
James Chen
18b1d097c7
Merge pull request #1126 from dumganhar/gles20
...
fixed a compile error on win32.
2012-07-25 22:56:46 -07:00
minggo
16c469fa4e
Merge pull request #1127 from mustime/bug1381
...
issue #1381 : change the setContentSize interface in the subclasses of CCNode
2012-07-25 21:39:44 -07:00
mustime
9ad241c8f8
issue #1381 : change the setContentSize interface in the subclasses of
...
CCNode
2012-07-26 12:03:37 +08:00
James Chen
b716f4ff62
fixed a compile error on win32.
2012-07-26 11:42:31 +08:00
Nat Weiss
9f0be2de05
Added Mac cpp HelloWorld and Tests.
2012-07-24 19:07:31 -07:00
minggo
ed6b396782
fixed #1403:support png8
2012-07-24 16:43:48 +08:00
minggo
0a2570fec7
fixed #1383:save UserDefault.xml to Library/caches
2012-07-24 11:34:20 +08:00
Walzer
685b70e6fb
fixed #1402 , résolve conflicting "create" functions
...
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
James Chen
9a6729551c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399
2012-07-23 11:59:47 +08:00
James Chen
2ab5e4ab9c
issue #1399 : Added vs2010 support.
2012-07-23 11:57:34 +08:00
James Chen
7f6ffef8cf
issue #1399 : Set the flag 'LinkIncremental' value to false.
2012-07-23 11:47:27 +08:00
minggo
ac70f8def5
Merge branch 'gles20-adjust-structure' into merge
2012-07-23 11:36:46 +08:00
minggo
f38629fbfc
Merge pull request #1109 from NatWeiss/addmac4
...
Adding Mac support!
2012-07-22 19:48:52 -07:00
Nat Weiss
fcfea04bbc
iPad detection is now where it belongs in CCApplication.
2012-07-21 11:46:42 -07:00
Nat Weiss
a4760698ca
Determines whether to use iPad graphics statically, so if the window is resized the graphics loaded are consistent.
2012-07-21 11:35:28 -07:00
Nat Weiss
dc7ce1cd0f
Improved mac file utils and event responsiveness.
2012-07-21 02:19:03 -07:00
James Chen
5e5b008742
issue #1399 : Built four android projects(HelloCpp, HelloLua, TestJavascript, TestCpp) successfully on Ubuntu System.
2012-07-21 13:49:20 +08:00
Nat Weiss
d4b6d1262b
Adding Mac support!
2012-07-20 21:23:40 -07:00
James Chen
557f654cf3
Built successfully on android.
2012-07-20 17:06:00 +08:00
James Chen
77f1fba566
issue #1399 : Adjust folder structure, made it built successfully on win32.
2012-07-20 14:05:52 +08:00
minggo
7467d254d4
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399_adjust_structure
2012-07-19 17:26:39 +08:00
minggo
f9c40f7372
issue #1399 : work ok on iOS after adjusting directory structure
2012-07-19 17:22:36 +08:00
Yasith Vidanaarachchi
59a3bd1a9a
Fix the re-assigning of texture rectangle to consider sprite frame's orientation.
...
If the progress sprite is vertical, in the sprite sheet it's rendered incorrectly without this fix.
2012-07-17 15:56:58 -03:00
Walzer
5bec3b3ac3
CCTextureCache.cpp:L532, tex -> texture
2012-07-14 23:44:56 +08:00
Walzer
a46c53421c
consistent the variable name in different functions.
2012-07-14 15:21:42 +08:00
Walzer
e6ae45e1b2
fixed issue #1395 , which was reported at https://github.com/cocos2d/cocos2d-x/issues/1095
2012-07-14 15:06:11 +08:00
Luis Vallejo
c9408b7b75
Fixed Spelling Error CCObject::isSingleRefrence to CCObject::isSingleReference
2012-07-14 09:56:07 +08:00
minggo
fd04f2024b
Merge pull request #1094 from NatWeiss/fixxcode42
...
Fixes a compilation error for Xcode 4.2
2012-07-10 21:08:32 -07:00
Nat Weiss
d77d10a974
Fixes a compilation error for Xcode 4.2 and still maintains compatibility with Xcode 4.5.
2012-07-10 21:01:32 -07:00
mustime
50289655a5
fixed #1381 : fixed different declaration on CCLayerColor::setContentSize
2012-07-10 09:13:49 +08:00
James Chen
502982fda7
Merge pull request #1091 from NatWeiss/fixwin32il
...
fixed #1390 : Fixes Win32 error "The application failed to initalize properly".
2012-07-09 01:37:20 -07:00
Nat Weiss
ee12785c6a
Fixes Win32 error "The application failed to initalize properly 0xc000000d"
2012-07-08 23:54:29 -07:00
mustime
e289ce628c
fixed #1379 : Fixed typing error in CCNode.cpp line74
2012-07-09 14:45:04 +08:00
Nat Weiss
43d40bd5a0
Fixes a few Xcode 4.5-specific error messages.
2012-07-08 22:37:19 -07:00
James Chen
cc718ea406
Merge pull request #1087 from ngocdaothanh/patch-4
...
fixed #1372 : Fix compilation error: platform/android/CCEGLView.h:30.
2012-07-08 18:57:16 -07:00
Ngoc Dao
14a23ced56
Fix compilation error: platform/android/CCEGLView.h:30:39: error: platform/CCPlatFormMacros.h: No such file or directory
2012-07-06 10:32:54 +09:00
simdm
d3d42f12c4
fixed #1081 cocosbuilder , error when loading CCControlButton from ccbi
2012-07-05 00:49:51 +08:00
James Chen
fa1f8fe8f6
fixed #1371 : Particle crashes if setAutoRemoveOnFinish(true).
...
Scheduler: removeUpdateFromHash calls [target release] at the very end to prevent a possible crash.
2012-07-01 21:17:44 +08:00
minggo
7348fa12c3
update CHANGELOG and delete some unneeded files
2012-06-28 11:47:54 +08:00
James Chen
a20a80323b
fixed #1367 : using CCString::createWithContentOfFile in CCBMFontConfiguration::parseConfigFile.
2012-06-27 17:04:54 +08:00
James Chen
bde351dda7
fixed a bug in CCSpriteFrame::getTexture.
...
if( m_strTextureFilename.length() <= 0 ) // logic error, must be > 0
{
return CCTextureCache::sharedTextureCache()->addImage(m_strTextureFilename.c_str());
}
2012-06-27 15:04:42 +08:00
James Chen
a901b0bb12
fixed #1367 : Refactor "createWith***" to "create".
2012-06-27 14:21:29 +08:00
minggo
4f5d1d06e5
modify cocos2d-x version
2012-06-26 15:37:47 +08:00
minggo
16310cb544
fixed #1364:add paused state
2012-06-26 11:02:19 +08:00
James Chen
5274fc378d
fixed a typo in CCScene.h.
2012-06-21 13:48:57 +08:00
Ngoc Dao
28cc77008d
"node" -> "create"
2012-06-21 14:33:27 +09:00
Walzer
9eab0c19f8
add groups to all classes for doxygen
2012-06-20 18:09:11 +08:00
Walzer
d7162fcfc5
Add groups in all classes for doxygen. Upgrade doxygen to 0.8.1
2012-06-20 18:07:27 +08:00
James Chen
f8ebbccb98
fixed #1292 : Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify
2012-06-20 14:38:13 +08:00
James Chen
24e3ec7499
fixed #1336 : Updated comment information for deprecated apis.
2012-06-20 14:31:36 +08:00
James Chen
d3d3288e09
fixed #1336 : Updated CCScene.h.
2012-06-20 12:03:50 +08:00
James Chen
b818c0afa6
fixed #1336 : Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
2012-06-20 11:48:31 +08:00
James Chen
07b9db8e91
Merge branch 'gles20' into gles20-ccbi
2012-06-19 17:28:31 +08:00
James Chen
c4056b1bb0
fixed #1269 : Updated include search paths for win32 and android.
2012-06-19 17:22:55 +08:00
James Chen
591566b43a
fixed #1335 : Memory leaks in cocos2dx and CCBReader.
2012-06-19 16:31:26 +08:00
minggo
90448ec7d0
issue #1269:fix some compiling error because of including error header files
2012-06-19 16:20:46 +08:00
minggo
2666df9472
issue #1269:mrege latest code and fix conflict
2012-06-19 13:57:33 +08:00
minggo
9ec29d715a
issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx
2012-06-19 13:50:11 +08:00
James Chen
c1883c1237
fixed #1334 : Updated CCScrollView.h
2012-06-19 10:55:52 +08:00
James Chen
da85a36cd1
Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi
...
Conflicts:
cocos2dx/extensions/CCScrollView/CCScrollView.h
2012-06-19 10:51:40 +08:00
James Chen
9fa74721a7
fixed #1334 : Add ScrollViewTest to CocosBuilderTest.
2012-06-19 10:34:15 +08:00
Nicolas Gramlich
ac4a56a38c
Fixed CCScrollView (since it was behaving differently compared to the cocos2d-iphone version).
2012-06-18 18:43:53 -07:00
Nicolas Gramlich
6f26ea7a56
Added actual implementation of CCScrollViewLoader. Added ScrollViewTest to CococsBuilderTest.
2012-06-18 13:59:45 -07:00
Nicolas Gramlich
fea4401681
CCBReader: Named a whole bunch of parameters in the CCNodeLoader headers.
2012-06-18 13:41:48 -07:00
Nicolas Gramlich
227683bfa4
Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files.
2012-06-18 13:33:19 -07:00
Nicolas Gramlich
aa83408ba7
Addded virtual destructors to all classes in the CCBReader extension. CCBReader: named some parameters in the header.
2012-06-18 12:03:06 -07:00
Nicolas Gramlich
2f3fed2562
CCNodeLoader: Replaced manual deletes with 'safe' Macros.
2012-06-18 11:43:46 -07:00
minggo
6d0608d0f1
fixed #1333 : add CCScrollView for iOS
2012-06-18 19:24:47 +08:00
James Chen
c3653f651a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20-ccbi
2012-06-18 19:02:02 +08:00
James Chen
f346d09449
issue #1333 : Added CCScrollViewLoader. Not implement.
2012-06-18 19:00:26 +08:00
James Chen
579e6a1100
issue #1333 : export CCTouch class.
2012-06-18 18:32:17 +08:00
James Chen
b66be55156
issue #1333 : Use CC_PROPERTY instead of CC_PROPERTY_PASS_BY_REF for m_tContenSize
2012-06-18 18:31:29 +08:00
James Chen
85ff705415
fixed #1333 : added CCScrollView to extension.
2012-06-18 18:30:07 +08:00
minggo
c1f5d173ef
fixed #1332 : add cocos2d version
2012-06-18 16:16:09 +08:00
James Chen
453a7c63d3
issue #1330 : Some memory leaks fixes.
2012-06-16 14:31:57 +08:00
James Chen
ec75695a4f
issue #1330 : Added virtual destructor for interfaces.
2012-06-16 13:04:23 +08:00
James Chen
73c9707d5d
CCBIReader fixes + building and running flawless on iOS and Android.
...
Made it works on win32.
2012-06-16 12:48:20 +08:00
James Chen
ab3dd66167
Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi
2012-06-16 11:05:28 +08:00
Nicolas Gramlich
13bcf2180c
Merge with gles20.
2012-06-15 16:26:10 -07:00
Nicolas Gramlich
54944ab1f9
Fixed a comment.
2012-06-15 16:06:54 -07:00
Nicolas Gramlich
f0c1a4001c
Removed CC_FONT_LABEL_SUPPORT since it wasn't defined anywhere and now custom TTF fonts work.
2012-06-15 14:06:01 -07:00
Nicolas Gramlich
420d9ef41b
Fixed fntFile and fontTTF properties not having the full path prexifed, if they are non system fonts.
2012-06-15 14:01:57 -07:00
folecr
90a6a65404
Modify source.dir to match updated directory name
2012-06-15 09:24:10 -07:00
James Chen
cc572ab8e7
fixed #1329 : Moved all java files part of engine into a certain directory, then all projects refer to them.
2012-06-15 18:15:43 +08:00
James Chen
24cc0796b6
Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android
2012-06-15 17:47:04 +08:00
minggo
899022d107
fixed #1292:fix some bugs that caused by modify function name
2012-06-15 17:39:13 +08:00
James Chen
1d0fa4a9aa
fixed #1292 : Updated lua bindings.
2012-06-15 17:26:11 +08:00
James Chen
61719d813e
fixed #1292:make some function names more readable.
2012-06-15 16:47:54 +08:00
James Chen
595a402c83
fixed #1292:make some function names more readable.
2012-06-15 16:47:30 +08:00
James Chen
e7628de857
fixed a warning in CCScale9Sprite::initWithBatchNode.
2012-06-15 15:36:36 +08:00
James Chen
0afdfe33da
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-15 15:25:37 +08:00
James Chen
c17091ac70
fixed #1310 : Updated vs2010 project configuration after synchronizing to rc2.
2012-06-15 15:24:22 +08:00
minggo
266a5e5e66
Merge pull request #1028 from minggo/iss1292_moidify_function_name
...
issue #1292:make some function names more readable
2012-06-15 00:14:13 -07:00
minggo
d0f905992a
issue #1292:make some function names more readable
2012-06-15 15:10:40 +08:00
folecr
6fc2dc5ed9
Use Java code instead of XML to define layout
...
* Android layout for cocos apps are very simple (full screen)
* Avoids creation of R.java for loading the layout
* Can package entire library in jar
* Remove unused layout resource
2012-06-14 19:52:45 -07:00
folecr
4e5a64fd9e
Minimal layout directives in XML
2012-06-14 19:52:45 -07:00
James Chen
3a5ba4a24c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-15 10:52:31 +08:00
James Chen
4c1ca36aa8
fixed #1326 : The compilation of Hellolua and testjs project was broken after synchronizing to rc2.
2012-06-15 10:51:53 +08:00
minggo
c965c8d770
fixed 1181: synchronize latest codes
2012-06-15 10:27:52 +08:00
folecr
b6164c7590
Create a library named cocos2dandroid
...
* Based on sources from HelloWorld that should be common across all cocos2d-x android projects
* Rename, use prefix cocos2dx_default_ for items in layout
* Project files for android library, targeted to android-8
2012-06-14 19:21:02 -07:00
Nicolas Gramlich
8d7dce0999
Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest.
2012-06-14 18:16:54 -07:00
Nicolas Gramlich
a7ad34864f
CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff.
2012-06-14 14:23:53 -07:00
Nicolas Gramlich
c7daca43d0
CCNodeLoaderLibrary: Now free from direct std::string usage.
2012-06-14 13:51:32 -07:00
Nicolas Gramlich
2554f25cd8
CCString: Added CCStringCompare operator (can be used i.e. in stl containers).
2012-06-14 13:50:47 -07:00
minggo
221be759c6
issue #1324 : merge James Chen's codes
2012-06-14 18:54:05 +08:00
minggo
9d9e2579e3
issue #1181 : save render texture when comming to background
2012-06-14 18:37:57 +08:00
James Chen
052d8ea931
fixed #1324 : Added some create methods. Compiling successfully on win32 by vs2008.
2012-06-14 18:32:44 +08:00
James Chen
3a410c14a1
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create
...
Conflicts:
cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
cocos2dx/label_nodes/CCLabelBMFont.cpp
cocos2dx/menu_nodes/CCMenuItem.cpp
cocos2dx/menu_nodes/CCMenuItem.h
cocos2dx/misc_nodes/CCRenderTexture.h
cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
tests/tests/LabelTest/LabelTest.cpp
2012-06-14 17:36:31 +08:00
James Chen
740e28dbc1
issue #1324 : Uncommented old interfaces.
2012-06-14 17:29:23 +08:00
James Chen
7fe3f7357e
issue #1324 : Reverted old interfaces.
2012-06-14 17:18:05 +08:00
Nicolas Gramlich
4c6bf89167
Cleaned up public interface of CCNodeLoaderLibrary (now takes either const char * or CCString, instead of std::string).
2012-06-14 01:16:54 -07:00
James Chen
23574172ff
issue #1324 : Added create() for static member functions that new an autorelease object, updated cocoa folder.
2012-06-14 16:05:58 +08:00
James Chen
3f7b44fc23
issue #1324 : Added create() for static member functions that new an autorelease object
2012-06-14 15:13:16 +08:00
Nicolas Gramlich
cdd1fb50ac
Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY*
2012-06-14 00:01:01 -07:00
Nicolas Gramlich
8e67d3e2d6
Enhanced CCString with two 'constructors' and a compare function.
2012-06-13 23:56:21 -07:00
minggo
e3a84c70e9
Merge pull request #1020 from minggo/iss1257_CCGrabber
...
fixed #1257 : make CCGrabber the same logic with iphone version
2012-06-13 23:42:37 -07:00
minggo
f742de1de3
fixed #1257 : make CCGrabber the same logic with iphone version
2012-06-14 14:41:02 +08:00
minggo
b3fb5e6d4c
fixed #1293:rename getFrames to getTotalFrames and return correct value
2012-06-14 10:49:53 +08:00
Nicolas Gramlich
0c4a6be8ff
Added missiong cpp files in Android.mk. Android build now successful.
2012-06-13 16:05:31 -07:00
Nicolas Gramlich
d4a19f4296
CCNodeLoader.h: Added parameter names.
2012-06-13 15:57:59 -07:00
Nicolas Gramlich
67ab3a1bcc
CCSpriteLoader: Fixed a bug calling the wrong superclass method.
2012-06-13 15:57:33 -07:00
Nicolas Gramlich
5550d9f2b0
Merge with gles20.
2012-06-13 15:56:52 -07:00
Nicolas Gramlich
3e61e1f014
Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android.
2012-06-13 15:25:59 -07:00
Nicolas Gramlich
de95e2c1ed
Applied changes/fixes brough up by minggo.
2012-06-13 14:33:39 -07:00
Nicolas Gramlich
e2a1a246a0
Converted removed all Carriage Returns (dos line-endings, ^M.) in cocos2dx, except in the windows project/platform files.
2012-06-13 14:26:28 -07:00
Nicolas Gramlich
29b22adccc
Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work.
2012-06-13 14:19:13 -07:00
minggo
9321a8d025
fixed #1322 : vertical alignment works ok on android
2012-06-13 18:33:44 +08:00
minggo
15ad463fbe
issue #1322 : vertical alignment ok on iOS
2012-06-13 16:20:58 +08:00
minggo
2460a9f41e
Merge pull request #1016 from minggo/gles20
...
issue #1310 : modify some format
2012-06-12 20:24:34 -07:00
minggo
ec4a21eaf4
issue #1310 : modify some format
2012-06-13 11:23:43 +08:00
minggo
2f17e131e6
Merge pull request #979 from icewind/gles20
...
Override setOpacity to affect a background sprites
2012-06-12 19:49:40 -07:00
Nicolas Gramlich
895604f42e
Unified Header Guards. Added CCNodeLoaderListener, simulating the didLoadFromCCB selector.
2012-06-12 11:59:49 -07:00
Nicolas Gramlich
26d470f411
CCLabelTTFLoader: Now applying vertical alignment.
2012-06-12 11:30:36 -07:00
James Chen
08fc714a7f
issue #1310 : Reverted floatr to CCTimer.
2012-06-12 17:07:54 +08:00
James Chen
94a389ad06
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-12 14:34:17 +08:00
James Chen
b770010c41
issue #1310 : Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString.
...
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
2012-06-12 14:33:53 +08:00
minggo
916b276607
issue #1310 : synchronize CCTexturePVR
2012-06-12 12:02:15 +08:00
minggo
36455a90e1
Merge pull request #998 from minggo/gles20
...
set font size when changed
2012-06-11 18:44:20 -07:00
minggo
9c58f13abb
set font size when changed
2012-06-12 09:43:27 +08:00
Nicolas Gramlich
e52d5ae223
CCSpriteFrameCache: Minor optimization.
2012-06-11 18:31:36 -07:00
Nicolas Gramlich
1f2652a8d7
Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.)
2012-06-11 18:31:11 -07:00
Nicolas Gramlich
58b53be708
Merge with gles20.
2012-06-11 11:50:32 -07:00
Nicolas Gramlich
9c52fce5d2
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-06-11 10:43:27 -07:00
Nicolas Gramlich
4378731418
Merge with gles20.
2012-06-11 10:43:07 -07:00
James Chen
be362bef9b
issue #1310 : Some typo fixes. Updated CCTexture2D.h/.cpp.
2012-06-11 21:58:04 +08:00
James Chen
62f87c18a2
issue #1310 : Exported CCCatmullRomTo class and ccCardinalSplineAt function.
2012-06-11 20:02:40 +08:00
minggo
ccbfd24c21
issue #1310 : synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest
2012-06-11 18:25:57 +08:00
James Chen
b61ad6cdba
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-11 14:45:09 +08:00
James Chen
2ce7c86c50
fixed #1315 : TileMapTest can't be shown correctly in retina mode.
2012-06-11 14:44:32 +08:00
minggo
55ee220245
Merge pull request #993 from minggo/gles20
...
issue #1310 : synchronize CCLabelTTF
2012-06-10 23:37:31 -07:00
minggo
b4899ae46d
issue #1310 : synchronize CCLabelTTF
2012-06-11 14:36:25 +08:00
James Chen
bd535c3c1c
issue #1310 : Fixed a bug that 3d effect can't be displayed correctly in retina mode.
2012-06-11 11:53:17 +08:00
James Chen
33ea7905a5
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/platform/ios/CCFileUtils.mm
2012-06-11 11:01:36 +08:00
James Chen
c95cbb1774
issue #1310 : Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status.
...
Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
Fixed a bug in CCDirector, made retina mode work correctly.
2012-06-11 10:59:57 +08:00
minggo
94235d3602
issue #1310 : make tests and HelloWorld work ok
2012-06-11 10:41:52 +08:00
minggo
c8c696a2df
Merge pull request #989 from NatWeiss/gles20
...
Fixed a few release-mode Xcode warnings about unused parameters.
2012-06-09 03:13:22 -07:00
Nat Weiss
70fa2ec3cb
Fixed a few release-mode Xcode warnings about unused parameters.
2012-06-08 13:52:40 -07:00
Nicolas Gramlich
1e9656854b
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-06-08 10:22:25 -07:00
James Chen
c9dc60b0f7
issue #1310 : fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project.
2012-06-08 17:58:21 +08:00
James Chen
371b3f9938
issue #1310 : Tests project updated!.
2012-06-08 17:34:15 +08:00
James Chen
a40dfa427a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-08 17:15:32 +08:00
James Chen
9ff7dcd96d
issue #1310 : Removed some functions.
2012-06-08 17:15:00 +08:00
minggo
913707f259
Merge pull request #983 from NatWeiss/gles20
...
Allows Cocos2D-X to be built for iOS including all cpp files
2012-06-08 01:55:19 -07:00
James Chen
12a9d13443
issue #1310 : Synchronize to RC2, HelloWorld works ok on win32.
2012-06-08 16:54:38 +08:00
James Chen
76a560a474
issue #1310 : Made CCFileUtils as a singleton.
2012-06-08 16:22:57 +08:00
James Chen
35e9e44e39
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-08 15:31:23 +08:00
minggo
6b7a59f007
issue #1310:synchronize CCLableAtlas and CCLabelBMFont
2012-06-08 15:29:47 +08:00
James Chen
6cf608effd
issue #1310 : deleted some functions which can't be implemented in C++. Moved arrayMakeObjectsPerformSelector to CCArray.h.
2012-06-08 15:17:15 +08:00
James Chen
4a887ac598
issue #1310 : Updated CCScene.h.
2012-06-08 15:03:18 +08:00
Nat Weiss
6ee3db827c
Allows Cocos2D-X to be built for iOS including all cpp files.
2012-06-07 23:52:15 -07:00
James Chen
fd2d9a8aa6
issue #1310 : Finished 'menu_nodes' and 'layers_scenes_transitions_nodes'.
2012-06-08 14:50:41 +08:00
James Chen
c8dfe7f92b
issue #1310 : Finished CCRenderTexture.h(.cpp).
2012-06-08 14:30:55 +08:00
minggo
9a600c6221
issue #1310 : syncronize base_nodes
2012-06-08 14:17:39 +08:00
James Chen
26cf81e42e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/CCScheduler.h
cocos2dx/include/ccTypes.h
2012-06-08 14:14:13 +08:00
James Chen
c5cf23c859
issue #1310 : First commit since sync to rc2.
2012-06-08 14:11:48 +08:00
minggo
cc16320445
issue #1310 : syncronize actions
2012-06-08 13:55:28 +08:00
Nat Weiss
ed43e6a90b
Allows Cocos2D-X to be built for iOS including all cpp files.
2012-06-07 21:16:24 -07:00
icewind
b87e932b9f
Override setOpacity to affect a background sprites
...
Calling button->setOpacity was affecting only to label. Now opacity
value applies also to a background sprites
2012-06-07 13:20:30 +04:00
minggo
2b55a76970
Merge pull request #978 from minggo/iss1202_remove_CCFileData
...
fixed #1202:remove CCFileData
2012-06-06 23:15:05 -07:00
minggo
49d8ac72f6
fixed #1202:remove CCFileData
2012-06-07 14:13:44 +08:00
James Chen
f466b081c9
fixed #1308 : Used std::sort to sort the touchHandler array.
2012-06-07 11:38:59 +08:00
Nicolas Gramlich
45d9fc9686
Making use of the new SEL_CCControlHandler in the CCControlExtension.
2012-06-06 14:32:15 -07:00
Nicolas Gramlich
df571e9cbb
CCControlExtension: Added support for SEL_CCControlHandler (as opposed to SEL_MenuHandler), which also passes the CCControlEvent parameter.
2012-06-06 14:31:14 -07:00
Nicolas Gramlich
aefc1e1370
CCBMemberVariableAssigner and CCBSelectorResolver: now using const char * instead of std::string.
2012-06-06 11:43:33 -07:00
Nicolas Gramlich
671a0ef5b4
Removed zombie file: CCBMemberVariableAssigner.cpp.
2012-06-06 11:06:28 -07:00
James Chen
c64c4a74bf
fixed #1308 : Strange TouchDispatcher behavior.
2012-06-06 22:49:28 +08:00
James Chen
4b7f9f582f
fixed #1297 : fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR().
2012-06-06 15:56:55 +08:00
James Chen
734ea54aba
fixed #1302 : The parameter of CCMenu::setHandlerPriority should be signed int.
2012-06-06 15:16:02 +08:00
James Chen
2238db301b
fixed #1301 : CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points.
2012-06-06 14:13:40 +08:00
James Chen
6bb2941ec9
fixed #1300 : Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA
2012-06-06 10:06:51 +08:00
Nicolas Gramlich
bcf53f1453
Added CCNodeLoaderLibrary (more of a factory pattern, compared to adding the CCNodeLoaders directly to the CCBReader. Fixed all TODOs regarding (potential) memory leaks (Thanks to Ricardo Quesada). CCNodeLoaders are now autorelease objects (having a static 'loader()' method to be used).
2012-06-05 17:15:28 -07:00
Nicolas Gramlich
c9db868d93
CCLabelTTF: Now internally using std::string instead of std::string *.
2012-06-05 17:12:41 -07:00
Nicolas Gramlich
2d86a4089c
CCLabelBMFont: Now using std::string to store internal data instead of just storing a 'foreign' const char *.
2012-06-05 17:11:50 -07:00
Nicolas Gramlich
0702becaf5
CCAutoreleasepool: Fixed typo.
2012-06-05 16:22:42 -07:00
James Chen
56817244ed
fixed #1297 : Retina mode can't work in 'Projection2D' mode.
2012-06-05 15:27:46 +08:00
minggo
7733607fe2
fixed #1296 : fix logical error of CCTMXTileMap::tilesetForLayer()
2012-06-05 10:51:53 +08:00
Nicolas Gramlich
420a731138
Switched from std::string to const char *.
2012-06-04 17:45:25 -07:00
Nicolas Gramlich
d3e0f8dc92
Added support for resolutionScale.
2012-06-04 16:16:42 -07:00
Nicolas Gramlich
28862c30cf
CCNodeLoader: Fixed small memory leak.
2012-06-04 16:03:45 -07:00
Nicolas Gramlich
5c38dd7193
Added CCBMemberVariableAssigner and CCBSelectorResolver.
2012-06-04 15:52:49 -07:00
Nicolas Gramlich
6c5be5e56e
CCScale9Sprite: Removed debug logging.
2012-06-04 15:30:03 -07:00
James Chen
1b4de48e86
Merge pull request #961 from icewind/gles20
...
fixed #1289 : CCControlButton update. Added zoomOnTouchDown property and setPreferredSize.
2012-06-03 19:55:39 -07:00
minggo
ae15525e32
Merge pull request #965 from NatWeiss/gles20
...
fixed #1288:Enhances CCTransitionScene to work even if there is no running scene.
2012-06-03 07:36:17 -07:00
Nicolas Gramlich
bb49eaebe9
Added CCParticleSystemQuadLoader.
2012-06-01 16:45:30 -07:00
Nicolas Gramlich
8576837e5e
CCParticleSystemQuad: Added CCParticleSystemQuad::node().
2012-06-01 16:38:43 -07:00
Nicolas Gramlich
43682e6857
Added CControlLoader and CCControlButtonLoader.
2012-06-01 15:14:18 -07:00
Nicolas Gramlich
2340c93c17
Fixed CCNodeLoader::parsePropTypeSpriteFrame not trying to load 'null' sprites/spritesheets. Also minor renaming.
2012-06-01 15:13:16 -07:00
Nicolas Gramlich
9951ba8ad2
Minor changes.
2012-06-01 15:12:07 -07:00
Nicolas Gramlich
67d9b8ea25
Minor changes.
2012-06-01 15:11:42 -07:00
Nicolas Gramlich
eee8ba7586
CCLabelTTF: Added getters for fontName and fontSize.
2012-06-01 15:11:16 -07:00
Nicolas Gramlich
9576db1e28
CCControlButton: Added LabelAnchorPoint property. (According to: https://github.com/YannickL/CCControlExtension/ : 623f10433a088140adbb1e1d7d6c97e1ae05adf9)
2012-06-01 15:10:20 -07:00
Nicolas Gramlich
18fba1664d
CCControlButton: Added getters and setters for backgroundspriteframe, titlettf, titlettfsize, titleBMGont. Added ZoomOnTouchDown property. (According to: https://github.com/YannickL/CCControlExtension/ : 9dfb9d97a5fe729115b461d9a52ebc36aba51c72, b31256ad6b26e7f645719f203f0e72d717e68c75, 7a79cd702d4ccb958281bcec5d8a7658723f7c2a, c4bbcb9beb2febfb4b55323709e30082af902c90, d4a88349e1f60100225d49e43af587dc10def66f)
2012-06-01 12:29:48 -07:00
Nicolas Gramlich
8dbe897755
CCLabelBMFont: Made fntFile a property. (According to: ffbdb60a5908f5baef227bb0365a0b2653a3a59a)
2012-06-01 11:59:10 -07:00
icewind
ac268896f1
CCControlButton update. Added zoomOnTouchDown property and setPreferredSize
...
Ported some functions from original CCControlExtensions repository.
Added feature to set the preferred size of the background sprite and
toggle zooming on TouchDown event
2012-06-01 14:07:45 +04:00
Nat Weiss
0fedc8a84a
Enhances CCTransitionScene to work even if there is no running scene.
2012-06-01 00:54:17 -07:00
James Chen
f6ae01c523
Merge pull request #959 from dumganhar/typo_fix
...
Typo fixed in CCGL.h
2012-05-31 23:50:11 -07:00
James Chen
3959fe8f4d
typo fixed in CCGL.h
2012-06-01 14:48:45 +08:00
minggo
63cf48f548
Merge pull request #958 from NatWeiss/gles20
...
fixed #1286 : Fixes the declaration of tgaLoadRLEImageData()
2012-05-31 23:46:36 -07:00
Nat Weiss
472c98b652
Fixes the declaration of tgaLoadRLEImageData() to match it's implementation. This causes an android build to be successful.
2012-05-31 23:20:56 -07:00
James Chen
2b235fd705
Delete libEGL.dll(.lib).
2012-06-01 13:56:22 +08:00
James Chen
ebcc78497f
fixed #1282 : Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.
2012-06-01 13:44:28 +08:00
Nicolas Gramlich
62e0c1cda0
Added CCMenuLoader, CCMenuItemLoader and CCMenuItemImageLoader.
2012-05-31 17:07:02 -07:00
Nicolas Gramlich
40f1ffe5fb
CCMenuItem(Image): Added possibility to init without any image. (Changes according to: 5e8518eaed78a6c589bf73dadf85e2056f834f36, 013b4cec0a9250268b131105795e87d37cba4d52)
2012-05-31 17:04:53 -07:00
Nicolas Gramlich
7cb3be2057
Minor change.
2012-05-31 17:01:01 -07:00
Nicolas Gramlich
b63559d86d
Added CCBFileLoader.cpp. Fixed a bug in CCNodeLoader::onHandlePropTypeSize.
2012-05-31 14:57:13 -07:00
Nicolas Gramlich
39442e9bb6
Merged with gles20.
2012-05-31 13:10:51 -07:00
Nicolas Gramlich
4a027082be
Pulled changes from github.
2012-05-31 13:08:33 -07:00
Nicolas Gramlich
8a01e33491
Added CCScale9SpriteLoader.
2012-05-31 12:38:00 -07:00
Nicolas Gramlich
948fcc3d07
CCScale9Sprite: Moved anchorpoint initialization back to updateWithBatchNode, since this is probably the intended location, but causes problems due to the order properties appear in the CCBI file format.
2012-05-31 12:37:28 -07:00
Nicolas Gramlich
8678a14b6e
CCScale9Sprite: Added initialization of insets. Moved setting the default anchorpoint to its constructor.
2012-05-31 12:03:33 -07:00
Nicolas Gramlich
fe9fb347aa
CCScale9Sprite: Added support for insets by floats and CCRect. Fixed bug for positioning for uneven insets. Changing texture no longer affects the anchor point. Made it possible to set the SpriteFrame. (Changes according to https://github.com/YannickL/CCControlExtension/commits/gles20 : d00c4f90ab53d5295bce03123ddbccc4fa0acf58, ed56cb1558c755748437d152f2f7a4bb5a1455ba, c4bbcb9beb2febfb4b55323709e30082af902c90, 5da062de92d39d91b014f87809fc30ba501538fc)
2012-05-31 11:47:16 -07:00
James Chen
63a6b97bc5
fixed #1280 : Renamed some functions.
2012-05-31 15:32:18 +08:00
James Chen
b39af18a5f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1280_labeltest
2012-05-31 13:08:19 +08:00
James Chen
cec50ae2d8
fixed #1280 : BitmapFontMultiLineAlignment test can't work correctly.
...
We should invoke 'this->setString(m_sString_initial.c_str(), true);' in the 'CCLabelBMFont::updateLabel'.
2012-05-31 13:07:25 +08:00
minggo
9237804b29
modify engine version
2012-05-31 10:14:00 +08:00
Nicolas Gramlich
b7130c3d63
Added (dysfunctional) CCScale9SpriteLoader.
2012-05-30 16:52:02 -07:00
Nicolas Gramlich
6e9fac0a58
Cleanup.
2012-05-30 16:51:33 -07:00
Nicolas Gramlich
36e6d94d46
Added setter for dimensions of CCLabelTTF (According to: 302dd76b4f87ddb18cc571ebec3be0811ea534ca).
2012-05-30 16:49:51 -07:00
Nicolas Gramlich
d0f101b820
Added missing ASSERT_FAIL_UNEXPECTED_PROPERTY in CCNOdeLoader::onHandlePropTypeSize.
2012-05-30 16:14:02 -07:00
Nicolas Gramlich
6b3fa4abb6
Added CCLabelTTFLoader.
2012-05-30 15:38:20 -07:00
Nicolas Gramlich
5578521a69
Fixed CCLabelBMFontLoader (according to changes in: 827ee160b5
).
2012-05-30 15:37:36 -07:00
Nicolas Gramlich
c754dac31b
Added missing case kCCBPropTypeFontTTF in CCNodeLoader::parseProperties.
2012-05-30 15:36:00 -07:00
Nicolas Gramlich
9ca7fa468a
Added default init method for CCLabelTTF (See: 24125b93aad2d4fc7ebf1bc6e4ef6b8b83ff770d).
2012-05-30 15:34:50 -07:00
Nicolas Gramlich
827ee160b5
Added support for initializing a CCLabelBMFont without a fntfile and a string. (See: ffbdb60a5908f5baef227bb0365a0b2653a3a59a, a6749b38f8085ba81921063328bc50cb7a989613, e6e3917c0c3f2e95e13c3be29584cb9e3781d3a7).
2012-05-30 15:31:08 -07:00
Nicolas Gramlich
a7d4fa619d
Removed CCBReader to avoid conflicts.
2012-05-30 11:30:53 -07:00
Nicolas Gramlich
56ea340314
Current state of the CCB(I)Reader (dysfunctional due to CCLabelBMFont problems).
2012-05-30 11:28:50 -07:00
minggo
5ad2bec3d8
Merge pull request #946 from minggo/gles20
...
fix some bug
2012-05-30 03:33:19 -07:00
minggo
a698f9bf69
fix some bug
2012-05-30 18:31:20 +08:00
James Chen
6be44ad7b0
fixed #1279 : NodeNonOpaqueTest can't be shown correctly.
2012-05-30 18:30:11 +08:00
James Chen
93d1879a56
fixed #1277 : CCToggleVisibility should implement copyWithZone.
2012-05-30 16:34:42 +08:00
James Chen
5b4495d982
Opened assert for CCTexture2D::setTexParameters and generateMipmap.
2012-05-30 16:26:47 +08:00
James Chen
bd248b5ac0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-05-30 16:09:52 +08:00
James Chen
7115a7f3c9
issue #1275 : Memory leaks in CCBReader and ActionsTest.
2012-05-30 16:09:19 +08:00
minggo
80389d0611
Merge pull request #941 from minggo/gles20
...
fix some bugs
2012-05-30 00:44:22 -07:00
minggo
4428810fd5
fixed some bugs
2012-05-30 15:42:29 +08:00
James Chen
b662784730
Merge pull request #940 from dumganhar/gles20
...
fixed #1273 : Crash appears after clicking closed button in TextureCacheTest.
2012-05-29 23:31:36 -07:00
James Chen
265cb135ad
fixed #1273 : Passed 'this' to unscheduleSelector rather than 'g_sharedTextureCache'.
2012-05-30 14:27:30 +08:00
James Chen
895de701ba
fixed #1273 : Crash appears after clicking closed button in TextureCacheTest. Also fixed a bug about memory leak in CCEGLView.cpp(win32). And updated build-win32.bat.
2012-05-30 14:24:59 +08:00
minggo
07c46bb445
fixed #1266 : use flag O_CREAT when creating named semaphore
2012-05-30 11:21:36 +08:00
James Chen
228bc1e044
fixed #1240 : Updated vs2010 project setting.
2012-05-29 17:50:27 +08:00
James Chen
ad50d6ee57
fixed #1270 : Fixed some warning on win32.
2012-05-29 17:11:33 +08:00
James Chen
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
James Chen
c1cb8b0e24
fixed #1177 : Updated Android.mk.
2012-05-29 15:56:08 +08:00
James Chen
6e2c257e43
fixed #1177 : Updated win32 project configuration.
2012-05-29 15:52:38 +08:00
James Chen
5f5af82254
fixed #1177 : Moved CCStdC.h/.cpp to relevant platform folder.
2012-05-29 15:51:13 +08:00
James Chen
94701d9315
fixed #1268 : Testjs will crash after clicking the close button on win32.
...
Also, fixed a bug in CCTextureCache::~CCTextureCache().
2012-05-29 15:23:16 +08:00
Jeff Reitman
821c3933b4
Merge branch 'gles20' into rw_fixes
2012-05-28 07:27:36 -07:00
Jeff Reitman
6c5f309180
Revert "* add ability to disable denshion in lua mode"
...
This reverts commit b7746882f7
.
2012-05-28 07:24:20 -07:00
James Chen
14a218c8cc
Merge pull request #922 from dumganhar/gles20
...
fixed #1240 : Added static libraries of tiff for android.
2012-05-28 01:07:08 -07:00
James Chen
785c3c5d60
fixed 1240# : Added static libraries of tiff for android.
2012-05-28 16:05:52 +08:00
James Chen
6e59d5eab4
fixed #1264 : CCLabelTTF: wrong string alignment when using utf-8 encoded text.
2012-05-28 14:27:32 +08:00
James Chen
99dcb4de86
issue #1263 : Removed CCFileUtils::ccLoadFileIntoMemory in CCFileUtils.mm. Removed some comments.
2012-05-28 14:14:19 +08:00
James Chen
1b7cc47a34
issue #1263 : Removed unused files. Fixed an issue in uthash.h.
2012-05-28 13:59:18 +08:00
Jeff Reitman
6c6fbeef8d
* fix async texture cache not working on IOS due to sem_open requirement
...
* allow semaphore to be unlinked and close no thread exit
* removed firstTry as it can now use s_pSem which is only set when the semaphore is successfully created. Had to move target->retain() under thread creation so we don't leak memory if semaphore fails.
2012-05-27 11:41:12 -07:00
Jeff Reitman
b7746882f7
* add ability to disable denshion in lua mode
2012-05-27 11:03:45 -07:00
James Chen
330b019361
Added jstest project for vs2008.
2012-05-27 22:53:48 +08:00
James Chen
c902e884f4
fixed #1240 : Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage.
2012-05-25 16:52:47 +08:00
James Chen
6477a02022
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff
2012-05-25 11:00:20 +08:00
James Chen
0b8a75e982
fixed #1240 : Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest.
2012-05-25 10:58:28 +08:00
Walzer
df98ed4792
Merge pull request #914 from walzer/gles20
...
javascript binding!
2012-05-24 03:48:14 -07:00
Walzer
1e732930b7
fixed #1258 , testjs and spidermonkey-ios is merged. But only test_actions.js works.
2012-05-24 17:48:05 +08:00
minggo
c258e1e43a
fixed #1247 : add profile lib
2012-05-24 17:47:46 +08:00
James Chen
e5443d22c1
issue #1240 : Added libtiff for android.
2012-05-24 12:00:06 +08:00
minggo
138de3171f
Merge pull request #912 from minggo/merge_nicolasgramlich
...
Merge pull request by nicolasgramlich
2012-05-23 19:56:05 -07:00
minggo
0ba62c3854
issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp
2012-05-24 10:48:39 +08:00
James Chen
6a37158100
issue #1240 : Used TIFFClientOpen instead of TIFFOpen to decode memory data of tiff format.
2012-05-23 18:20:51 +08:00
James Chen
c2591f1e9e
issue #1240 : Added tiff support, run ok on win32. There is a 'FIXME' needed to be fixed.
2012-05-23 17:26:06 +08:00
James Chen
ea48413d2d
fixed #1253 : Added static method "purgeConfiguration" for CCConfiguration to avoid memory leak.
2012-05-23 12:11:53 +08:00
James Chen
c7359ba1a0
fixed #1252 : Added CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device.
2012-05-23 11:57:43 +08:00
James Chen
d5f52335d5
fixed #1224 : Wrote some comments in CCParticleSystem.
2012-05-23 11:26:21 +08:00
James Chen
f7ffdd757c
fixed #1244 : deleted unused method "release" of CCImage class.
2012-05-23 11:22:17 +08:00
James Chen
d998b54269
fixed #1224 : Memory leak in CCParticleSystem::initWithDictionary()
2012-05-23 11:18:04 +08:00
Nicolas Gramlich
d69bc23894
Initial version of CCBReader reading ccbi format. (Only reads and checks the header so far).
2012-05-22 17:38:33 -07:00
Nicolas Gramlich
15ef23bac8
Removed assert which prevented CCSpriteBatchNode from being used as a root node. (Discussed this with Ricardo Quesada)
2012-05-21 17:38:24 -07:00
Nicolas Gramlich
320b181dbf
CCDirector stats labels are now CCLabelBMFont instead of CCLabelTTF.
2012-05-21 17:20:47 -07:00
Walzer
9ee1b32c26
Merge pull request #903 from walzer/gles20
...
add CCBReader_v2.cpp in vcproj & vcxproj
2012-05-21 02:58:59 -07:00
Walzer
9ac0b68981
modify CCBReader.cpp to CCBReader_v2.cpp in vcproj/vcxproj.
2012-05-21 17:56:09 +08:00
minggo
683c91bbfa
fixed #1236 : return empty string when parameter is null
2012-05-16 14:17:37 +08:00
minggo
1d18c6607a
fixed #1237 : correct line number output by CCAssert
2012-05-16 14:10:27 +08:00
Walzer
a3bd26a52b
modify CCBReader.cpp to CCBReader_v2.cpp in cocos2dx/Android.mk
2012-05-11 22:40:31 +08:00
Walzer
d6dde5a5ee
move kBottomLeft series enum from CCNode.h to CCBReader.h
2012-05-11 21:10:02 +08:00
Walzer
dc18dc0942
test ccb v2 format, add relative-position support
2012-05-11 20:53:30 +08:00
Walzer
ae12434128
fixed #1205 , rename CCCustomClass to CCCustomClassProtocol, add windows support.
2012-05-08 11:30:08 +08:00
Walzer
f10b94fd15
issue #1205 , CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported.
2012-05-07 22:52:58 +08:00
Walzer
a91032ccb5
Merge commit 'e895a2a1e8109381329d7cd8e29c780b73643351' into gles20
2012-05-07 18:15:16 +08:00
Walzer
1a73064055
issue #1205 , refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android
2012-05-07 18:14:15 +08:00
minggo
5388e9c863
fixed #1232 : don't do type cast
2012-05-07 17:15:32 +08:00
Walzer
c76e3c0936
remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now.
2012-05-07 17:05:17 +08:00
minggo
ff6abd1d8c
fixed #1230 : fix a bug in calculating string width
2012-05-07 10:15:57 +08:00
Walzer
07276c3bba
Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20
2012-05-05 15:49:11 +08:00
Walzer
184b31efa3
fix compilation warnings on android & ios
2012-05-05 10:44:42 +08:00
Walzer
6b374881f0
Merge branch 'gles20' of http://github.com/cocos2d/cocos2d-x into gles20
2012-05-05 10:07:21 +08:00
Walzer
f70855e959
fixed #1229 , reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency.
2012-05-05 10:06:41 +08:00
Walzer
be2fa353a7
Merge commit '1afd7f2701b5e9fec0d2a4fd514d1d4e069b3830' into gles20
2012-05-05 09:55:06 +08:00
minggo
1afd7f2701
Merge pull request #893 from minggo/iss1217_EaseAction_reverse
...
Iss1217 ease action reverse
2012-05-04 01:26:56 -07:00
minggo
14b923409a
fixed #1217 : implement reverse() for all subclass of CCEaseAction that missing it
2012-05-04 16:22:50 +08:00
James Chen
bf0da624b4
issue #1191 : Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10.
2012-05-04 11:16:57 +08:00
James Chen
47b8148064
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template
2012-05-04 02:08:31 +08:00
minggo
27b5fb8074
merge commit of issue 1216
2012-05-03 16:30:13 +08:00
Walzer
a584aee897
issue #1205 update license declaration
2012-05-03 15:33:22 +08:00
Walzer
ebaf1da460
issue 1205, CCBReader. Not perfect yet, I will use CCNotificationCenter to improve SET macro/assign var to parent.
2012-05-03 15:29:27 +08:00
James Chen
7cdb11b668
fixed #1215 : fixed a bug in retina support for win32.
2012-05-03 15:05:19 +08:00
Walzer
2fc1322cc8
update copyright and license declaration of CCCBReader relative files
2012-05-03 14:43:27 +08:00
Walzer
5faaab0d16
add CocosBuilderTest into extension test. fix a bug in CCLayerGradient::updateColor
2012-05-03 12:17:28 +08:00
Walzer
160b0aba88
Merge commit 'b7b21f3dc2e2c541a06fdd381b6b43d213a90093' into gles20
2012-05-03 12:02:13 +08:00
Walzer
9e62412ce9
issue #1205 , add CCBReader, CppReflection, CocosBuilderTestCase
2012-05-03 11:58:53 +08:00
James Chen
b6a1e89aa5
fixed #1211 : Translated Chinese comments to English for CCTextureWatcher and CCListView. And Updated AUTHORS file.
2012-05-03 11:09:27 +08:00
James Chen
82439733c5
fixed #1204 : Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest.
...
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
2012-05-03 10:12:00 +08:00
James Chen
ca5ef69d50
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
2012-05-02 18:44:30 +08:00
minggo
4bcf67078d
fixed #1201 : add prebuilt libs
2012-05-02 18:37:37 +08:00
James Chen
395dbc90aa
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
...
Conflicts:
lua/cocos2dx_support/LuaCocos2d.cpp
2012-05-02 18:23:16 +08:00
James Chen
4580fffed7
issue #1204 : Updated CCApplication.mm and ios template.
2012-05-02 18:18:43 +08:00
James Chen
5fc72581cb
issue #1204 : Removed CCApplication::initInstance.
2012-05-02 17:50:26 +08:00
minggo
c048fe77c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build
2012-05-02 14:41:49 +08:00
James Chen
db92c9c1dc
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 14:32:27 +08:00
James Chen
a998062c57
issue #1194 : Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup.
2012-05-02 12:04:27 +08:00
minggo
741f219f16
issue 1201: remove module to prebuilt
2012-05-02 10:45:21 +08:00
minggo
57d6884757
rename modules to prebuilt
2012-05-02 10:44:40 +08:00
Walzer
2addd06f21
fixed #1203 , remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.
2012-05-02 10:39:17 +08:00
James Chen
de35aaa101
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 09:49:12 +08:00
minggo
cbfe1e0d0c
optimize CCTextureCache::removeUnusedCache()
2012-04-28 11:34:13 +08:00
James Chen
9886f281ee
issue #1191 : Updated win32 project files.
2012-04-27 18:50:55 +08:00
James Chen
c5f7f15090
issue #1194 : Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView.
2012-04-27 18:47:49 +08:00
minggo
a4e8c9ad17
fixed #931 : refactor CCImage and CCTexture2D
2012-04-27 18:37:11 +08:00
minggo
a1570e931f
issue #931:make convert to rgb565 and A8 correct
2012-04-27 15:53:29 +08:00
James Chen
fd08f9852b
issue #1194 : Added some files refer to TextureWatcher.
2012-04-27 12:00:54 +08:00
James Chen
2bffd3a565
issue #931 : dynamically allocate array(row_pointers) in CCImage::_initWithPngData.
2012-04-26 18:17:57 +08:00
minggo
602d34ec78
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-04-26 17:36:59 +08:00
minggo
7ecbd8ea6c
issue #931 : refactor CCImage and CCTexture2D
2012-04-26 17:36:32 +08:00
James Chen
ceb5b122b0
fixed #1190 : closed CC_LUA_ENGINE_DEBUG by default.
2012-04-26 14:37:28 +08:00
James Chen
f5ffe8249e
issue #1190 : Updated ios lua project.
2012-04-26 13:05:05 +08:00
James Chen
8d63e9f1bd
issue #1190 : Updated some files for android port.
2012-04-26 11:52:21 +08:00
James Chen
edfb8c1f9c
issue #1190 : used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg.
2012-04-26 11:39:49 +08:00
James Chen
96a177bd37
issue #1190 : updated some pkg files for lua binding.
2012-04-26 09:34:42 +08:00
James Chen
1d94ba05a0
fixed #1189 : updated linebreak and tab(4 space) for all source files.
2012-04-25 18:17:04 +08:00
James Chen
a5f0bc3cbc
fixed #1189 : syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes
2012-04-25 18:08:23 +08:00
James Chen
568bdce6c1
fixed #1188 : Removed some unused files.
2012-04-25 17:46:29 +08:00
James Chen
8e5668472f
issue #1188 : Updated project configuration for ios platform.
2012-04-25 17:33:28 +08:00
James Chen
0f36a89c7e
issue #1188 : Refactor directory. Compile successfully on android and win32(vs2008 debug).
2012-04-25 16:18:04 +08:00
James Chen
e8b826b7a6
fixed #1187 : spanish(Buen día) cannot be shown completely in CCLabelBMFont unicode test.
2012-04-25 10:55:59 +08:00
James Chen
062ae1756d
fixed #1177 : updated project configuration for android and ios platforms.
2012-04-24 17:35:36 +08:00
James Chen
f1c5cfef1e
fixed #1177 : Added CCApplicationProtocol.h.
2012-04-24 17:13:13 +08:00
James Chen
26763c200b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
...
Conflicts:
tests/proj.ios/test.xcodeproj/project.pbxproj
2012-04-24 15:44:53 +08:00
minggo
1e20f2b6db
fixed #1185 : reload image data and recreate buffer of object when backing to foreground
2012-04-24 15:02:18 +08:00
James Chen
5e0682ed77
Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
2012-04-23 15:41:01 +08:00
James Chen
af86a52f27
issue #1177:Updated some files for ios port.
2012-04-23 15:40:46 +08:00
James Chen
8fd3518160
issue #1177 : fixed a bug about retina in CCDirector.
2012-04-23 15:38:02 +08:00
James Chen
5b77e6e80e
Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
...
Conflicts:
cocos2dx/platform/CCEGLViewProtocol.cpp
cocos2dx/platform/CCEGLViewProtocol.h
2012-04-23 14:39:27 +08:00
James Chen
24515f009e
issue #1177 : Updated ios project configuration.
2012-04-23 14:35:41 +08:00
James Chen
521155e9e2
issue #1177 : Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.
2012-04-23 14:30:38 +08:00
James Chen
0c6d21c0f9
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
2012-04-20 17:34:47 +08:00
James Chen
909a759ff6
issue #1177 : Updated android project configuration.
2012-04-20 17:33:28 +08:00
James Chen
d1d0fd619a
issue #1177 : Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration.
2012-04-20 15:23:00 +08:00
minggo
160c94dd46
fixed #1179 : popup message box when invoking CCAssert on Android
2012-04-20 15:12:20 +08:00
minggo
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +08:00
James Chen
dbeb7423ad
Merge branch 'iss1176_refactor' of https://github.com/dumganhar/cocos2d-x into iss1176_refactor
2012-04-19 17:53:15 +08:00
James Chen
f619c3e006
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1176_refactor
...
Conflicts:
cocos2dx/misc_nodes/CCRenderTexture.cpp
2012-04-19 17:51:58 +08:00
minggo
4e4a26a2db
Merge pull request #855 from minggo/iss1150_rendertexture_crash
...
use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 02:05:04 -07:00
minggo
92043b4db3
fixed #1150 : use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 17:01:24 +08:00
James Chen
5b50baffd4
issue #1176 : Updated ios project.
2012-04-19 15:03:41 +08:00
James Chen
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
James Chen
84ffaf130a
delete semicolon after NS_CC_BEGIN and NS_CC_END
2012-04-19 11:56:22 +08:00
James Chen
4068be84e9
Refactored project folders.
2012-04-19 11:46:08 +08:00
James Chen
32b53623c7
Removed some unused folders regard to WOPHONE.
2012-04-19 10:52:53 +08:00
James Chen
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
James Chen
a950238d1e
updated some files.
2012-04-18 18:45:21 +08:00
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
James Chen
e673bfae90
fixed #1114 : Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Added some resources.
2012-04-18 13:58:24 +08:00
James Chen
c501255a7a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1114_CCControlExt
2012-04-18 09:40:08 +08:00
James Chen
f8dfe1fca0
issue #1114 : Updated ShaderTest.Added ShaderBlur.
2012-04-17 18:31:31 +08:00
minggo
4d2e2d7183
fixed #1139 : remove unneeded codes
2012-04-17 18:03:48 +08:00
minggo
7750664f8b
fixed #1139 : re add preprocess macro
2012-04-17 18:01:15 +08:00
minggo
cfdc5edf87
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black
2012-04-17 17:55:59 +08:00
minggo
04c0d794af
fixed #1139 : fix the bug that screen becomes black when backing to foreground on Android
2012-04-17 17:55:26 +08:00
James Chen
75da752aa9
issue #1114 : fixed some memory leaks in CCControlExtension.
2012-04-17 17:14:59 +08:00
James Chen
14c10a470a
Updated project configuration for android platform.
2012-04-17 16:41:07 +08:00
James Chen
a215b037b2
fixed a bug in CCControlSwitch.cpp
2012-04-17 16:39:00 +08:00
James Chen
5ce950b961
fixed a memory leak in CCControl.
2012-04-17 16:37:04 +08:00
James Chen
92e44f1c78
Updated ios project configuration.
2012-04-17 16:14:32 +08:00
James Chen
413bc3c343
Finished CCControlSwitch.Added CCActionTween.
2012-04-17 16:00:18 +08:00
James Chen
d4f1dcfc44
finished CControlColourPickerTest.
...
moved extension resources to 'extensions' folder.
2012-04-17 11:12:05 +08:00
James Chen
044729dab9
Updated CCControlExtension
2012-04-16 23:16:03 +08:00
James Chen
959acd556f
first commit CCControlExtension.
2012-04-16 18:58:43 +08:00
James Chen
77919439bc
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 15:41:01 +08:00
James Chen
0af443a56f
issue #1166 : Checked whether memory is allocated successfully in CCString::initWithFormatAndValist function.
2012-04-16 14:27:49 +08:00
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
James Chen
88951bfeec
fixed #1165 : Close retinaDisplay for HelloWorld by default. Removed ENABLE_ALL_SHADER macro. Fixed some issues in CCSprite.cpp.
2012-04-16 12:00:35 +08:00