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 |
minggo
|
4c9771ba3c
|
rename some class names to obey cocos2d-x coding style
|
2013-09-20 19:19:31 +08:00 |
James Chen
|
c38dfb6a17
|
issue #2087: Setting default touch priority to -1 for CCInputDelegate
|
2013-09-19 09:24:11 +08:00 |
James Chen
|
d7274b9475
|
issue #2087: Should not use fixed priority with 0 value, it's for scene graph based priority.
|
2013-09-19 09:19:03 +08:00 |
James Chen
|
db98d662af
|
issue #2087: Fixing crash of ComponentTest.
|
2013-09-19 09:15:56 +08:00 |
James Chen
|
3fbf61ad52
|
issue #2087: Adding CustomEvent and CustomEventListener classes. Make Event and EventListener as abstract classes.
|
2013-09-19 09:14:51 +08:00 |
Liam
|
3515a4f286
|
limited action frame index
|
2013-09-18 16:36:16 +08:00 |
minggo
|
801b7831df
|
Merge pull request #3671 from chengstory/#4684
Remove unused files from mk files.
|
2013-09-17 22:08:38 -07:00 |
zhangcheng
|
820b8630dc
|
1. fixes failed to build linux.
|
2013-09-18 11:51:14 +08:00 |
zhangcheng
|
529d43544f
|
1. rename CCCActionFrameEasing.cpp to CCActionFrameEasing.cpp.
|
2013-09-18 11:22:30 +08:00 |
zhangcheng
|
0708edb762
|
1. remove CocoStudio/GUI/Action *.cpp *.h
|
2013-09-17 23:45:53 +08:00 |
James Chen
|
f403f7d683
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test
Conflicts:
samples/samples.xcodeproj/project.pbxproj
|
2013-09-17 23:24:14 +08:00 |
James Chen
|
513237d5f6
|
Fixing armature test crash.
|
2013-09-17 23:03:33 +08:00 |
zhangcheng
|
c065dd2920
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
|
2013-09-17 22:41:42 +08:00 |
zhangcheng
|
a1d2045793
|
1.rename cocoaction system files
|
2013-09-17 22:39:42 +08:00 |
CaiWenzhi
|
1f45bad5e7
|
Modify guy example
|
2013-09-17 21:19:04 +08:00 |
zhangcheng
|
ec401d1148
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
|
2013-09-17 21:15:36 +08:00 |
zhangcheng
|
b86a8271d9
|
1. Upload Cocostudio Action.
|
2013-09-17 21:14:45 +08:00 |
CaiWenzhi
|
d9721a41dd
|
Merge branch 'develop' into Merge_GUI_to_Develop
|
2013-09-17 21:01:50 +08:00 |
James Chen
|
e3a34bd5c5
|
Merge pull request #3657 from 2youyouo2/develop
update armature[ci skip]
|
2013-09-17 05:45:17 -07:00 |
CaiWenzhi
|
f42797bc0d
|
Merge branch 'develop' into Merge_GUI_to_Develop
|
2013-09-17 20:43:16 +08:00 |
CaiWenzhi
|
841408d1bc
|
Modify events methods
|
2013-09-17 20:34:26 +08:00 |
2youyou2
|
57ec881727
|
support set tween key
|
2013-09-17 20:14:08 +08:00 |
CaiWenzhi
|
9d07b2c1d2
|
Temp commit
|
2013-09-17 20:13:23 +08:00 |
James Chen
|
1896305fcb
|
closed #2450: Fixing HttpClientTest crashes on 64bit system.
|
2013-09-17 18:21:20 +08:00 |
CaiWenzhi
|
9d6d9dcd19
|
Add getDescription method
|
2013-09-17 17:59:20 +08:00 |
2youyou2
|
07f72ac1b4
|
Change rotation range from(-180 -- 180) to (-infinity -- infinity)
|
2013-09-17 16:40:47 +08:00 |
zhangcheng
|
a25c2cabf8
|
1. Fixes failed to build windows.
2. Upload CocoGUI Resources.
|
2013-09-17 13:25:15 +08:00 |
James Chen
|
28b266bc5e
|
[Android] Android.mk fixes after adding GUI test.
|
2013-09-17 10:49:59 +08:00 |
James Chen
|
157ffa9299
|
Merge pull request #3627 from nutty898/Merge_GUI_to_Develop
Merge gui to develop 3.0 branch
|
2013-09-16 07:45:23 -07:00 |
CaiWenzhi
|
0b48552f04
|
Modify scene reader
|
2013-09-16 21:07:11 +08:00 |
James Chen
|
b128018f76
|
Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996
Conflicts:
extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
|
2013-09-16 20:58:26 +08:00 |
CaiWenzhi
|
759fcc147b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop
|
2013-09-16 20:55:55 +08:00 |
CaiWenzhi
|
ca599b4852
|
Merge guy to 3.0 branch
|
2013-09-16 20:54:13 +08:00 |
signmotion
|
5dffb1b44e
|
Deprecated methods are replaced (warning MSVC C4996 is suppressed).
|
2013-09-16 15:38:03 +03:00 |
James Chen
|
72c2d4ca35
|
Merge branch 'develop' into 2youyouo2-develop
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
|
2013-09-16 20:12:03 +08:00 |
James Chen
|
c12a655fdf
|
[GUI] Fix compilation error on win32.
|
2013-09-16 20:05:25 +08:00 |
James Chen
|
621e682e6e
|
[GUI] Fixing compilation errors for win32.
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
|
2013-09-16 20:00:48 +08:00 |