Ricardo Quesada
ddb0111392
continue replacing `const char*` with `const std::string&`
...
This patch includes:
* Continue replacing `const char*` with `const std::string&` where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -08:00
James Chen
9be8ca3714
[cmake] output lib to root/lib
2013-11-04 21:03:08 +08:00
James Chen
922924e1ab
TestCpp is ok.
2013-11-04 21:03:07 +08:00
samuele3
790be0decc
issue #3037:Modify vs2012 config
2013-11-04 14:43:22 +08:00
James Chen
50c4261092
closed #3104 : Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
2013-11-01 20:53:51 +08:00
samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
James Chen
48ce5e39fe
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
2013-10-26 15:04:01 +08:00
James Chen
262b54eef2
issue #3069 : Updating ScrollView.
2013-10-25 16:06:52 +08:00
James Chen
1f3863e787
Event Dispatcher refactor commit. TestCpp could run.
2013-10-25 10:53:45 +08:00
James Chen
cfaef2a01a
Adding onEnterHook, onXXXHook for Node.
2013-10-25 10:53:45 +08:00
James Chen
d8683ef705
Merge pull request #3988 from lite3/develop
...
closed #3060 : The Node's anchor point was changed after being added to ScrollView.
2013-10-24 03:01:49 -07:00
samuelhu
26caaa0a36
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-23 09:57:21 +08:00
minggo
abcf8f268d
fix conflicts
2013-10-22 18:36:13 +08:00
minggo
6a664d480a
issue #2905:samples build ok on linux
2013-10-22 18:01:56 +08:00
samuelhu
5f769b2313
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-22 16:52:44 +08:00
samuelhu
be1f17ca0f
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-22 16:14:49 +08:00
lite3
c6f9f0e406
do not change anchor point of child.
2013-10-22 11:30:53 +08:00
Dhilan007
f11dba586a
issue #2905:modification vs-project for folder structure change
2013-10-21 22:09:21 +08:00
Dhilan007
8fb0327597
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-18 14:57:33 +08:00
minggo
63c13d8eaa
issue #2905:simplify Android.mk dependence
2013-10-18 14:18:36 +08:00
Dhilan007
c6344875de
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-16 17:30:51 +08:00
minggo
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00
Dhilan007
5116e91c4b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905
2013-10-16 11:00:22 +08:00
minggo
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
Dhilan007
2865ad798b
issues #2905:Updating project configuration for folder change.
2013-10-15 10:18:37 +08:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
minggo
f3f24e3bbd
issue #2905:use - to connect multiple words
2013-10-12 13:54:16 +08:00
minggo
ad6325b0dd
fix conflicts
2013-10-12 11:31:32 +08:00
minggo
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00
James Chen
edcf9fecb4
[Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'.
2013-10-11 21:52:28 +08:00
James Chen
f05225ae4c
Merge pull request #3888 from ktaobo/avoid-copy
...
Avoid unnecessary object duplication using passing arguments by reference
2013-10-11 00:09:28 -07:00
Keita Obo
43c2001d71
Avoid unnecessary object duplication using passing arguments by reference
2013-10-10 22:06:10 +09:00
minggo
6e62be5443
issue #2905 : modify makefile to include correct header files
2013-10-10 17:39:53 +08:00
minggo
866906fd58
issue #2905:modify project settings to include correct audio path
2013-10-10 15:40:06 +08:00
rablwupei
5ea249a265
fix memory leak
2013-10-08 20:03:10 +08:00
Dhilan007
cafe930026
issues #2774:AssetsManager Test downloading progress label not sync with actual download.
2013-09-29 09:48:55 +08:00
CaiWenzhi
72f02f47a0
Modify version
2013-09-26 14:16:22 +08:00
CaiWenzhi
8a2cdf5a48
Modify wrong codes.
2013-09-25 19:04:37 +08:00
James Chen
3ffad35f0e
Merge pull request #3741 from signmotion/develop
...
Fixed some compiling-warnings (MSVC2012).[ci skip]
2013-09-24 02:27:14 -07:00
CaiWenzhi
f4471ae93c
Modify layout enum
2013-09-23 21:26:44 +08:00
CaiWenzhi
be7c7a5f0b
Modify windows project.
2013-09-23 19:54:43 +08:00
CaiWenzhi
fa892c2158
Remove layoutexecutant class
2013-09-23 19:16:20 +08:00
Michael Contento
f6dcf88685
Prevent nullptr access in AssetsManager
2013-09-23 12:05:22 +02:00
Liam
c4dfdbcb14
change to use CC_SAFE_RELEASE_NULL and CC_SAFE_RETAIN
2013-09-23 14:44:55 +08:00
Liam
082e28b631
fixed action node crash
2013-09-23 14:34:50 +08:00
signmotion
7d139a3bc3
Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false').
2013-09-22 23:50:54 +03:00
Liam
e8cf0a1485
add judgment for retaining _actionSpawn
2013-09-22 23:55:12 +08:00
Liam
0840baa1ab
retan ActionNode _actionSpawn while create
2013-09-22 22:49:25 +08:00
minggo
261f0e4f05
rename some files
2013-09-21 14:40:54 +08:00
minggo
bcb171e3c9
fix line end in windows
2013-09-20 22:23:13 +08:00