1053cacc16
don't trigger onExitTransitionDidStart
2014-05-12 15:05:21 +08:00
94f50b1856
Merge pull request #6535 from dumganhar/value-optimize
...
closed #5099 : Optimization for Value
2014-05-12 13:57:50 +08:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
a15dd55baa
closed #3861 , fixed some typo and indent problem
2014-05-06 12:04:52 +08:00
16ebe8d41c
issue #3861 , fix linux compile error
2014-05-06 09:40:50 +08:00
0995204abc
Optimization for Value
2014-05-05 19:00:46 +08:00
34b3114e55
issue #3861 . add license to CCEventFocus and CCEventListenerFocus
2014-05-05 17:49:31 +08:00
33f7a500f3
issue #4861 . add android keypad support
2014-05-05 11:37:38 +08:00
47acbc24e0
issue #4861 , add CCEventFocus and CCEventListener
2014-05-05 11:37:38 +08:00
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
0699aa94fe
Change Value::asBool() return false by default.
2014-04-30 15:07:26 +08:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
b053a9145a
Compiles on Windows32
2014-04-25 22:03:25 -07:00
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
efd16bc37e
Merge pull request #6264 from iSevenDays/patch-10
...
Fix loosing precision: int -> size_t for the return value of `recv`
2014-04-25 11:11:52 +08:00
477fc9f0e0
Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-04-25 10:59:11 +08:00
467ededeff
enabled console for wp8
2014-04-19 10:08:01 -07:00
3b83d52f95
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
2014-04-19 00:30:34 +08:00
30dec564e6
remove kazmath/kazmath.h include
2014-04-15 23:50:28 +08:00
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
e2a24dec84
replace Point with Vector2
2014-04-15 18:08:29 +08:00
917ae6e88b
deprecate Point, using Vector2 instead
2014-04-15 17:46:44 +08:00
312cd49b1a
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
2014-04-15 17:10:24 +08:00
d361efacae
add update
2014-04-15 17:10:11 +08:00
11fc8ac308
conversion from Vector2 and Point
2014-04-15 13:58:08 +08:00
3f496069b4
add interface in Vector2 for Point
2014-04-15 11:58:08 +08:00
ec5398e7c6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
2014-04-14 14:08:19 +08:00
503d270f8f
Fix loosing precision
...
I had a warning on building for iPhone 64 bit.
As you can see above variable "rc" has a type of size_t too( void Console::commandUpload(int fd) );
2014-04-13 01:55:43 +03:00
576d9d872c
Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next'
...
in ConsoleTest.
2014-04-11 20:07:54 +08:00
7af4d558c6
remove kmMat4 in AffineTransform.cpp
2014-04-11 17:19:32 +08:00
1670e07300
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
157fce785c
fix CCConsole linux crash
2014-04-10 18:31:28 +08:00
07ac817a7c
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-10 10:52:15 +08:00
890dd64d38
issue #4729 : some warning fixes and compilation error fixes on win32.
2014-04-10 01:29:13 +08:00
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
9d8d256bee
issue #4729 : Android build works ok.
2014-04-10 00:36:42 +08:00
43d6e1176a
issue #4729 : Compilation error fixes for linux
2014-04-10 00:36:42 +08:00
5b296a62e9
issue #4729 : Moved deprecated classes to 'cocos/deprecated' folder
2014-04-10 00:36:41 +08:00
504fa2aa60
remove kmMat4 interface in AffineTransform
2014-04-09 14:21:41 +08:00
93724b3806
Add in missing template parameter in function arg.
2014-04-08 12:34:22 -07:00
cbf85259cd
Convert tabs to spaces
2014-04-08 11:44:54 -07:00
14b210a082
RefPtr<T> - add move semantics
...
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
2014-04-08 11:34:27 -07:00
9391906738
modify const char* to std::string in CCConsole.
2014-04-08 18:20:06 +08:00
4e1284bd45
closed #4533:fix console upload hang issue
2014-04-08 14:52:53 +08:00
f147ef723a
Merge the alternate RefPtr<T> implementation
...
Merge in the version at: https://github.com/DarraghCoy/cocos2d-x/blob/add_refptr_class_alt_impl/cocos/base/CCRefPtr.h
This version sacrifices the ability to use forward references in some places in return for added type safety and ensures we can never assign a non cocos2d::Ref derived object to the pointer.
2014-04-07 16:04:00 -07:00
a3a3fa0907
fix Value's memory leak
2014-04-05 18:55:55 +08:00
411bb95025
add [director end] command's explain in CCConsole.cpp.
2014-03-28 13:50:06 +08:00
fb780f82da
add [director end] command in CCConsole.cpp.
2014-03-28 13:40:24 +08:00
036dc5542c
Add cocos2d::RefPtr<T>
...
This class which acts a smart pointer type class for cocos2d::Ref objects. Can be used to help automate memory management and remove manual retain/release calls from code, resulting in less code and less chance of errors. Also useful to implement the RAII idiom in certain scenarios, ensuring that an object gets released upon exiting a scope.
2014-03-26 15:30:15 -07:00
21ba509a35
Merge pull request #5989 from dumganhar/iss4559-ios-64bit
...
closed #4559 : Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
2014-03-26 15:27:57 +08:00
691442d80d
closed #4559 : Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
2014-03-26 15:04:11 +08:00
a374241f65
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
...
Windows Phone 8,0 cocos2d-x 3.0 changes
2014-03-26 13:58:46 +08:00
7a8db8271f
Merge pull request #5930 from andyque/Branch_issue4429
...
closed #4429 : Boolean value could not be written to specified plist file
2014-03-26 11:46:56 +08:00
b41879916c
issue #4429 , fixed Value to string precesion error
2014-03-24 12:03:25 +08:00
762433e8aa
enable CC_ENABLE_CACHE_TEXTURE_DATA for wp8
2014-03-22 06:12:04 -07:00
a14728f184
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:11:27 -07:00
347f91fcb6
Disabled console for wp8/winrt until networking code is added
2014-03-22 06:11:10 -07:00
6a4d459c77
Disabled console for wp8/winrt until networking code is added
2014-03-22 06:10:54 -07:00
cf86fd619f
fix lua bindings warnings
2014-03-20 16:48:12 +08:00
f26ae8a019
remove unused params warnings
2014-03-20 16:34:42 +08:00
e6645400a3
fix a paramers miss match
2014-03-20 14:54:09 +08:00
ae3310bffb
Merge branch 'develop' into fix_warnings
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2014-03-20 14:50:02 +08:00
7ae77c9335
fix cocos2dx engine internal warnings
2014-03-20 10:58:04 +08:00
bab53ef2bd
add test for ios and mac
2014-03-19 16:47:57 +08:00
cadbfbe9b1
add Bool Integer Float Double support to CCDictionary
2014-03-19 16:47:57 +08:00
fe1bc368ec
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:46:17 +08:00
4657b28c2d
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:42:36 +08:00
295bf7f7f2
rename variable
2014-03-17 11:06:50 +08:00
9167d39959
space
2014-03-15 18:18:56 +08:00
0a9ec91d6c
init Console variable
2014-03-15 18:13:29 +08:00
c033591e6a
[win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte.
2014-03-15 01:05:04 +08:00
600c661acb
remove script support
2014-03-07 15:12:46 +08:00
728d5f34de
CCConsole: add script support
2014-03-05 00:07:30 +08:00
fe574616f3
fix console loop
2014-02-26 23:51:45 +08:00
31a13a6262
remove unused function
2014-02-26 23:46:07 +08:00
9d6be63171
CCConsole:support file upload via telnet console
2014-02-26 23:41:47 +08:00
1dc6d1ad21
merge begin & end with one 'tap' command
2014-02-25 18:17:43 +08:00
6848e6dde0
use atof instead of stof to fix compile error on android
2014-02-25 16:31:21 +08:00
7f3aab2bfd
fix touchEnd lambda
2014-02-25 15:59:43 +08:00
f1376e7caf
fix help typo
2014-02-25 15:55:01 +08:00
a7d636f7bf
support touch swipe directive
2014-02-25 15:52:37 +08:00
e09a72f26d
add touch swipe
2014-02-25 11:47:53 +08:00
786aae2199
add touch move support
2014-02-25 11:04:59 +08:00
2f4e96527b
remove unused declare
2014-02-24 17:50:40 +08:00
9777c6e2a5
use closesocket insteadof close on windows
2014-02-24 16:51:08 +08:00
5956c3a380
fix compile on windows
2014-02-24 15:05:20 +08:00
4a2633933e
remove early cleanup
2014-02-24 14:28:19 +08:00
02230add0c
use closeSocket() on windows
2014-02-24 14:24:14 +08:00
be45047b6b
use send/recv to replace write/read
2014-02-24 12:01:04 +08:00
92571ebe04
merge upstream/develop
2014-02-22 22:58:24 +08:00
5376b6333e
fix CCConsole crashed on windows, windows use send/recv(winsock) instead of read/write in unix to do socket i/o, create socketWrite/socketRead to wrap socket i/o function
2014-02-22 22:37:12 +08:00
b300cfa1d2
issue #4106 : Updates comments for 'Vector::eraseObject'
2014-02-21 11:30:55 +08:00
c6b2b86fe5
closed #4106 : Object which isn't in Vector would also be released when invoking Vector::eraseObject.
...
Also refactored 'Vector::eraseObject':
1) Removed 'toRelease' parameter, Vector class should manage reference count.
2) Added 'removeAll' parameter to decide wether to remove all elements with the same value or just the first occurrence .
3) Added relevant UnitTest for 'Vector::eraseObject'.
2014-02-21 11:24:37 +08:00
2eb1c1bb73
issue #4106 : Ref class's constructor should be protected.
2014-02-21 11:21:08 +08:00
minggo