WenhaiLin
2caff4e64d
[ci skip]Update comments
2015-03-24 14:12:58 +08:00
WenhaiLin
1450dfbc7b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen
2015-03-24 11:26:10 +08:00
minggo
4973de2b25
add more doxygen document
2015-03-24 11:15:40 +08:00
minggo
9976885d37
Merge pull request #11079 from fusijie/cocosapi
...
add comments.
2015-03-24 09:50:19 +08:00
minggo
13062a36fb
Merge pull request #11088 from minggo/disable-travis-building
...
[ci skip]Disable travis building
2015-03-24 09:46:22 +08:00
minggo
2dfc0e11db
Merge pull request #11081 from VisualSJ/v3-docs
...
[ci skip] Add javascript notes...
2015-03-23 22:18:34 +08:00
minggo
67e0cd20d2
Merge pull request #11080 from SuYaoHui/cocosapi
...
[ci skip]Action,Sprite,TmxTiledMap,UTF8,GLView....
2015-03-23 22:18:00 +08:00
WenhaiLin
78a8ba7f98
[ci skip]Update comments
2015-03-23 22:17:59 +08:00
minggo
e86e954abf
add doxygen comment for CCVector.h
2015-03-23 22:13:04 +08:00
VisualSJ
b5fa6d2e95
[ci skip] Add javascript notes...
...
cocos/2d/CCMotionStreak.h
cocos/2d/CCParticleBatchNode.h
cocos/2d/CCParticleExamples.h
cocos/2d/CCParticleSystem.h
cocos/2d/CCParticleSystemQuad.h
cocos/2d/CCTransition.h
cocos/2d/CCTransitionPageTurn.h
cocos/base/CCConfiguration.h
cocos/base/CCTouch.h
2015-03-23 20:27:13 +08:00
Jacky
7f41b091e0
add comments.
2015-03-23 18:39:27 +08:00
SuYaohui
d8a033c2ef
Action,Sprite,TmxTiledMap,UTF8,GLView
2015-03-23 18:37:28 +08:00
minggo
3180f21640
Merge pull request #11068 from minggo/add-documentation
...
[ci skip]update document for CCValue.h
2015-03-23 16:25:38 +08:00
minggo
4143eae713
Merge pull request #11061 from fusijie/cocosapi
...
add comments.
2015-03-23 16:23:51 +08:00
Jacky
cc09b84153
add comments.
2015-03-21 18:02:56 +08:00
minggo
d28e5d61b6
Merge pull request #10998 from dingpinglv/Iss_Annotate
...
[ci skip] Added js annotates to -x
2015-03-19 22:09:43 +08:00
minggo
8e019de83b
Merge pull request #11003 from fusijie/cocosapi
...
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
2015-03-19 22:09:20 +08:00
minggo
f4e2469730
update document for CCValue.h
2015-03-19 21:52:56 +08:00
minggo
0648ac7ca0
Merge pull request #11004 from SuYaoHui/cocosapi
...
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
2015-03-19 21:47:32 +08:00
Jacky
85c04ff605
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
2015-03-19 21:41:40 +08:00
dingpinglv
3413c716df
Issue: Added js annotates to CCScheduler.h
2015-03-19 21:25:09 +08:00
SuYaohui
c295952c71
NodeGrid,Config,NS,ApplicationProtocol
2015-03-19 21:03:28 +08:00
dingpinglv
baa723a899
Issue : Added js annotates to CCController.h
2015-03-19 20:26:44 +08:00
minggo
1d37016912
Merge pull request #10962 from dingpinglv/Iss_Annotate
...
[ci skip] added js annotate to classes
2015-03-19 11:56:07 +08:00
minggo
aec86d7e61
Merge pull request #10967 from VisualSJ/v3-docs
...
Add javascript notes...
2015-03-19 11:52:44 +08:00
minggo
b469f460c7
Merge pull request #10968 from WenhaiLin/v3-update-document
...
[ci skip]Update document
2015-03-19 10:46:06 +08:00
WenhaiLin
e528531b4b
[ci skip]Update document
2015-03-19 10:38:12 +08:00
VisualSJ
62b3f537ce
Add javascript notes...Fixed error
2015-03-19 10:33:11 +08:00
dingpinglv
ee44f024f1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
...
Conflicts:
cocos/2d/CCActionGrid.h
cocos/2d/CCAnimation.h
cocos/2d/CCAnimationCache.h
cocos/base/CCRef.h
2015-03-18 21:58:07 +08:00
dingpinglv
a99c2c7893
Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h
2015-03-18 21:45:58 +08:00
minggo
7f825d3dae
update document for ccUtils.h
2015-03-18 21:45:00 +08:00
VisualSJ
3576df4b89
Add javascript notes...
...
cocos/base/CCDirector.h
2015-03-18 21:39:50 +08:00
VisualSJ
785214ae12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs
...
Conflicts:
cocos/base/CCAutoreleasePool.h
cocos/base/CCData.h
2015-03-18 21:38:56 +08:00
minggo
85811bd710
update document for CCUserDefault.h
2015-03-18 21:24:31 +08:00
VisualSJ
cb50c7d89a
Add javascript notes...
...
cocos/2d/CCActionPageTurn3D.h
cocos/base/CCAutoreleasePool.h
cocos/base/CCData.h
2015-03-18 20:51:18 +08:00
minggo
19fc6a1495
update document for CCScheduler.h
2015-03-18 20:37:43 +08:00
minggo
0408fc0667
update document for CCRef.h
2015-03-18 15:02:03 +08:00
minggo
be2af44583
update document for CCDirector.h
2015-03-17 22:32:26 +08:00
minggo
44c04153a6
update document for CCDataVisitor.h
2015-03-17 20:54:47 +08:00
minggo
36bf7c6d39
update document for CCAutoreleaseData.h
2015-03-17 20:49:00 +08:00
minggo
5b55e873d0
update document for CCAutoreleasePool.h
2015-03-17 20:15:50 +08:00
Vladimir Perminov
e745d5949a
Create Console before any sub systems
...
Sub system use cocos2d::log in constructors.
2015-03-16 20:22:20 +03:00
minggo
2ea88a30bb
Merge pull request #10817 from garfieldkwong/fix_autorelease_branch
...
fix issue autorelease will not release trigger by autorelease.
2015-03-16 14:47:30 +08:00
Martin Konopka
350b81501d
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
...
Initialization follows the order of declaration, not the order of the initialization list.
2015-03-12 23:47:58 +01:00
GarfieldKwong
656842d6f1
fix issue autorelease will not release trigger by autorelease.
2015-03-11 15:31:06 +08:00
mogemimi
de4105516a
Add const to Value::getDescription() function
2015-03-09 22:34:24 +09:00
Sergey
de284c98ce
MinGW build fix
2015-03-05 11:11:13 +03:00
Wenhai Lin
5af895b24d
Fixed the position of physics body is wrong when the position of parent node has been change.
2015-02-27 17:55:25 +08:00
minggo
80cf4439f2
Merge pull request #10241 from Dhilan007/v3-scheduled-fix
...
Fixed may access wrong memory address in Scheduler::schedule
2015-01-28 15:22:40 +08:00
minggo
b233d6928e
Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix
...
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
2015-01-28 15:16:23 +08:00
WenhaiLin
d9bb6192dc
Fixed may access wrong memory in Scheduler::schedule
2015-01-27 17:29:12 +08:00
Wenhai Lin
f2335fb3bc
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
2015-01-27 16:13:45 +08:00
minggo
0addc3fb1d
Merge pull request #10173 from tmr111116/fix_random_int_overflow
...
fix random int overflow
2015-01-23 16:38:08 +08:00
kompjoefriek
ca48c5e5dd
Fixed lots of compiler warnings
...
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
tmr111116
757bc03ba8
fix random int overflow
...
before:
```
random(2147483648, 2147483649): -2147483648
```
after:
```
random(2147483648, 2147483649): 2147483649
```
code:
```
int64_t min = int64_t(INT_MAX) + 1;
int64_t max = int64_t(INT_MAX) + 2;
auto rand = cocos2d::random(min, max);
CCLOG("random(%lld, %lld): %lld", min, max, rand);
```
2015-01-22 16:46:57 +09:00
minggo
954f372775
Merge pull request #10156 from vovkasm/fix-warnings
...
Fix warnings
2015-01-21 20:23:00 +08:00
Vladimir Timofeev
6e01cab380
Fix, thanks @minggo!
2015-01-21 13:19:43 +03:00
Vladimir Timofeev
610e24b453
Fix warning: CCLOG_STRING_TAG not used by enclosing it in platform ifdef. Provide empty SendLogToWindow implementation by default.
2015-01-21 13:07:21 +03:00
minggo
fde86c7fd2
Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix
...
Fixed the alpha channel of text color of system font not take effect
2015-01-21 11:09:27 +08:00
minggo
151146deff
Merge pull request #10103 from damorton/v3
...
Update CCRef.cpp
2015-01-20 16:09:35 +08:00
WenhaiLin
415bbeba21
Fixed the alpha channel of text color of system font not take effect
2015-01-20 16:04:14 +08:00
David
1e3ee08561
Update CCRef.cpp
...
Updated the comment explaining the Ref::retain and Ref::release functions for readability.
2015-01-20 07:32:18 +00:00
Nite Luo
d43a8cf9ca
Move setDepthTest to renderer
2015-01-15 16:54:27 -08:00
Nite Luo
9848a8133b
Fix Vertex Z issue
2015-01-15 16:41:07 -08:00
WenhaiLin
13b049a543
Fixed warns:truncation from double to float
2015-01-15 10:07:23 +08:00
Dale Stammen
32c14710e7
allow custom shaders for WinRT Universal App
2015-01-14 10:37:04 -08:00
Huabing.Xu
34582ba268
Merge branch 'v3' into v3_AddOptionsForCulling
...
Conflicts:
cocos/2d/CCLabel.cpp
2015-01-14 12:44:24 +08:00
minggo
5459149279
Merge pull request #9969 from huangshiwu/pointSize
...
DrawNode enable draw different size points
2015-01-14 11:38:31 +08:00
Huabing.Xu
610d31d601
adjust CC_USE_CULLING macro definition
2015-01-14 11:29:02 +08:00
minggo
0207c22cb6
Merge pull request #9953 from darkdukey/renderFix
...
Render fix
2015-01-14 11:06:33 +08:00
minggo
d320941ca1
Merge pull request #9963 from Dhilan007/v3-issue9898-fix
...
Fixed crash if dispatch event after remove event listener in callback
2015-01-14 10:59:42 +08:00
Huabing.Xu
f3d8798d39
add macro to enable to disable culling
2015-01-14 10:56:51 +08:00
Dale Stammen
5a4c6d75d8
clean up CC_USE_WEBP disabled for WP8 and WINRT
2015-01-13 14:37:22 -08:00
huangshiwu
fea492ab4f
DrawNode enable draw different size points
2015-01-13 22:30:50 +08:00
WenhaiLin
de645a7c9c
Fixed crash if dispatch event after remove event listener in callback
2015-01-13 18:35:32 +08:00
Nite Luo
45562f3203
optimize based on review commends
2015-01-12 22:52:20 -08:00
Nite Luo
1c10ae43bc
Merge branch 'v3' into renderFix
...
Conflicts:
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
2015-01-12 20:43:55 -08:00
Nite Luo
6dfc021c02
Merge renderqueue to one
2015-01-09 14:06:21 -08:00
minggo
a0aa5e716e
Merge pull request #9489 from newnon/v3_clang_static_analyzer_fix
...
Clang static analyzer crash fix
2015-01-09 15:32:46 +08:00
Nite Luo
b675a2ca61
Turn off Depth Write by default, only 3D opaque object will write to Depth buffer
2015-01-07 16:35:08 -08:00
Wenhai Lin
8524a5fb97
Improve performance of physics
2015-01-07 17:08:04 +08:00
Sergey
babbac4e38
comments
2015-01-06 14:45:10 +03:00
minggo
292fff3c29
Merge pull request #9746 from pandamicro/v3_origin
...
Current restart game will disable ActionManager
2014-12-31 15:50:33 +08:00
pandamicro
677f7ca1d3
Improve restart game
2014-12-31 15:32:59 +08:00
Dale Stammen
2948a0cdcd
used CreateMutexEx for WINRT and WP8
2014-12-30 21:24:05 -08:00
Dale Stammen
57f0ef41b4
added missing inet_pton() for windows phone
2014-12-30 16:39:26 -08:00
minggo
c78bf0f7aa
Merge pull request #9668 from pandamicro/v3_origin
...
Added restart game feature and getSearchPaths API in Manifest
2014-12-30 11:47:51 +08:00
pandamicro
ffd7c30c87
Polish restart implementation
2014-12-30 10:09:56 +08:00
minggo
212684fcd4
Merge pull request #9665 from andyque/fixLibpngWarning
...
Fix libpng warning
2014-12-29 10:00:43 +08:00
minggo
06cd28f524
Merge pull request #9618 from yinjimmy/bindAddress
...
support bind address for console
2014-12-29 09:52:01 +08:00
pandamicro
e3795c0223
Added restart game feature
2014-12-28 11:55:06 +08:00
SunLightJuly
4d08128e89
fixed bug which caused crash when display FPS: the value of "_secondsPerFrame" of Director was not be Initialized
2014-12-27 22:05:29 +08:00
andyque
9c974eebd0
fix libpng warning
2014-12-27 20:47:59 +08:00
yinjimmy
4567cf1c40
Fix: Address family not supported by protocol
2014-12-26 21:04:49 +08:00
yinjimmy
5bcd3d9a00
bind address is available for all platform
2014-12-26 16:02:24 +08:00
minggo
3581c00301
Merge pull request #9619 from yinjimmy/trackLogForWindows
...
Track log for windows
2014-12-26 09:28:23 +08:00
yinjimmy
b21eaab047
using suitable variable name
2014-12-25 19:39:44 +08:00
yinjimmy
b4a442cd8c
fix compile error on windows
2014-12-25 09:33:28 +08:00
minggo
42f1d5fdf3
Merge pull request #9601 from minggo/set-glcolor
...
Director supports setting clear color
2014-12-24 14:45:43 +08:00
minggo
b925689435
Director supports setting clear color
2014-12-24 11:53:38 +08:00
minggo
5d8e004b9b
Merge pull request #9600 from huangshiwu/v3_allocator_wp
...
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:54:16 +08:00
huangshiwu
01eeb15a8d
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:45:29 +08:00
yinjimmy
b46ee82e90
support bind address for console
2014-12-24 02:04:42 +08:00
yinjimmy
a26f62186b
track log for windows
2014-12-24 01:26:13 +08:00
minggo
dea483b6ef
performance improve
2014-12-23 18:07:22 +08:00
minggo
40d00e3d97
Merge pull request #9554 from super626/sync_load
...
create 3d sprite asynchronously
2014-12-23 12:00:13 +08:00
yangxiao
3d77c7535d
merge cocos
2014-12-23 10:35:35 +08:00
yangxiao
2309a524fd
simplify AsyncTaskPool
2014-12-23 10:12:37 +08:00
mannewalis
9d885fe664
default lock macros to nothing for unsupported platforms
2014-12-22 19:49:20 -05:00
mannewalis
09f2eed4b8
default lock macros to nothing for unsupported platforms
2014-12-22 19:46:16 -05:00
mannewalis
aad45d6952
fixing windows8 build
2014-12-22 19:43:40 -05:00
yangxiao
1ba826ea17
modify code style
2014-12-22 17:40:02 +08:00
minggo
20beb3b9e0
Merge pull request #9567 from joewan/v3-improve-perf
...
fix serious performance problem of Animate.
2014-12-22 14:57:26 +08:00
joewanchen
3765f87651
fix.
2014-12-21 00:49:23 +08:00
mannewalis
50bd3cf2b7
modify inline macro to work on windows
2014-12-19 10:57:19 -05:00
XiaoYang
6be4538f3d
Merge pull request #181 from songchengjiang/sync_load
...
fix errors on Windows
2014-12-19 13:33:20 +07:00
WenhaiLin
4366fb7230
Fix compile error on WIN32.
2014-12-19 11:49:40 +08:00
songchengjiang
f5f95c5693
fix errors on Windows
2014-12-19 11:30:51 +08:00
yangxiao
f4dbaa53e4
add to linux
2014-12-19 10:29:10 +08:00
yangxiao
5aad841080
add stop task
2014-12-19 10:22:02 +08:00
mannewalis
467a5e9c12
minor changes for linux build
2014-12-18 18:21:49 -05:00
mannewalis
c05a6c877d
adding files to cmake files
2014-12-18 18:10:13 -05:00
yangxiao
f54f8a4826
remove return value of enque
2014-12-18 16:16:04 +08:00
yangxiao
6e99698c59
Merge branch 'newcode' into sync_load
2014-12-18 14:03:07 +08:00
mannewalis
6b1f994c40
turn off global new delete
2014-12-17 13:55:14 -05:00
mannewalis
a6eab3c496
Merge branch 'v3' into mem_alloc_again
2014-12-17 11:59:24 -05:00
mannewalis
34a2f6f640
minor tweak
2014-12-17 11:56:19 -05:00
mannewalis
fd22242fb2
added locking semantics to fixed block allocator
...
pool allocator uses lockless semantics by default
2014-12-17 11:54:06 -05:00
mannewalis
a095635459
android fixes
2014-12-15 16:21:12 -08:00
mannewalis
b532ce74d8
diagnostics track allocator enable
2014-12-15 16:16:35 -08:00
mannewalis
c50bf94c59
removing Allocator<T> and inheriting base directly.
2014-12-15 09:34:25 -08:00
joewanchen
0cc4b58383
initialize _startPointCaptured.
2014-12-15 19:42:25 +08:00
yangxiao
5ad408530c
merge cocos
2014-12-15 17:47:05 +08:00
mannewalis
cb547413d2
fix range error on reporting all allocators
2014-12-13 11:45:08 -08:00
mannewalis
58be92b35f
added more diagnostic info.
...
still crashing, but only on device. Suspect a free(p) that was allocated with new.
2014-12-13 11:42:35 -08:00
mannewalis
e81e9a7f47
fixing some issues, still crashing, but want to keep changes.
2014-12-13 10:40:45 -08:00
Sergey
9a01b76fec
Clang static analyzer crash fix
2014-12-13 12:40:04 +03:00
mannewalis
7b2fea798a
add total count and fix remaining reporting issues
2014-12-12 17:16:44 -08:00
mannewalis
00da483e1b
minor changes
2014-12-12 14:54:24 -08:00
mannewalis
595b3c1cd2
some minor tweaks comments and logging
2014-12-12 10:54:59 -08:00
mannewalis
bc7757a366
adding allocator system
2014-12-12 08:57:06 -08:00
Dhilan007
8b78c181ce
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-10 18:11:07 +08:00
yangxiao
5bc74e55df
modify comment
2014-12-05 15:59:21 +08:00
yangxiao
b665daf2f8
add comment
2014-12-05 15:55:01 +08:00
yangxiao
60e1b54b1a
fix ~ThreadTasks() bug
2014-12-05 15:25:56 +08:00
yangxiao
c99185b755
add async load test
2014-12-05 15:01:30 +08:00
yangxiao
bc57e47ddb
add async task callback dipatcher, call it in the main thread
2014-12-04 18:31:10 +08:00
yangxiao
f17df4b0bc
add createAsync
2014-12-03 17:40:27 +08:00
Ricardo Quesada
bfb79b6a9e
CCRANDOM_() uses std::rand() because it can be seeded with std::srand()
...
plus other minor fixes in perf tests
2014-11-26 20:07:42 -08:00
Ricardo Quesada
96e089be76
Sprite Performance Test automation works OK
2014-11-26 16:55:39 -08:00
Ricardo Quesada
1361f2c619
Director users a low-pass filter to display the FPS
...
FPS is more stable. Uses a 5% low-pass filter
2014-11-26 13:31:44 -08:00
yangxiao
35020c7c71
async task pool
2014-11-26 11:28:14 +08:00
James Chen
cebfed108c
issue #8988 : Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHT_ALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode.
2014-11-26 10:41:14 +08:00
Vladimir Timofeev
a689fc4c7e
sync with upstream
...
Conflicts:
CMakeLists.txt
2014-11-20 12:19:00 +03:00
Eric Zhong
36e44dbaf9
set default priority to avoid warning
...
when call 'scheduleUpdate' and 'unscheuleUpdate' several times in one frame, it will get warning "warning: you CANNOT change update priority in scheduled function"
2014-11-18 22:05:56 +08:00
Vladimir Timofeev
1e8aeb7fd2
Minizip
...
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
2014-11-16 22:41:37 +03:00
Ricardo Quesada
dcc4c46d5b
Using std::swap instead of CC_SWAP
...
CC_SWAP is deprecated. Use `std::swap` instead.
2014-11-16 09:29:05 -08:00
Vladimir Timofeev
27ef26270c
Unify TinyXML2 usage.
...
* should be included as simple "tinyxml2.h", but on some files was "tinyxml2/tinyxml2.h", replace this.
* Add cmake/Modules/FindTinyXML2.cmake
* As tinyxml2 for now has not prebuilt, instead sources included, add their as subdirectory if USE_PREBUILT_LIBS
2014-11-15 14:43:50 +03:00
minggo
f753368246
Merge pull request #9017 from cpascal/fix_error_refleakdetection
...
Fixed compile error with CC_REF_LEAK_DETECTION
2014-11-13 18:56:46 +08:00
minggo
133d51cad1
Merge pull request #9026 from cpascal/fix_error_scriptbinding_off
...
Fixed compile error with CC_ENABLE_SCRIPT_BINDING=0
2014-11-13 18:53:40 +08:00
Mircea Rila
a643f05330
add touch callback types
2014-11-11 18:00:34 +02:00
cpascal
3dcce59e84
Fix error with CC_ENABLE_SCRIPT_BINDING=0
...
There are too much compile error if I set EE_ENABLE_SCRIPT_BINDING=0.
CCEventTouch and CCTouch related things...
This is temporary fix... Many source/header files must be patched for
the right way..
2014-11-06 07:20:41 +09:00
minggo
8a49ae0b07
Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization
...
Cleanup order of fields initialization.
2014-11-05 17:51:58 +08:00
cpascal
c1f85bac0e
Fixed compile error with CC_REF_LEAK_DETECTION
2014-11-05 16:23:25 +09:00
Ricardo Quesada
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
Miguel Ferreira
ad8ffa5de1
Fixed winrt DLL link errors when using extern consts
2014-10-29 10:47:02 +00:00
Dale Stammen
00f9e888d2
enable console for winrt
2014-10-23 07:01:04 -07:00
SunLightJuly
0cb8a3922b
fixed bug of definition of utils:: getCascadeBoundingBox()
2014-10-21 11:07:11 +08:00
Dhilan007
a5f838496c
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:25:24 +08:00
minggo
8eed0811fa
Merge pull request #8717 from MSOpenTech/wp8-dll
...
New version of WP8 for cocos2d-x v3.3
2014-10-16 09:33:43 +08:00
Anton Sokolchenko
fc35cc2efe
CMake fix for Mac Os X.
...
You can open project with CLion and see that everything works.
2014-10-15 00:19:29 +03:00
Dale Stammen
f54b408744
added check for WP8_SHADER_COMPILER
2014-10-14 14:14:38 -07:00
Dale Stammen
c8e4fe1fbf
enabled console for WinRT
2014-10-14 14:14:12 -07:00
Dhilan007
d3733c4a45
fixed compile error
2014-10-11 16:05:34 +08:00
martell
0d26b33eaa
mingw64: mirgrate to upstream minizip
2014-10-11 04:39:42 +01:00
Ricardo Quesada
e03fb86990
one more fix, oops
2014-10-10 18:28:05 -07:00
Ricardo Quesada
3cd2163558
more win fixes
2014-10-10 18:21:15 -07:00
Ricardo Quesada
ee3086ff8d
compiler fixes for windows
2014-10-10 17:41:11 -07:00
minggo
4d084496a3
Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP
...
added LuaStack::loadChunksFromZIP()
2014-10-10 22:14:55 +08:00
XiaoYang
b77559fe5d
Merge pull request #136 from songchengjiang/new_v3
...
Fixed CosOuterAngle error
2014-10-09 18:31:24 +08:00
yangxiao
222bf570f2
Merge branch 'newcode' into v3
2014-10-09 17:01:35 +08:00
songchengjiang
34efbf189a
Fixed getCosOuterAngle errors
2014-10-09 16:16:02 +08:00
songchengjiang
88012cf86b
Merge branch 'v3_new' into v3
...
Conflicts:
tests/lua-tests/src/Sprite3DTest/Sprite3DTest.lua
2014-10-09 15:49:50 +08:00
yangxiao
c087f31e94
modify return type of getDirection and getDirectionInWorld
2014-10-09 10:12:52 +08:00
SunLightJuly
763b54e5cb
added LuaStack::loadChunksFromZIP()
2014-10-08 17:30:14 +08:00
martell
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00
martell
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
martell
028d15921e
fix warning because of extra comma's
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:19:57 +01:00
Ricardo Quesada
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
Ricardo Quesada
cc3df75d1f
works on win32
...
std::iterators weren't used correctly
2014-10-02 15:46:47 -07:00
yangxiao
dbf564208b
move light from 3d to base
2014-09-28 16:02:12 +08:00
yangxiao
75e5ca30ee
merge cocos
2014-09-28 09:55:31 +08:00
andyque
aea729ef01
fix cmakelists.txt of linux platform
2014-10-09 12:01:22 +08:00
minggo
99064b091f
Merge pull request #8164 from super626/v3
...
move logic about camera from Director to scene
2014-09-26 23:29:58 +08:00
yangxiao
98d9cea774
merge cocos
2014-09-26 15:14:57 +08:00
minggo
bd56a71b1b
CC_USE_MEM_LEAK_DETECTION -> CC_REF_LEAK_DETECTION
2014-09-26 10:44:29 +08:00
yangxiao
6626655308
move render logic from Director to scene
2014-09-26 09:36:43 +08:00
yangxiao
eab0951c2d
reset
2014-09-25 16:07:57 +08:00
yangxiao
567c632d98
config max support light number in shader
2014-09-25 15:29:32 +08:00
yangxiao
56313aa895
merge cocos
2014-09-25 11:05:02 +08:00
yangxiao
c4d25d318f
light config
2014-09-19 11:11:23 +08:00
SunLightJuly
f9fbb1b789
call getCascadeBoundingBox() properly
2014-09-18 15:40:28 +08:00
SunLightJuly
855d8d7a72
moved getCascadeBoundingBox() to utils
2014-09-18 15:27:11 +08:00
minggo
68ab3082b4
fix warnings
2014-09-15 16:23:57 +08:00
Ricardo Quesada
525fecc4ce
even more cmake fixes
2014-09-11 17:36:49 -07:00
yangxiao
a980a2efa4
merge cocos
2014-09-10 10:28:59 +08:00
Ricardo Quesada
0972506bf5
compiles and runs on linux
2014-09-09 17:41:49 -07:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
Ricardo Quesada
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
2014-09-09 12:18:31 -07:00
yangxiao
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
yangxiao
88ec0392a0
remove unused method
2014-09-04 17:15:28 +08:00
yangxiao
bb90fe48ef
merge cocos
2014-09-03 16:54:17 +08:00
yangxiao
39e33cbf71
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-09-02 11:12:24 +08:00
yangxiao
de3921c101
fix render stats bug
2014-09-02 11:12:15 +08:00
lite3
74d8bf6f27
fix
2014-09-02 10:51:17 +08:00
Ricardo Quesada
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
minggo
444b298028
fix compiling error on windows
2014-08-29 16:44:20 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
songchengjiang
701d70fb6c
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-29 10:58:04 +08:00
songchengjiang
96e6595e95
Added getInverseViewMatrix
2014-08-29 10:42:02 +08:00
lite3
2b6bdac05d
Merge branch 'v3' into customguireader
2014-08-28 15:13:10 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
minggo
c935a39090
Merge pull request #7879 from dabingnn/v3_fixLabelStatus
...
fix LabelStatus string error when labelStatus is recreated
2014-08-26 14:51:08 +08:00
Huabing.Xu
ef472d6250
fix LabelStatus string error when labelStatus is recreated
2014-08-25 17:19:45 +08:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
minggo
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
samuele3hu
d1b4d43a0b
Remove CCModuleManager.h/cpp and adjust the related project
2014-08-22 15:10:46 +08:00
minggo
21cb90bf12
Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR
...
Migrate some changes from Cocos2d-JS to -x
2014-08-21 22:38:59 +08:00
pandamicro
634847412b
Reverse CC_CONSTRUCTOR_ACCESS modification
2014-08-21 19:36:28 +08:00
pandamicro
34b93a24ff
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
...
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
2014-08-21 16:07:19 +08:00
pandamicro
5fb9f59633
Fix small issues
2014-08-21 15:40:53 +08:00
minggo
b349ce43ae
use macro to control whether to use jpeg, tiff, webp or not
2014-08-21 15:19:26 +08:00
pandamicro
909dd0d397
Update #3897 : Refactor missed protected constructors
2014-08-21 15:11:33 +08:00
lite3
c136e8e079
fix indent
2014-08-21 02:15:27 +08:00
lite3
679d525453
Merge branch 'v3' into customguireader
2014-08-21 01:22:07 +08:00
lite3
9f348962c7
Merge branch 'v3' into customguireader
2014-08-21 00:18:30 +08:00
minggo
f3b211351b
Merge pull request #7830 from dabingnn/v3_addPrimitiveheadFie
...
V3 add primitivehead fie
2014-08-20 16:04:27 +08:00
Huabing.Xu
22db2abcaf
add != operator in Blendfunc
2014-08-20 14:21:13 +08:00
minggo
bbf5c56e83
Merge pull request #7827 from andyque/ccRandom
...
add c++11 random library support
2014-08-20 13:35:12 +08:00
andyque
34629f1014
fix windows & win8 & wp8 compile error
2014-08-20 12:02:12 +08:00
minggo
2b709f92bb
Merge pull request #7816 from xiangxw/fix_sendPrompt
...
fix sendPrompt()
2014-08-20 10:25:30 +08:00
andyque
9a3c2dc6a4
Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-20 09:56:16 +08:00
xiangxw
bef6a2a7f1
fix sendPrompt()
...
a extra '\0' will be sent when sizeof() is used
2014-08-19 11:46:30 +08:00
minggo
dd1bc70cde
Merge pull request #7271 from newnon/v3_getPreviousLocation_fix
...
bug on began touch - prevpoint
2014-08-19 09:49:01 +08:00
teivaz
db805ee2c8
* Fixed WP8 cocos library project
...
* Fixed profiling macros
2014-08-19 19:24:56 +03:00
Dmitry Bushtets
1257f642c7
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)
2014-08-15 13:20:37 +03:00
minggo
408472625c
add CCModuleManager into CMakeLists.txt
2014-08-15 14:46:21 +08:00
minggo
bf75e9996a
separate jpeg, tiff and webp
2014-08-15 14:29:10 +08:00
minggo
db17084b6d
fix warnings
2014-08-15 12:06:16 +08:00
yangxiao
7bfd636b16
reset default camera rotation
2014-08-14 09:06:06 +08:00
yangxiao
b4ec344bcf
reset camera position in initDefault
2014-08-13 15:57:22 +08:00
minggo
9ae20d1bd3
Merge pull request #7740 from GavinThornton/v3
...
Update CCEventTouch.h
2014-08-13 09:39:17 +08:00
lite3
fa83d63c5d
replace NULL to nullptr
...
fix compile error
2014-08-12 17:35:18 +08:00
lite3
8f59d8ac93
add GUIReader::registerTypeAndCallBack for std::function
2014-08-12 17:19:52 +08:00
gin0606
17aa2833db
Fix xcode warning that cause `getEngine` inline expansion
2014-08-12 18:07:17 +09:00
GavinThornton
1d0deb0bc1
Update CCEventTouch.h
...
MAX_TOUCHES=5 is less than most touch devices, iPad/Android tablets can almost all handle all 10-11 touches. Perhaps a value of 15 would be better?
Note: There is a #define IOS_MAX_TOUCHES_COUNT 10 in CCEAGLView.mm already for this, but multitouch fails on touch 5 in "void GLViewProtocol::handleTouchesBegin" at the code:-
// The touches is more than MAX_TOUCHES ?
if (unusedIndex == -1) {
CCLOG("The touches is more than MAX_TOUCHES, unusedIndex = %d", unusedIndex);
continue;
}
2014-08-12 01:02:06 -07:00
yangxiao
32645c1622
fix default camera, add listener for projection change
2014-08-12 14:42:08 +08:00
gin0606
89cf0c1e8c
fix getEngine
2014-08-12 12:01:27 +09:00
minggo
213f2f5a6c
Merge pull request #7702 from super626/v3_merge
...
Camera and Camera test
2014-08-08 15:56:38 +08:00
minggo
29888b9d74
Merge pull request #7705 from zii/patch-1
...
让replaceScene更安全
2014-08-08 12:03:48 +08:00
yangxiao
911144b720
wrong parameter for visit
2014-08-08 11:52:40 +08:00
yangxiao
4dce59582b
visiting camera
2014-08-08 11:49:59 +08:00
minggo
2f638c67fd
Merge pull request #7598 from AppleJDay/master
...
Add Feature :EventMouse should support getDelta, getDeltaX, getDelt...
2014-08-08 10:43:32 +08:00
gin0606
2ca881287f
CCRANDOM macro use ccRandom
2014-08-07 21:17:41 +09:00
gin0606
5349aa7efb
Add ccRandom.h
2014-08-07 21:17:36 +09:00
zii
212e059917
让replaceScene更安全
...
如果可以这样的话 就不用担心用runWithScene还是replaceScene了. 可以省略getRunningScene判断.
2014-08-07 18:34:21 +08:00
yangxiao
1e15131b2b
simplify code
2014-08-07 16:24:44 +08:00
yangxiao
34f6368ff7
change function to const
2014-08-07 15:57:15 +08:00
yangxiao
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
minggo
1bad9ddbc2
Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr
...
V3 wp8glviewhookpr
2014-08-05 13:51:15 +08:00
huangshiwu
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
zii
20c43e5684
Update ccUtils.h
2014-08-04 15:21:10 +08:00
zii
7659a1623f
Update ccUtils.h
2014-08-04 15:20:45 +08:00
zii
e151795c43
Update ccUtils.cpp
2014-08-04 15:18:01 +08:00
zii
825209dd04
Update ccUtils.cpp
2014-08-04 11:48:23 +08:00
zii
97f06306e3
Update ccUtils.cpp
...
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
2014-08-04 11:45:50 +08:00
huangshiwu
372479d812
wp8 GLView Hook
2014-08-02 16:31:16 +08:00
AppleJDay
b736202a55
replace tab to spaces. Fix compile error of UIRichTextTest.cpp in windows visual studio vs2013.
2014-08-01 17:37:30 +08:00
AppleJDay
2239fafade
Merge branch 'v3' of github.com:AppleJDay/cocos2d-x
2014-08-01 17:22:43 +08:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
AppleJDay
0bd4b608b7
Merge pull request #1 from cocos2d/v3
...
Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix
2014-07-29 08:34:15 +08:00
AppleJDay
bd5ca6a244
Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions
2014-07-28 10:39:35 +08:00
Dhilan007
b9cfa4a8b5
fix warn
2014-07-25 14:38:02 +08:00
Sergey
9e692cd329
missing include
2014-07-22 15:49:39 +04:00
Sergey
59cbc153d4
Copyright & small fixes
2014-07-22 15:49:38 +04:00
Sergey
624b6a5af4
unused variable removed
2014-07-22 15:49:37 +04:00
Sergey
1a617ad804
pvr display fix pvr decompression on 64 bit platforms fix
2014-07-22 15:49:36 +04:00
Sergey
2acce6771f
software per decompression support
2014-07-22 15:49:36 +04:00
zhangcheng
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
Huabing.Xu
8afd7614d1
Merge branch 'v3' into v3_dll
2014-07-18 14:01:17 +08:00
Mazyad Alabduljaleel
a4b4efff1b
[FIX]: copied data should be const
2014-07-18 03:44:39 +04:00
Huabing.Xu
21b3e55339
Mac dylib version works now
2014-07-17 20:58:50 +08:00
Huabing.Xu
52ac47aea8
Merge branch 'v3' into v3_dll
2014-07-17 18:27:36 +08:00
minggo
3b3a29ed68
Merge pull request #7477 from Dhilan007/v3-gc0717
...
Fix the y-inverse Joystick bug[IOS].
2014-07-17 15:13:57 +08:00
Huabing.Xu
3c6e87d34e
Merge branch 'v3' into v3_dll
...
Conflicts:
cocos/base/ccUtils.h
2014-07-17 14:12:10 +08:00
Dhilan007
a457db53b0
Fix the y-inverse Joystick bug[IOS].
2014-07-17 11:14:53 +08:00
Huabing.Xu
0350186589
Merge branch 'v3' into v3_dll
2014-07-16 11:15:16 +08:00
Huabing.Xu
dbd3fce0a5
windows dll version of cpp-tests works
2014-07-15 13:54:08 +08:00
Huabing.Xu
63de5f6acc
add CC_DLL
2014-07-15 12:00:31 +08:00
Huabing.Xu
4b059689d3
add CC_DLL for functions
2014-07-15 11:18:05 +08:00
Huabing.Xu
9db59c0046
add CC_DLL for Event and Physics
2014-07-15 10:55:40 +08:00
Huabing.Xu
cd9e42eb99
add CC_DLL for colorXXX
2014-07-15 10:04:24 +08:00
boyu0
2354c79c3f
Fix compile error
2014-07-14 23:05:16 +08:00
boyu0
c7fec217ba
Change atof() to utils::atof()
2014-07-14 20:45:24 +08:00
boyu0
7fd0ca217c
Implement utils::atof()
2014-07-14 20:42:08 +08:00
Huabing.Xu
91314ed504
remove CC_DLL for template class and CC_DLL for CCValue
2014-07-14 18:40:10 +08:00
Huabing.Xu
190264c090
add CC_DLL in Event systems
2014-07-14 16:43:28 +08:00
minggo
8cdbe5a019
Merge pull request #7412 from Dhilan007/v3-320final
...
fixed warning: deleting pointer to incomplete type.
2014-07-11 18:50:25 +08:00
Dhilan007
d2e8154dc3
fixed warning: deleting pointer to incomplete type.
2014-07-11 17:45:15 +08:00
minggo
ecb915fabf
fix warnings
2014-07-11 17:39:56 +08:00
minggo
6c37541657
Merge pull request #7363 from Dhilan007/v3-event-clear
...
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
2014-07-11 13:36:52 +08:00
Huabing.Xu
60dd7a4514
Merge branch 'v3' into v3_dll
2014-07-11 11:10:26 +08:00
Dhilan007
4e4464c9c1
Add annotation for Controller class.
2014-07-11 10:56:09 +08:00
Huabing.Xu
f5cffba6c9
change pure virtual function to virtual function in action series
...
remove unimplemented function to deprecated and give an empty implementation
add CC_DLL to Vec2
2014-07-11 10:19:49 +08:00
minggo
e749a9a598
Merge pull request #7380 from huangshiwu/v3
...
change "const static" to "static const"
2014-07-10 18:31:09 +08:00
huangshiwu
2a65b7d98e
change "const static" to "static const"
2014-07-10 16:50:25 +08:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
Dhilan007
dbcb20b886
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
...
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
minggo
eba1735d04
Merge pull request #7347 from Dhilan007/v3-memory-leak
...
fixed memory leak cause by singleton.
2014-07-08 21:13:56 +08:00
minggo
c2474ea7c0
Merge pull request #7262 from pandamicro/origin_v3
...
Indicate correct button and cursor position infomation in mouse move event
2014-07-08 21:07:09 +08:00
Dhilan007
10defddc2e
fixed memory leak cause by singleton.
2014-07-08 18:22:48 +08:00
Dhilan007
7d924d2b64
fixed duplicate definition.
2014-07-08 12:50:47 +08:00
minggo
e1b29a8ef6
Merge pull request #7329 from Dhilan007/v3-gc-refactor
...
issue #4689:Fixed lose disconnected event and incorrect device name/id.
2014-07-07 18:45:23 +08:00
Dhilan007
bbf0fead91
update API annotation.
2014-07-07 18:25:53 +08:00
Dhilan007
d1034fdaae
1.fixed lose disconnected event.
...
2.fixed incorrect device name and device id;
2014-07-07 17:47:07 +08:00
minggo
cd77690032
Merge pull request #7326 from Dhilan007/v3-gc-refactor
...
issue #4689 : support external key.
2014-07-07 17:04:27 +08:00
Dhilan007
ddfe82ae08
Replace log with CCLOG
2014-07-07 15:04:29 +08:00
Dhilan007
68bd717ea7
issue #4689 : support external key.
2014-07-07 12:06:24 +08:00
minggo
2d504dcc9b
Merge pull request #7264 from kanitaoru/removeRedandantCommentInConfig
...
Remove redundant comment in ccConfig.h
2014-07-06 21:09:39 +08:00
mannewalis
f238593bfb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
# By chuanweizhang2013 (30) and others
# Via chuanweizhang2013 (19) and others
* 'v3' of https://github.com/cocos2d/cocos2d-x : (78 commits)
fix ui::Helper::seekWigetByName can not find pages in pageview
[AUTO][ci skip]: updating cocos2dx_files.json
add const for getter. fixed redefinition of 'registerListeners'
Update CCController-android.cpp
fixed missing function
issue #4689 : Refactoring game controller API[ios]
Add resources
version1.2
Remove useless codes
Refactoring game controller API
should not include android cpp files in win/wp project
Remove useless codes
Remove useless codes
Add Lua bindings for utils and CaptureScreen test case
revert Android.mk
issue #4689 : Refactor controller API.
add setXXTEAKeyAndSign
fix indent problems
initialize member variable
fix windows compile and running error
...
2014-07-05 12:26:44 -07:00
Dhilan007
2b3de76819
add const for getter.
...
fixed redefinition of 'registerListeners'
2014-07-04 23:07:48 +08:00
Dhilan007
e6c4bb454b
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactorClass
2014-07-04 22:53:33 +08:00
LinWenhai
46435952f8
Update CCController-android.cpp
2014-07-04 21:31:10 +08:00
Dhilan007
eee26b5029
fixed missing function
2014-07-04 21:29:30 +08:00
LinWenhai
2ca5c01902
issue #4689 : Refactoring game controller API[ios]
2014-07-04 21:24:32 +08:00
Dhilan007
6d48cd9523
Refactoring game controller API
2014-07-04 17:01:41 +08:00
Dhilan007
552a9251c4
issue #4689 : Refactor controller API.
2014-07-04 15:22:53 +08:00
mannewalis
92e08265cd
changes needed for swift bindings to work
2014-07-03 08:42:06 -07:00
Dhilan007
c5dc7b9cd0
fixed can't get valid value from trigger button.
2014-07-02 14:19:10 +08:00
minggo
aff1e3e1d2
fix compiling error
2014-07-01 22:26:15 +08:00
minggo
6654bf1129
Merge pull request #7265 from visiblelight/beta_test
...
Fix the crash when capturing screen on WP8
2014-07-01 16:19:45 +08:00
dimkaafan
a7a2490aee
bug on began touch - prevpoint
2014-07-01 11:35:04 +04:00
Dhilan007
584e90c097
Rotate the frame buffer for WP8 during the snapshot
2014-07-01 14:48:43 +08:00
田矢 慎太朗
39040540fc
Remove redundant comment in ccConfig.h
2014-07-01 15:12:29 +09:00
pandamicro
abfbc4bffb
Fixed #5632 : Indicate the correct button in mouse move event
2014-07-01 13:01:04 +08:00
minggo
3b13855374
fix compiling error on iOS
2014-06-30 17:20:13 +08:00
Dhilan007
2a9e10be2c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
2014-06-30 13:41:55 +08:00
Dhilan007
ef5da0649a
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
Dhilan007
5ed581758e
issue #4895:Get events from controller to engine[android]
2014-06-30 03:20:22 +08:00
Dhilan007
3c614d5670
issue #4895:Get events from controller to engine[ios]
2014-06-30 00:31:45 +08:00
Dhilan007
7cd7b9e054
issue #4892:Implement logical codes of game controller
2014-06-30 00:28:21 +08:00
Huabing.Xu
47471e202d
Merge branch 'v3' into fast_tmx
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
2014-06-29 20:23:43 +08:00
Huabing.Xu
b232896f85
roll back fps compute logic
...
fix crash bug
2014-06-27 13:41:06 +08:00
minggo
49da072b1a
Merge pull request #7214 from lite3/addValueEqual
...
add operator == != for Value
2014-06-26 22:57:01 +08:00
lite3
568a4bad49
fix Value equal ( float and double)
2014-06-26 17:26:57 +08:00
minggo
ed5b548b18
add comment
2014-06-26 14:14:37 +08:00
minggo
2917596d5e
add utils::findChildren()
2014-06-26 14:05:30 +08:00
lite3
1096cdc52f
add operator == != for Value
2014-06-26 01:49:54 +08:00
Huabing.Xu
290897af14
Merge branch 'v3' into fast_tmx
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-25 10:10:08 +08:00
Huabing.Xu
740372ceb3
new version of rendering for tile map
2014-06-24 11:04:17 +08:00
Mazyad Alabduljaleel
433dc140cd
CCLOGINFO compilation fix
2014-06-19 20:59:08 +04:00
gin0606
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
boyu0
d89c2176c3
issue #4437 : add vertex z support, fix some bugs.
2014-06-18 18:19:13 +08:00
minggo
08453b911d
Merge pull request #7071 from pandamicro/Script_onEnter_fix
...
Fixed #5563 : Wrap override onEnter function by script call detection code to solve bugs in JSB
2014-06-18 13:37:57 +08:00
pandamicro
950894de80
Fixed #5563 : Fix include issue
2014-06-18 12:47:48 +08:00
pandamicro
94fdff1da9
Fixed #5563 : Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
2014-06-18 11:51:52 +08:00
minggo
bd499d4bd6
Merge pull request #7003 from andyque/back_compatible_fix
...
fix KeyCode back compatible
2014-06-18 11:29:02 +08:00
minggo
eb21bf1ad1
Merge pull request #7030 from Rumist/v3
...
#5506 bug fix
2014-06-12 16:16:13 +08:00
boyu0
acb87f414e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx
2014-06-12 14:44:28 +08:00
elsanide
2e73f63156
#5506 bug fix
...
when Director->convertToUI() called, returned wrong value.
kazmath code (under 3.0 version.)
//********************************************************
kmVec3* kmVec3TransformCoord(kmVec3* pOut, const kmVec3* pV, const kmMat4* pM)
{
/*
a = (Vx, Vy, Vz, 1)
b = (a×M)T
Out = 1 ⁄ bw(bx, by, bz)
*/
kmVec4 v;
kmVec4 inV;
kmVec4Fill(&inV, pV->x, pV->y, pV->z, 1.0);
kmVec4Transform(&v, &inV,pM);
pOut->x = v.x / v.w;
pOut->y = v.y / v.w;
pOut->z = v.z / v.w;
return pOut;
}
//********************************************************
Mat4.h & MathUtil version (3.1 or later)
//********************************************************
inline void MathUtil::transformVec4(const float* m, const float* v, float* dst)
{
// Handle case where v == dst.
float x = v[0] * m[0] + v[1] * m[4] + v[2] * m[8] + v[3] * m[12];
float y = v[0] * m[1] + v[1] * m[5] + v[2] * m[9] + v[3] * m[13];
float z = v[0] * m[2] + v[1] * m[6] + v[2] * m[10] + v[3] * m[14];
float w = v[0] * m[3] + v[1] * m[7] + v[2] * m[11] + v[3] * m[15];
dst[0] = x;
dst[1] = y;
dst[2] = z;
dst[3] = w;
}
//****************************************************
Transforms 3-D vector or an array of 3-D vectors using a given matrix, projecting the result back into w = 1.
but, it is not apply w = 1.
2014-06-10 18:15:07 +09:00
heliclei
d4a9640a5e
[ccconsole]Add version command.
2014-06-10 16:29:06 +08:00
andyque
38f28d4bd5
fix KeyCode back compatible
2014-06-09 09:50:13 +08:00
boyu0
a8a5f6b230
issue #4437 : add new tmx.
2014-06-06 16:15:46 +08:00
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
Timothy Zhang
9134e5e4c5
cc_utf8_to_utf16 doesn't work correctly if length!=-1 and the given char* is not zero-terminated or contains zero.
2014-05-29 05:44:39 +00: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
James Chen
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
James Chen
602d89126f
Value: initialize Value with Type::None when its move and copy
...
contructor is called.
Memory leak fix in `operator =(Value&&)` move assignment.
2014-05-12 23:32:51 +08:00
James Chen
b24f742c92
Null ptr check in value assignment
2014-05-12 18:45:36 +08:00
minggo
1053cacc16
don't trigger onExitTransitionDidStart
2014-05-12 15:05:21 +08:00
minggo
94f50b1856
Merge pull request #6535 from dumganhar/value-optimize
...
closed #5099 : Optimization for Value
2014-05-12 13:57:50 +08:00
Ricardo Quesada
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
Ricardo Quesada
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
Ricardo Quesada
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
andyque
a15dd55baa
closed #3861 , fixed some typo and indent problem
2014-05-06 12:04:52 +08:00
andyque
16ebe8d41c
issue #3861 , fix linux compile error
2014-05-06 09:40:50 +08:00
James Chen
0995204abc
Optimization for Value
2014-05-05 19:00:46 +08:00
andyque
34b3114e55
issue #3861 . add license to CCEventFocus and CCEventListenerFocus
2014-05-05 17:49:31 +08:00
andyque
33f7a500f3
issue #4861 . add android keypad support
2014-05-05 11:37:38 +08:00
andyque
47acbc24e0
issue #4861 , add CCEventFocus and CCEventListener
2014-05-05 11:37:38 +08:00
Ricardo Quesada
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
Ricardo Quesada
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
Ricardo Quesada
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
boyu0
0699aa94fe
Change Value::asBool() return false by default.
2014-04-30 15:07:26 +08:00
Ricardo Quesada
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
Ricardo Quesada
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
Ricardo Quesada
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
Ricardo Quesada
b053a9145a
Compiles on Windows32
2014-04-25 22:03:25 -07:00
Huabing.Xu
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
James Chen
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
James Chen
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
Dale Stammen
467ededeff
enabled console for wp8
2014-04-19 10:08:01 -07:00
Huabing.Xu
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
Huabing.Xu
30dec564e6
remove kazmath/kazmath.h include
2014-04-15 23:50:28 +08:00
Huabing.Xu
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
Huabing.Xu
e2a24dec84
replace Point with Vector2
2014-04-15 18:08:29 +08:00
Huabing.Xu
917ae6e88b
deprecate Point, using Vector2 instead
2014-04-15 17:46:44 +08:00
cw
312cd49b1a
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
2014-04-15 17:10:24 +08:00
cw
d361efacae
add update
2014-04-15 17:10:11 +08:00
Huabing.Xu
11fc8ac308
conversion from Vector2 and Point
2014-04-15 13:58:08 +08:00
Huabing.Xu
3f496069b4
add interface in Vector2 for Point
2014-04-15 11:58:08 +08:00
Huabing.Xu
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
Anton Sokolchenko
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
James Chen
576d9d872c
Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next'
...
in ConsoleTest.
2014-04-11 20:07:54 +08:00
Huabing.Xu
7af4d558c6
remove kmMat4 in AffineTransform.cpp
2014-04-11 17:19:32 +08:00
Huabing.Xu
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
heliclei
157fce785c
fix CCConsole linux crash
2014-04-10 18:31:28 +08:00
Huabing.Xu
07ac817a7c
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-10 10:52:15 +08:00
James Chen
890dd64d38
issue #4729 : some warning fixes and compilation error fixes on win32.
2014-04-10 01:29:13 +08:00
James Chen
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
James Chen
9d8d256bee
issue #4729 : Android build works ok.
2014-04-10 00:36:42 +08:00
James Chen
43d6e1176a
issue #4729 : Compilation error fixes for linux
2014-04-10 00:36:42 +08:00
James Chen
5b296a62e9
issue #4729 : Moved deprecated classes to 'cocos/deprecated' folder
2014-04-10 00:36:41 +08:00
Huabing.Xu
504fa2aa60
remove kmMat4 interface in AffineTransform
2014-04-09 14:21:41 +08:00
Darragh Coy
93724b3806
Add in missing template parameter in function arg.
2014-04-08 12:34:22 -07:00
Darragh Coy
cbf85259cd
Convert tabs to spaces
2014-04-08 11:44:54 -07:00
Darragh Coy
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
shujunqiao
9391906738
modify const char* to std::string in CCConsole.
2014-04-08 18:20:06 +08:00
heliclei
4e1284bd45
closed #4533:fix console upload hang issue
2014-04-08 14:52:53 +08:00
Darragh Coy
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
mgcL
a3a3fa0907
fix Value's memory leak
2014-04-05 18:55:55 +08:00
shujunqiao
411bb95025
add [director end] command's explain in CCConsole.cpp.
2014-03-28 13:50:06 +08:00
shujunqiao
fb780f82da
add [director end] command in CCConsole.cpp.
2014-03-28 13:40:24 +08:00
Darragh Coy
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
James Chen
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
James Chen
691442d80d
closed #4559 : Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
2014-03-26 15:04:11 +08:00
minggo
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
James Chen
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
andyque
b41879916c
issue #4429 , fixed Value to string precesion error
2014-03-24 12:03:25 +08:00
Dale Stammen
762433e8aa
enable CC_ENABLE_CACHE_TEXTURE_DATA for wp8
2014-03-22 06:12:04 -07:00
Dale Stammen
a14728f184
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:11:27 -07:00
Dale Stammen
347f91fcb6
Disabled console for wp8/winrt until networking code is added
2014-03-22 06:11:10 -07:00
Dale Stammen
6a4d459c77
Disabled console for wp8/winrt until networking code is added
2014-03-22 06:10:54 -07:00
andyque
cf86fd619f
fix lua bindings warnings
2014-03-20 16:48:12 +08:00
andyque
f26ae8a019
remove unused params warnings
2014-03-20 16:34:42 +08:00
andyque
e6645400a3
fix a paramers miss match
2014-03-20 14:54:09 +08:00
andyque
ae3310bffb
Merge branch 'develop' into fix_warnings
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2014-03-20 14:50:02 +08:00
andyque
7ae77c9335
fix cocos2dx engine internal warnings
2014-03-20 10:58:04 +08:00
andyque
bab53ef2bd
add test for ios and mac
2014-03-19 16:47:57 +08:00
andyque
cadbfbe9b1
add Bool Integer Float Double support to CCDictionary
2014-03-19 16:47:57 +08:00
heliclei
fe1bc368ec
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:46:17 +08:00
heliclei
4657b28c2d
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:42:36 +08:00
chuanweizhang2013
295bf7f7f2
rename variable
2014-03-17 11:06:50 +08:00
chuanweizhang2013
9167d39959
space
2014-03-15 18:18:56 +08:00
chuanweizhang2013
0a9ec91d6c
init Console variable
2014-03-15 18:13:29 +08:00
James Chen
c033591e6a
[win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte.
2014-03-15 01:05:04 +08:00
heliclei
600c661acb
remove script support
2014-03-07 15:12:46 +08:00
heliclei
728d5f34de
CCConsole: add script support
2014-03-05 00:07:30 +08:00
heliclei
fe574616f3
fix console loop
2014-02-26 23:51:45 +08:00
heliclei
31a13a6262
remove unused function
2014-02-26 23:46:07 +08:00
heliclei
9d6be63171
CCConsole:support file upload via telnet console
2014-02-26 23:41:47 +08:00
heliclei
1dc6d1ad21
merge begin & end with one 'tap' command
2014-02-25 18:17:43 +08:00
heliclei
6848e6dde0
use atof instead of stof to fix compile error on android
2014-02-25 16:31:21 +08:00
heliclei
7f3aab2bfd
fix touchEnd lambda
2014-02-25 15:59:43 +08:00
heliclei
f1376e7caf
fix help typo
2014-02-25 15:55:01 +08:00
heliclei
a7d636f7bf
support touch swipe directive
2014-02-25 15:52:37 +08:00
heliclei
e09a72f26d
add touch swipe
2014-02-25 11:47:53 +08:00
heliclei
786aae2199
add touch move support
2014-02-25 11:04:59 +08:00
heliclei
2f4e96527b
remove unused declare
2014-02-24 17:50:40 +08:00
heliclei
9777c6e2a5
use closesocket insteadof close on windows
2014-02-24 16:51:08 +08:00
heliclei
5956c3a380
fix compile on windows
2014-02-24 15:05:20 +08:00
heliclei
4a2633933e
remove early cleanup
2014-02-24 14:28:19 +08:00
heliclei
02230add0c
use closeSocket() on windows
2014-02-24 14:24:14 +08:00
heliclei
be45047b6b
use send/recv to replace write/read
2014-02-24 12:01:04 +08:00
heliclei
92571ebe04
merge upstream/develop
2014-02-22 22:58:24 +08:00
heliclei
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
James Chen
b300cfa1d2
issue #4106 : Updates comments for 'Vector::eraseObject'
2014-02-21 11:30:55 +08:00
James Chen
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
James Chen
2eb1c1bb73
issue #4106 : Ref class's constructor should be protected.
2014-02-21 11:21:08 +08:00
James Chen
23082c0d6c
closed #4104 : Crash if invoking Array::initWithObjects()
2014-02-20 21:44:40 +08:00
James Chen
95143da782
Merge pull request #4990 from daltomi/debug
...
closed #4102 : Uses 'cbegin/cend', 'const std::string' where it's reasonable.
2014-02-20 20:29:56 +08:00
James Chen
0d8846d876
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 16:40:46 +08:00
James Chen
dd74add195
Merge pull request #5386 from heliclei/console-command
...
add more console commands: resume, pause, stopanimation and startanimation
2014-02-20 15:46:59 +08:00
heliclei
d5bef1ca35
merge pause, resume, stopanimation, startanimation into director command
2014-02-20 11:15:29 +08:00
James Chen
0ea27d8543
issue #4058 : CCObject.cpp -> CCRef.cpp for all platform projects.
2014-02-20 10:56:25 +08:00
James Chen
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
heliclei
dd9f072429
add more commands: resume, pause, stopanimation and startanimation
2014-02-19 11:19:29 +08:00
heliclei
8bad243903
remove redudant prompt
2014-02-18 12:00:23 +08:00
heliclei
007d2c507c
use local variable to reduce coupling
2014-02-18 10:32:32 +08:00
heliclei
7283e9fdc1
fix console hang
2014-02-17 23:29:09 +08:00
heliclei
35ae3702f4
fix console readline
2014-02-17 16:49:57 +08:00
heliclei
daf9c3f868
delete un-used code
2014-02-14 14:57:12 +08:00
heliclei
2ec75919c0
use stl map to oprate command
2014-02-14 14:54:26 +08:00
heliclei
05e5af7f5f
use realloc to avoid memory leaks
2014-02-13 17:15:47 +08:00
heliclei
391768007b
do not allow adding same commands
2014-02-13 14:07:12 +08:00
heliclei
9befe56a7e
update unit test
2014-02-13 11:10:23 +08:00
heliclei
7c11657242
simplify add custom command
2014-02-13 10:40:57 +08:00
heliclei
60faacab02
remove redundant return
2014-02-11 17:05:10 +08:00
heliclei
c39d9f57c8
add return
2014-02-11 17:00:09 +08:00
heliclei
f925bb17cf
add back prompts
2014-02-11 16:57:30 +08:00
heliclei
a0c3cbe054
Merge branch 'develop' of https://github.com/heliclei/cocos2d-x into develop
2014-02-11 16:50:39 +08:00
heliclei
c15fdc3161
Merge pull request #1 from cocos2d/develop
...
merge upstream/develop
2014-02-11 16:41:41 +08:00
heliclei
e7679a62b0
fix console prompt
2014-02-11 16:41:12 +08:00
heliclei
4a2fd2b52d
fix console prompt
2014-02-11 16:14:49 +08:00
heliclei
30942e9fba
set prompt for async console commands
2014-02-11 10:48:18 +08:00
Ricardo Quesada
337271cc46
Event more improvements in the console
...
Much better help system
2014-02-08 21:29:39 -08:00
Ricardo Quesada
560abe77c8
better Console support
...
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
2014-02-08 12:46:44 -08:00
Ricardo Quesada
822f141748
log() in win32 doesn't add extra \n
2014-02-04 08:59:56 -08:00
Maks
33a12a594e
fix timeout getting status of sockets in Console::loop()
...
'016000' - is octal constants, 016000 == 7168
http://msdn.microsoft.com/en-us/library/00a1awxf.aspx
2014-02-03 00:24:58 +02:00
James Chen
551f95b83c
The implementation of Object::release was moved to cpp source file.
2014-01-26 18:34:48 +08:00
James Chen
8efa186649
Fixes a comment typo in CCObject.h.
2014-01-24 22:34:14 +08:00
James Chen
b6932d580d
issue #3713 : Modifies the scope of DEBUG macro in CCAutoreleasePool.h , contains(Object* obj) should be valid in RELEASE version too.
2014-01-24 17:57:36 +08:00
James Chen
6e704b6843
issue #3713 : Adds AutoreleasePool::isClearing() for easily debugging memory issues. It only valid in DEBUG mode.
2014-01-24 17:51:36 +08:00
James Chen
3aedb8ec43
issue #3713 : Object::release() of debug version will check whether the object was in autorelease pool.
2014-01-24 14:46:06 +08:00
minggo
4381685a9d
deprecated some functions in Object
2014-01-22 13:47:29 +08:00
minggo
562d10c89f
issue #3713 : every autorelease will cause a release operation
2014-01-22 11:40:07 +08:00
minggo
c906075017
issue #3713 : use reference in loop
2014-01-22 11:03:06 +08:00
minggo
9ffcef4982
issue #3713:fix memory leak of autoreleas pool
2014-01-22 10:17:42 +08:00
minggo
6378d10d5d
issue #3713:add test case for autorelease pool
2014-01-21 17:47:59 +08:00
minggo
5fd35c3bab
Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject
2014-01-21 13:46:40 +08:00
minggo
3e5fbb2422
issue #3713 : remove Object::_autoReleaseCount
2014-01-20 17:08:22 +08:00
James Chen
f97b40187c
closed #2789 : Adds a macro ‘’USE_STD_UNORDERED_MAP” for switching the implementation of Map<K, V> between using std::unordered_map and std::map.
2014-01-20 12:01:40 +08:00
James Chen
0d4d4c53f4
issue #2789 : Improves performance for Map<K,V>::keys.
2014-01-20 11:13:29 +08:00
Ricardo Quesada
cb9761125b
Renderer: When not using VAOs, call...
...
... glBufferData() to update the contents, and not glBufferSubData()
since the performance is better
2014-01-16 15:02:39 -08:00
Ricardo Quesada
4278f024b8
Console::log(format, va_args) is private
...
log(format, va_args) -> static _log(format, va_args)
in order to prevent possible resolution errors with overloaded
functions.
2014-01-15 11:17:21 -08:00
zhangbin
60009a818e
closed #3712 , Add relative path for CCFileUtils.h in CCConsole.cpp.
2014-01-15 12:05:17 +08:00
Ricardo Quesada
c267c479db
Performance Test fixes
...
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
2014-01-14 17:22:45 -08:00
Dhilan007
92d345156b
un-define clash with the existing macro definition in platform/win32/CCStdC.h
2014-01-14 14:20:22 +08:00
Dhilan007
a1d8e8bdb1
fix compiling error cause by macro define on window platform.
2014-01-14 12:28:24 +08:00
Dhilan007
d11bfeb8d4
fix compiling error on win
2014-01-12 11:02:48 +08:00
Ricardo Quesada
f4a99d0627
Removes DirectorDelegate
2014-01-10 20:26:15 -08:00
Ricardo Quesada
b870180af6
Mmmm... what?
...
removing useless debug message
2014-01-10 19:26:03 -08:00
Ricardo Quesada
dbcf5021a6
Compiles on Linux
2014-01-10 19:10:35 -08:00
Ricardo Quesada
9386866d56
cocos2d::log() moved to CCConsole
...
Unified console code since it is 90% similar to all platforms
2014-01-10 19:04:07 -08:00
Ricardo Quesada
c68ad76bfe
don't send "unknown command".
...
... if the command is an empty command
2014-01-10 18:11:35 -08:00
Ricardo Quesada
2316e4d55f
Debug messages are forward to the console
2014-01-10 17:58:54 -08:00
Ricardo Quesada
2a6b9fe08e
Console is a property of Director.
...
By doing this, the console lives as much as the Director.
And the Console is not started until the method "listenOnPort" is
called.
2014-01-10 17:11:14 -08:00
WuHuan
4dbb0ee1e8
mingw console
2014-01-09 17:48:37 +08:00
WuHuan
1cd68accc1
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
2014-01-08 17:03:44 +08:00
WuHuan
954ee61022
testcpp mingw
2014-01-08 16:58:36 +08:00
WuHuan
668c4b83ef
Merge pull request #3 from cocos2d/develop
...
update
2014-01-08 00:44:40 -08:00
Daniel T. Borelli
bf5515d936
unnecessary assignment
2014-01-07 21:27:20 -03:00
Daniel T. Borelli
50faabe4be
fix typo CCGeometry private function
2014-01-07 20:28:59 -03:00
James Chen
2a3481f20c
Moves temp files to CURRENT_BINARY_DIR.
2014-01-06 23:44:36 -08:00
walzer
d4c1aa92d5
add copyrights for 2014, in folders other then 2d.
2014-01-07 11:47:11 +08:00
James Chen
ea60dbb640
Fixing ‘ActionTest->AnimationTest’ crashes. It should return empty ValueMap/ValueVector when Value::asValueVector/Map is invoked in empty Value.
2014-01-06 19:55:59 +08:00
James Chen
b2dc16c065
closed #3580 : FileUtilsTest->TextWritePlist crashes
2014-01-04 15:03:46 +08:00
WuHuan
e972c97dcf
support mingw
2014-01-04 14:40:22 +08:00
James Chen
9342ae105a
issue #3577 : const_iterator —> iterator for Vector::erase(first, last). Makes android build happy.
2014-01-04 11:41:06 +08:00
James Chen
ebf6d07720
issue #3577 : iterator —> const_iterator since Map::getRandomObject is a const function.
2014-01-04 11:41:05 +08:00
andyque
88efbfc9cc
remove srand function call
2014-01-03 11:56:58 +08:00
andyque
774542a341
fix compile error of getRandomObject in map
...
and add srand to vector and map
2014-01-03 11:53:16 +08:00
andyque
67153f816c
remove unused code
2014-01-03 10:44:43 +08:00
andyque
0e90ef8337
fix move assignment operator doesn't clear previous content bug
2014-01-03 10:39:53 +08:00
andyque
75d5bcfb42
remove const modifier of move semantic
2014-01-02 18:05:22 +08:00
andyque
80adda2ce8
fixed self assignment error and provide move semantics to pushBack of Vector<T>
2014-01-02 17:54:52 +08:00
minggo
ec3b3ea012
Merge pull request #4696 from dumganhar/warning-fix
...
Some warning fixes on linux.
2013-12-27 01:56:47 -08:00
James Chen
012e7f6618
Merge pull request #4698 from dumganhar/map-fix
...
Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods.
2013-12-27 00:09:21 -08:00
James Chen
3ee48fc1ca
Map::bucketSize fix.
2013-12-27 15:50:48 +08:00
James Chen
0d4a816e3b
Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods.
2013-12-27 15:44:23 +08:00
byeonggee.seo
b9d56ae793
CCData bugfix
2013-12-27 16:34:00 +09:00
James Chen
febc19ea8d
Some warning fixes on linux.
2013-12-26 23:06:16 -08:00
Dhilan007
861925e752
fix compiling error in vs project on win7.
2013-12-27 14:38:22 +08:00
luocker
fc655162fa
Update CCString.cpp
...
we can't change _string value after get Array.
2013-12-27 00:26:02 +08:00
James Chen
17ff6ef764
Renames: IntValueMap —> ValueMapIntKey
2013-12-26 22:07:20 +08:00
James Chen
a8d93ddf72
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
2013-12-26 21:49:40 +08:00
James Chen
55b0ef85d8
Merge pull request #4631 from boyu0/const_char_star_to_std_string
...
Change const char* to const std::string&
2013-12-24 22:34:34 -08:00
James Chen
6fce4f9061
Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead.
2013-12-25 11:00:51 +08:00
boyu0
62fc889a54
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
...
Conflicts:
cocos/2d/platform/CCFileUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCImageCommon_cpp.h
cocos/2d/platform/CCSAXParser.cpp
cocos/2d/platform/CCSAXParser.h
2013-12-25 10:41:37 +08:00
boyu0
3344c5243c
change some const char* to const std::string&
2013-12-24 10:51:47 +08:00
James Chen
4ed988b8c5
Fixes linux build failure.
2013-12-23 13:45:31 +08:00
James Chen
b504d817b5
Small bug fix in CCData.
2013-12-20 21:41:20 +08:00
James Chen
21a9f05110
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/2d/CCUserDefault.cpp
cocos/2d/CCUserDefault.mm
cocos/2d/CCUserDefaultAndroid.cpp
cocos/2d/ZipUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCSAXParser.cpp
2013-12-20 21:12:11 +08:00
James Chen
3dba88c5c9
#include <algorithm> for std::find in CCVector.h.
2013-12-20 10:12:07 +08:00
Ricardo Quesada
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
James Chen
ddc1328e6b
Small fix in CCValue.cpp. visitMap is a template that supports IntValueMap and ValueMap. IntValueMap is confused. ValueMapIntKey seems better.
2013-12-18 17:01:57 +08:00
James Chen
2892e8be3f
Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
2013-12-18 14:58:17 +08:00
James Chen
3829f841e7
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
2013-12-17 18:09:07 +08:00
James Chen
c85f9877bb
Reverts Vector::eraseObject, not need to return iterator.
2013-12-17 17:54:38 +08:00
James Chen
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
Ricardo Quesada
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
James Chen
bb5ef615dd
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479
...
Conflicts:
cocos/2d/CCSpriteBatchNode.h
2013-12-13 16:44:22 +08:00
Ricardo Quesada
61cc365d9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCGLProgram.h
cocos/2d/CCLabelTTF.h
2013-12-12 14:41:42 -08:00
Ricardo Quesada
a8c317bd83
getDescription() works as expected
...
renames `description` to `getDescription`. Adds `virtual` to it.
Adds `getDescription` to missing nodes.
2013-12-12 14:30:22 -08:00
Ricardo Quesada
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
minggo
21e2b341f1
fix compiling error after fixing conflicts
2013-12-12 14:59:33 +08:00
minggo
16efe94946
fix compiling error after fixing conflicts
2013-12-12 14:48:27 +08:00
minggo
1e9c763b40
use ssize_t for index and capacity
2013-12-12 14:48:26 +08:00
minggo
ab23b47043
use ssize_t for capacity and index in containers
2013-12-12 14:48:26 +08:00
James Chen
3649c12d37
issue #2790 : Compilation error fix in CCMap.h.
2013-12-12 14:36:59 +08:00
James Chen
93bd45cefd
issue #2790 : Adds comments for Vector<T>.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-12 14:22:49 +08:00
James Chen
3fc9c93102
issue #2790 : Comment fix for Map<K, V>::clear.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-12 12:58:01 +08:00
James Chen
6264336809
issue #2790 : Updates comments for Map<K, V> container.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-12 11:54:03 +08:00
James Chen
5c62fe8f3f
issue #2790 : Reverts comments in CCString.h
2013-12-12 10:34:41 +08:00
James Chen
92a7aa03de
issue #2790 : Reverts comments in CCDictionary.h
2013-12-12 09:53:50 +08:00
James Chen
976bef8b68
issue #2790 : StringUtils::toStringWithFormat —> StringUtils::format.
2013-12-12 09:37:56 +08:00
Ricardo Quesada
6d1abc7d4d
Merge branch 'develop' into newRenderer
2013-12-11 15:28:05 -08:00
James Chen
ce61fa4d9b
issue #2790 : const_iterator —> iterator to fix android build errors.
2013-12-11 22:09:22 +08:00
James Chen
36fd873257
issue #2790 : Adds Vector::find.
2013-12-11 18:08:07 +08:00
James Chen
cc567a3077
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
James Chen
093e310cab
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
James Chen
b66fccb5ab
issue #2790 : Removes Map::erase(first, last).
2013-12-11 18:08:06 +08:00
James Chen
be9bb6998b
issue #2790 : Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes.
...
Also renames Map::remove to Map::erase.
2013-12-11 18:08:06 +08:00
James Chen
1a1cef9342
issue #2790 : Addes Value::Null variable.
2013-12-11 18:08:05 +08:00
James Chen
2cda34d59a
issue #2790 : Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class .
2013-12-11 18:08:05 +08:00
Ricardo Quesada
3b66d09bf5
Merge branch 'develop' into newRenderer
2013-12-10 11:10:55 -08:00
Ricardo Quesada
23222923bf
Migrated code to Matrix4
2013-12-10 11:07:15 -08:00
Dhilan007
abef5b59fa
fix compile error for vs project
2013-12-10 21:20:52 +08:00
boyu0
083a0eea2a
Remove all std::move in function returns.
2013-12-10 16:06:05 +08:00
boyu0
698cdc5591
add std::move to Vector move constructor and move equal operator overloading function.
2013-12-10 15:58:13 +08:00
Ricardo Quesada
0222c6544e
Migration to Mat4x4
...
Armature not migrated yet
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
James Chen
f6dc9bf9b6
issue #2790 : Adds more ‘assignment operator’ method for CCValue.
2013-12-09 17:55:56 +08:00
James Chen
f16068e621
issue #2790 : Bug fix in CCMap.h
2013-12-09 17:55:56 +08:00
James Chen
abbcd45c58
issue #2790 : CCLOG —> CCLOGINFO in CCMap.h
2013-12-07 23:32:29 +08:00
James Chen
beb6bb6c8d
issue #2790 : Bug fix in CCMap.h
2013-12-07 16:14:22 +08:00
James Chen
365f6faabb
issue #2790 : Warning fixes for CCDictionary.cpp and CCString.cpp
2013-12-07 14:26:52 +08:00
James Chen
06e6d38ab0
issue #2790 : Initializes Value when empty constructor was invoked.
2013-12-07 14:26:17 +08:00
James Chen
cd72813389
issue #2790 : Autorelease pool is using Vector<T> now.
2013-12-07 14:23:29 +08:00
James Chen
6f13a111ae
issue #2790 : Adds Vector<T>::sort method, adds Vector::removeObject(object, toRemoved).
2013-12-07 14:18:42 +08:00
James Chen
165cdf7fe6
issue #2790 : Deprecates CCArray.
2013-12-07 10:48:02 +08:00
James Chen
23ad9f4e1a
issue #2790 : Adds const version of Vector<T>::forEach.
2013-12-07 10:46:40 +08:00
James Chen
6cd573fa7f
issue #2790 : Deprecates CCSet.
2013-12-06 18:16:58 +08:00
minggo
fa7c97171b
fix some warnings
2013-12-06 16:32:06 +08:00
minggo
19c86c0e4f
Merge pull request #4434 from martell/msys2
...
Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW
2013-12-05 22:23:45 -08:00
minggo
9676821479
use int in Vector
2013-12-05 17:38:08 +08:00
minggo
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
James Chen
6aa2e5b257
Updates comments that vs2012 doesn’t support initializer list.
2013-12-05 16:49:05 +08:00
James Chen
b4b50f3491
Compilation fix for windows.
2013-12-05 16:33:13 +08:00
James Chen
79700118db
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2013-12-05 16:26:04 +08:00
James Chen
2b857ebb52
Fixing compilation errors on windows.
2013-12-05 16:09:38 +08:00
Ricardo Quesada
c617eee505
Uses the new Vector<>. Code is more robust!
2013-12-04 22:07:23 -08:00
Ricardo Quesada
6a034a91f1
Merge branch 'develop' into console
...
Conflicts:
cocos/scripting/auto-generated
2013-12-04 21:58:11 -08:00
Ricardo Quesada
73321199b9
Console: commands receives the char*
...
The char* is passed in case the commands
need to sub-parse the arguments.
Very useful for QA.
For example, the could create a command called "click", and the command could
receive arguments.
2013-12-04 21:51:08 -08:00
James Chen
b0af2667f8
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/scripting/auto-generated
2013-12-05 12:48:32 +08:00
James
373c3b01bf
issue #2790 : Fixing compilation errors on linux.
2013-12-05 11:44:37 +08:00
martell
e5ada6f377
added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors
2013-12-05 03:37:27 +00:00
Ricardo Quesada
e0bf32d881
dprintf is not defined on Android
...
using my own dprintf
2013-12-04 19:33:50 -08:00
Ricardo Quesada
49b25231f2
Compiles on Android
2013-12-04 19:16:01 -08:00
James Chen
944160210c
issue #2790 : Renames functions in Map<K, V>.
2013-12-05 10:59:43 +08:00
James Chen
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
Ricardo Quesada
15321a58df
fixes compiler errors on Linux
2013-12-04 18:28:09 -08:00
Ricardo Quesada
b52d535a42
fixes indentation issues
...
and some compilations issues on Linux
2013-12-04 18:19:51 -08:00
Ricardo Quesada
f42aef0af8
Moves CCConsole.* to base/
2013-12-04 18:09:23 -08:00
James Chen
c9767b8ea0
issue #2790 : fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile.
2013-12-04 17:50:57 +08:00
James Chen
54289276de
issue #2790 : ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
2013-12-04 17:46:57 +08:00
James Chen
736c70704b
issue #2790 : Some FIXME fixes.
2013-12-04 17:28:14 +08:00
James Chen
bbeec97b48
issue #2790 : Bug fixes in CCValue.cpp.
2013-12-04 16:38:12 +08:00
James Chen
82cc795ecf
issue #2790 : Adds more move functions.
2013-12-04 16:37:48 +08:00