minggo
|
716769241a
|
Merge pull request #6938 from CaryZheng/v3
Simplify BlendFunc operator< judgement
|
2014-06-06 15:29:33 +08:00 |
Ricardo Quesada
|
79ebc546f8
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
|
2014-06-04 09:19:22 -07:00 |
andyque
|
d089b251db
|
fix other platform compile error
|
2014-06-04 14:56:34 +08:00 |
andyque
|
f0d38290a1
|
refactor ObjectFactor and move it to base
|
2014-06-04 14:56:34 +08:00 |
minggo
|
7bf2be6033
|
Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
Bugfix autorelease pool manager
|
2014-06-04 14:31:30 +08:00 |
Kezhu Wang
|
eb8e08ccdd
|
prefer std::vector to other containers
|
2014-06-03 19:09:48 +08:00 |
Kezhu Wang
|
f1ce9e032d
|
remove unnecessary cache-variable
|
2014-06-03 19:08:28 +08:00 |
Kezhu Wang
|
1eb991df59
|
bugfix related to AutoreleasePool's PoolManager
* duplicated AutoreleasePool added to PoolManager in
PoolManager::getInstance()
* redundant pop_back() in PoolManager::~PoolManager()
|
2014-06-03 18:57:52 +08:00 |
minggo
|
691a77b148
|
Merge pull request #6928 from boyu0/bug5392_scheduleUpdate
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
|
2014-06-03 14:38:07 +08:00 |
Ricardo Quesada
|
1b8d0d88df
|
Adds setNormalizedPosition()
Changes in `visit()` were done in order to do it
in a robust and fast way.
|
2014-05-30 16:42:05 -07:00 |
CaryZheng
|
3b99c5ea42
|
Modify BlendFunc operator< judgement
|
2014-05-30 17:57:27 +08:00 |
boyu0
|
56590f09eb
|
change comment.
|
2014-05-30 17:40:35 +08:00 |
boyu0
|
dd0771852f
|
change comment.
|
2014-05-30 17:36:54 +08:00 |
CaryZheng
|
28954fddd0
|
Simplify BlendFunc operator< judgement
|
2014-05-30 00:23:58 +08:00 |
Nick Barrios
|
7bac05a497
|
CCUserDefault.cpp: Should not compile on Mac platform (should be using CCUserDefault.mm implementation).
|
2014-05-29 10:36:15 -04:00 |
boyu0
|
5e62c4e069
|
closed #5392: add comment for unscheduleUpdate() at schedulePerFrame()
|
2014-05-29 15:16:11 +08:00 |
boyu0
|
91db87a2f6
|
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
|
2014-05-29 13:51:43 +08:00 |
John_He
|
8233b5bf93
|
fix mingw32/mingw64 compiling
|
2014-05-28 00:17:09 +08:00 |
vision
|
d392fad70f
|
udpate the comments
|
2014-05-27 14:51:13 +08:00 |
vision
|
5764677bba
|
update the comments
|
2014-05-27 14:40:55 +08:00 |
vision
|
e81db73b0a
|
adding comments for the new utility.
|
2014-05-27 14:29:52 +08:00 |
vision
|
bfd945c592
|
remove unused variables
|
2014-05-27 10:47:25 +08:00 |
vision
|
363fd8dc2a
|
move the capturen screen interface from Director to ccUtils
|
2014-05-27 10:44:23 +08:00 |
vision
|
c72ae9e3c5
|
merge from the latest v3
|
2014-05-26 20:18:11 +08:00 |
vision
|
f40f0e0bb9
|
more define check
|
2014-05-26 17:00:31 +08:00 |
vision
|
21f7e34d18
|
remove unused variables
|
2014-05-26 13:49:00 +08:00 |
vision
|
7edfe78f7d
|
remove the parameter rect
|
2014-05-26 13:42:47 +08:00 |
vision
|
e263c5f2de
|
use shared_ptr for better readibility
|
2014-05-22 23:34:27 +08:00 |
vision
|
7d76d774e4
|
no need to use a singleton inside Director class
|
2014-05-19 10:00:56 +08:00 |
vision
|
81ddbaa7b1
|
update the calculation of device pixel resolution
|
2014-05-19 01:12:56 +08:00 |
Ricardo Quesada
|
0f67247325
|
Squashed commit of the following:
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
|
2014-05-16 14:36:00 -07:00 |
minggo
|
540418840b
|
Merge pull request #6737 from seobyeongky/dispatcher_bug_fix
EventDispatcher bug fix
|
2014-05-16 18:35:51 +08:00 |
minggo
|
eb38809630
|
Merge pull request #6756 from zifter/FixTwiceCallingOnExit
Fix twice calling on exit
|
2014-05-16 17:10:42 +08:00 |
zifter
|
c8a1004a4d
|
Little refactor.
|
2014-05-15 09:43:18 +03:00 |
byeonggee.seo
|
c6f2a2aeb3
|
name fix
|
2014-05-15 10:19:59 +09:00 |
zifter
|
287b10f070
|
Fixed double calling onExit method.
|
2014-05-14 23:28:47 +03:00 |
Ricardo Quesada
|
dc711643cd
|
Squashed commit of the following:
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
|
2014-05-14 10:07:09 -07:00 |
vision
|
90e2b8a4af
|
move the method from ccUtils to Director
|
2014-05-14 19:42:24 +08:00 |
minggo
|
d46362abb3
|
Merge pull request #6681 from minggo/director-fix
[ci skip] don't trigger onExitTransitionDidStart
|
2014-05-14 18:24:26 +08:00 |
byeonggee.seo
|
76cd9911cb
|
bug fix
|
2014-05-14 18:58:55 +09:00 |
James Chen
|
4c23ff5b8c
|
trackRef and untrackRef are static function now.
|
2014-05-14 11:55:20 +08:00 |
James Chen
|
54176b0267
|
Include <algorithm> for std::find
|
2014-05-14 10:31:09 +08:00 |
James Chen
|
c14482254d
|
Fixes wrong indention and whitespace cleanup
|
2014-05-14 10:25:45 +08:00 |
James Chen
|
ba3f5f8eee
|
Updates indention in CCRef.h
|
2014-05-14 10:17:08 +08:00 |
James Chen
|
72d29976c3
|
Disables memory tracker by default
|
2014-05-14 10:16:05 +08:00 |
James Chen
|
eb8f07370c
|
Remove a comment in CCRef.cpp
|
2014-05-14 10:12:49 +08:00 |
James Chen
|
d9d4d9d51a
|
Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses
|
2014-05-14 10:07:03 +08:00 |
Ricardo Quesada
|
31dd70dba2
|
Matrix::identity() -> IDENTITY
consistency with the rest of the cocos2d API
|
2014-05-13 10:26:25 -07:00 |
minggo
|
05c16de87a
|
Merge pull request #6715 from dumganhar/iss5160-animation-notification
closed #5160: Dispatch a custom event after an animation frame is displayed
|
2014-05-13 18:38:44 +08:00 |
James Chen
|
d0c98d6269
|
Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables.
|
2014-05-13 17:03:48 +08:00 |