samuele3hu
ec2f5376f1
issue #2244:Add namespace to some enums
2013-07-05 16:05:38 +08:00
samuele3hu
c0e89a4ee9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-05 09:49:01 +08:00
minggo
7bcafb46a4
Merge pull request #3051 from samuele3hu/execDev
...
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
2013-07-04 03:33:12 -07:00
samuele3hu
b0e4757c24
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-04 17:54:02 +08:00
samuele3hu
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +08:00
minggo
1d94ce12a2
Merge branch 'const_love' of https://github.com/ricardoquesada/cocos2d-x into const_love
2013-07-04 10:29:56 +08:00
Ricardo Quesada
adaa72fbb4
Adds const to getters
...
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
2013-07-03 17:22:15 -07:00
YangLe
18b662c942
fix CCScale9Sprite for rotated sprite frame
...
fix Issue #1145
2013-07-04 00:03:44 +08:00
samuele3hu
ec801ae89d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-02 15:29:19 +08:00
samuele3hu
9b08cee01f
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
2013-07-02 15:23:51 +08:00
Ricardo Quesada
b434f7332a
Removes #if from header class
...
preventing ugly bugs
2013-07-01 11:52:04 -07:00
James Chen
8b1325b544
Merge pull request #3034 from Squallium/develop
...
Added CocosDenshion dependency to libextension project
2013-07-01 01:54:02 -07:00
Squallium
c3e043ef20
Added CocosDenshion dependency to libextension project
2013-06-30 21:38:06 +02:00
Ricardo Quesada
b846a3060e
cocos2d-x in Mac:
...
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
2013-06-28 19:02:10 -07:00
Ricardo Quesada
5bb256e837
Merge branch 'develop' into js_mac
2013-06-27 10:48:58 -07:00
Ricardo Quesada
ccd9cb486c
JS Tests compiles and links in Mac
...
...but it doesn't work yet due to a bug with the touch events :-(
2013-06-27 00:58:46 -07:00
James Chen
00d6510a0d
Merge pull request #3014 from wtyqm/develop
...
close #2338 : fix sub ccb node resource root path bug
2013-06-26 20:49:00 -07:00
wtyqm
ab36c433fa
fix sub ccb node resource root path bug
...
When load sub ccb type node , create a new ccbreader from parent
ccbreader. Should copy ccbRootPath from parent, otherwise, load
resource will fail if sub ccb node resource use special path
2013-06-27 09:41:38 +08:00
Justin Hawkwood
9067918d73
Set textview_hidden to true on init
2013-06-26 13:44:49 -07:00
minggo
72937aa6d8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2305-replace-pthread
2013-06-26 14:47:31 +08:00
James Chen
ad7d606b48
Merge pull request #2703 from sergey-shambir/linux_qmake
...
close #2332 : [Linux] Adding project part for QtCreator.
2013-06-25 21:57:20 -07:00
James Chen
ae737365d7
issue #2305 : Sleep(50) on Win32, usleep(50000) on unix --> std::this_thread::sleep_for(std::chrono::milliseconds(50));
2013-06-26 11:34:04 +08:00
James Chen
ea36707c57
issue #2305 : Using the old logic of "wait".
2013-06-26 11:10:19 +08:00
James Chen
3ad11cc63a
issue #2305 : Fixing a bug that passing wrong mutex parameter to "wait".
2013-06-26 11:06:13 +08:00
James Chen
f2ab73c533
issue #2305 : Reverting to use lock and unlock for HttpClient.
2013-06-26 10:45:46 +08:00
James Chen
8a0046a139
issue #2305 : Fixing a crash when error is triggered in WebSocket. Using std::lock_guard to replace lock and unlock manually.
2013-06-26 10:11:10 +08:00
James Chen
79962cdf5d
issue #2305 : Using c++11 std::thread instead of pthread for HttpClient class.
2013-06-26 10:11:10 +08:00
James Chen
cfcc39d924
Merge pull request #2987 from dumganhar/iss2305-std-thread
...
issue #2305 : Using c++11 thread instead of pthread for WebSocket.
2013-06-24 21:54:09 -07:00
James Chen
3b9fa904ba
issue #2305:use c++11 thread instead of pthread for WebSocket.
2013-06-25 12:51:44 +08:00
Ricardo Quesada
ef6f67902f
Adds mac workspace
...
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
2013-06-24 18:04:05 -07:00
James Chen
d9985d07ce
Merge pull request #2981 from dumganhar/iss2325-ios-workspace
...
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 03:33:36 -07:00
James Chen
8dc8fec180
issue #2325 : Updating project configuration, tested on iPad 3.
2013-06-24 18:32:06 +08:00
James Chen
b870488aad
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 15:31:18 +08:00
minggo
f5ed772c22
issue #2305:remove unneeded comment
2013-06-24 14:11:30 +08:00
minggo
141105ac69
issue #2305:remove unneeded comment
2013-06-24 14:03:45 +08:00
minggo
e5a122ea39
issue #2305:use c++11 thread instead of pthread in AssetsManager
2013-06-24 13:59:41 +08:00
James Chen
53a372669a
closed #2322 : Updating all win32 project configurations, improvement by using Multi-processor Compilation.
2013-06-23 17:25:34 +08:00
James Chen
f1eaabb09f
issue #2322 : Fixing a warning in extensions/CCArmature/utils/CCDataReaderHelper.cpp.
2013-06-23 17:23:14 +08:00
samuele3hu
e36c6f544a
issue #2276 : Modify ScrollView and LuaScrollView class
2013-06-21 14:17:41 +08:00
samuele3hu
35f0b07aa6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 11:16:46 +08:00
James Chen
0879a12516
issue #2129 : Re-adds 'CC' prefix to objective-c classes for all projects.
2013-06-21 11:14:03 +08:00
samuele3hu
a862543a4c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 10:44:03 +08:00
James Chen
2a715ec3cf
Merge pull request #2956 from ricardoquesada/cc_namespace_obj
...
issue #2129 : Re-adds 'CC' prefix to objective-c classes.
2013-06-20 19:10:01 -07:00
Ricardo Quesada
578bce4bc8
Re-adds 'CC' prefix to objective-c classes.
...
And also makes it compile on Mac, which was broken
2013-06-20 17:46:22 -07:00
Sam Clegg
40766006bd
[NaCl] Fix NaCl build which had been disabled.
...
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc. This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
2013-06-20 12:56:12 -07:00
Sam Clegg
3686e8245f
[NaCl] Fix sigslot.h compilation on NaCl ARM
2013-06-20 10:54:11 -07:00
samuele3hu
71fe43ee97
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-20 22:40:21 +08:00
samuele3hu
15c69563e2
issue #2276 : Add ScrollView lua binding and test sample
2013-06-20 22:39:30 +08:00
Lee, Jae-Hong
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09:00
James Chen
cb67ed0227
issue #2129 : Removing CC prefix for extension module.
2013-06-20 14:15:53 +08:00