eba1735d04
Merge pull request #7347 from Dhilan007/v3-memory-leak
...
fixed memory leak cause by singleton.
2014-07-08 21:13:56 +08:00
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
10defddc2e
fixed memory leak cause by singleton.
2014-07-08 18:22:48 +08:00
7d924d2b64
fixed duplicate definition.
2014-07-08 12:50:47 +08:00
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
bbf0fead91
update API annotation.
2014-07-07 18:25:53 +08:00
d1034fdaae
1.fixed lose disconnected event.
...
2.fixed incorrect device name and device id;
2014-07-07 17:47:07 +08:00
cd77690032
Merge pull request #7326 from Dhilan007/v3-gc-refactor
...
issue #4689 : support external key.
2014-07-07 17:04:27 +08:00
ddfe82ae08
Replace log with CCLOG
2014-07-07 15:04:29 +08:00
68bd717ea7
issue #4689 : support external key.
2014-07-07 12:06:24 +08:00
2d504dcc9b
Merge pull request #7264 from kanitaoru/removeRedandantCommentInConfig
...
Remove redundant comment in ccConfig.h
2014-07-06 21:09:39 +08:00
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
2b3de76819
add const for getter.
...
fixed redefinition of 'registerListeners'
2014-07-04 23:07:48 +08:00
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
46435952f8
Update CCController-android.cpp
2014-07-04 21:31:10 +08:00
eee26b5029
fixed missing function
2014-07-04 21:29:30 +08:00
2ca5c01902
issue #4689 : Refactoring game controller API[ios]
2014-07-04 21:24:32 +08:00
6d48cd9523
Refactoring game controller API
2014-07-04 17:01:41 +08:00
552a9251c4
issue #4689 : Refactor controller API.
2014-07-04 15:22:53 +08:00
92e08265cd
changes needed for swift bindings to work
2014-07-03 08:42:06 -07:00
c5dc7b9cd0
fixed can't get valid value from trigger button.
2014-07-02 14:19:10 +08:00
aff1e3e1d2
fix compiling error
2014-07-01 22:26:15 +08:00
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
a7a2490aee
bug on began touch - prevpoint
2014-07-01 11:35:04 +04:00
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
abfbc4bffb
Fixed #5632 : Indicate the correct button in mouse move event
2014-07-01 13:01:04 +08:00
3b13855374
fix compiling error on iOS
2014-06-30 17:20:13 +08:00
2a9e10be2c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
2014-06-30 13:41:55 +08:00
ef5da0649a
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
5ed581758e
issue #4895:Get events from controller to engine[android]
2014-06-30 03:20:22 +08:00
3c614d5670
issue #4895:Get events from controller to engine[ios]
2014-06-30 00:31:45 +08:00
7cd7b9e054
issue #4892:Implement logical codes of game controller
2014-06-30 00:28:21 +08:00
47471e202d
Merge branch 'v3' into fast_tmx
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
2014-06-29 20:23:43 +08:00
b232896f85
roll back fps compute logic
...
fix crash bug
2014-06-27 13:41:06 +08:00
49da072b1a
Merge pull request #7214 from lite3/addValueEqual
...
add operator == != for Value
2014-06-26 22:57:01 +08:00
568a4bad49
fix Value equal ( float and double)
2014-06-26 17:26:57 +08:00
ed5b548b18
add comment
2014-06-26 14:14:37 +08:00
2917596d5e
add utils::findChildren()
2014-06-26 14:05:30 +08:00
1096cdc52f
add operator == != for Value
2014-06-26 01:49:54 +08:00
290897af14
Merge branch 'v3' into fast_tmx
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-25 10:10:08 +08:00
740372ceb3
new version of rendering for tile map
2014-06-24 11:04:17 +08:00
433dc140cd
CCLOGINFO compilation fix
2014-06-19 20:59:08 +04:00
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
d89c2176c3
issue #4437 : add vertex z support, fix some bugs.
2014-06-18 18:19:13 +08:00
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
950894de80
Fixed #5563 : Fix include issue
2014-06-18 12:47:48 +08:00
94fdff1da9
Fixed #5563 : Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
2014-06-18 11:51:52 +08:00
bd499d4bd6
Merge pull request #7003 from andyque/back_compatible_fix
...
fix KeyCode back compatible
2014-06-18 11:29:02 +08:00
eb21bf1ad1
Merge pull request #7030 from Rumist/v3
...
#5506 bug fix
2014-06-12 16:16:13 +08:00
acb87f414e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx
2014-06-12 14:44:28 +08:00
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
d4a9640a5e
[ccconsole]Add version command.
2014-06-10 16:29:06 +08:00
38f28d4bd5
fix KeyCode back compatible
2014-06-09 09:50:13 +08:00
a8a5f6b230
issue #4437 : add new tmx.
2014-06-06 16:15:46 +08:00
716769241a
Merge pull request #6938 from CaryZheng/v3
...
Simplify BlendFunc operator< judgement
2014-06-06 15:29:33 +08:00
79ebc546f8
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
...
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
2014-06-04 09:19:22 -07:00
d089b251db
fix other platform compile error
2014-06-04 14:56:34 +08:00
f0d38290a1
refactor ObjectFactor and move it to base
2014-06-04 14:56:34 +08:00
7bf2be6033
Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
...
Bugfix autorelease pool manager
2014-06-04 14:31:30 +08:00
eb8e08ccdd
prefer std::vector to other containers
2014-06-03 19:09:48 +08:00
f1ce9e032d
remove unnecessary cache-variable
2014-06-03 19:08:28 +08:00
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
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
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
3b99c5ea42
Modify BlendFunc operator< judgement
2014-05-30 17:57:27 +08:00
56590f09eb
change comment.
2014-05-30 17:40:35 +08:00
dd0771852f
change comment.
2014-05-30 17:36:54 +08:00
28954fddd0
Simplify BlendFunc operator< judgement
2014-05-30 00:23:58 +08:00
7bac05a497
CCUserDefault.cpp: Should not compile on Mac platform (should be using CCUserDefault.mm implementation).
2014-05-29 10:36:15 -04:00
5e62c4e069
closed #5392 : add comment for unscheduleUpdate() at schedulePerFrame()
2014-05-29 15:16:11 +08:00
91db87a2f6
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-05-29 13:51:43 +08:00
8233b5bf93
fix mingw32/mingw64 compiling
2014-05-28 00:17:09 +08:00
d392fad70f
udpate the comments
2014-05-27 14:51:13 +08:00
5764677bba
update the comments
2014-05-27 14:40:55 +08:00
e81db73b0a
adding comments for the new utility.
2014-05-27 14:29:52 +08:00
bfd945c592
remove unused variables
2014-05-27 10:47:25 +08:00
363fd8dc2a
move the capturen screen interface from Director to ccUtils
2014-05-27 10:44:23 +08:00
c72ae9e3c5
merge from the latest v3
2014-05-26 20:18:11 +08:00
f40f0e0bb9
more define check
2014-05-26 17:00:31 +08:00
21f7e34d18
remove unused variables
2014-05-26 13:49:00 +08:00
7edfe78f7d
remove the parameter rect
2014-05-26 13:42:47 +08:00
e263c5f2de
use shared_ptr for better readibility
2014-05-22 23:34:27 +08:00
7d76d774e4
no need to use a singleton inside Director class
2014-05-19 10:00:56 +08:00
81ddbaa7b1
update the calculation of device pixel resolution
2014-05-19 01:12:56 +08:00
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
2014-05-16 14:36:00 -07:00
540418840b
Merge pull request #6737 from seobyeongky/dispatcher_bug_fix
...
EventDispatcher bug fix
2014-05-16 18:35:51 +08:00
eb38809630
Merge pull request #6756 from zifter/FixTwiceCallingOnExit
...
Fix twice calling on exit
2014-05-16 17:10:42 +08:00
c8a1004a4d
Little refactor.
2014-05-15 09:43:18 +03:00
c6f2a2aeb3
name fix
2014-05-15 10:19:59 +09:00
287b10f070
Fixed double calling onExit method.
2014-05-14 23:28:47 +03:00
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
2014-05-14 10:07:09 -07:00
90e2b8a4af
move the method from ccUtils to Director
2014-05-14 19:42:24 +08:00
d46362abb3
Merge pull request #6681 from minggo/director-fix
...
[ci skip] don't trigger onExitTransitionDidStart
2014-05-14 18:24:26 +08:00
76cd9911cb
bug fix
2014-05-14 18:58:55 +09:00
4c23ff5b8c
trackRef and untrackRef are static function now.
2014-05-14 11:55:20 +08:00
54176b0267
Include <algorithm> for std::find
2014-05-14 10:31:09 +08:00
c14482254d
Fixes wrong indention and whitespace cleanup
2014-05-14 10:25:45 +08:00
ba3f5f8eee
Updates indention in CCRef.h
2014-05-14 10:17:08 +08:00
72d29976c3
Disables memory tracker by default
2014-05-14 10:16:05 +08:00
eb8f07370c
Remove a comment in CCRef.cpp
2014-05-14 10:12:49 +08:00
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
31dd70dba2
Matrix::identity() -> IDENTITY
...
consistency with the rest of the cocos2d API
2014-05-13 10:26:25 -07:00
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
d0c98d6269
Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables.
2014-05-13 17:03:48 +08:00
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
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
b24f742c92
Null ptr check in value assignment
2014-05-12 18:45:36 +08:00
1053cacc16
don't trigger onExitTransitionDidStart
2014-05-12 15:05:21 +08:00
94f50b1856
Merge pull request #6535 from dumganhar/value-optimize
...
closed #5099 : Optimization for Value
2014-05-12 13:57:50 +08:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
a15dd55baa
closed #3861 , fixed some typo and indent problem
2014-05-06 12:04:52 +08:00
16ebe8d41c
issue #3861 , fix linux compile error
2014-05-06 09:40:50 +08:00
0995204abc
Optimization for Value
2014-05-05 19:00:46 +08:00
34b3114e55
issue #3861 . add license to CCEventFocus and CCEventListenerFocus
2014-05-05 17:49:31 +08:00
33f7a500f3
issue #4861 . add android keypad support
2014-05-05 11:37:38 +08:00
47acbc24e0
issue #4861 , add CCEventFocus and CCEventListener
2014-05-05 11:37:38 +08:00
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
0699aa94fe
Change Value::asBool() return false by default.
2014-04-30 15:07:26 +08:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
b053a9145a
Compiles on Windows32
2014-04-25 22:03:25 -07:00
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
efd16bc37e
Merge pull request #6264 from iSevenDays/patch-10
...
Fix loosing precision: int -> size_t for the return value of `recv`
2014-04-25 11:11:52 +08:00
477fc9f0e0
Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-04-25 10:59:11 +08:00
467ededeff
enabled console for wp8
2014-04-19 10:08:01 -07:00
3b83d52f95
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
2014-04-19 00:30:34 +08:00
30dec564e6
remove kazmath/kazmath.h include
2014-04-15 23:50:28 +08:00
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
e2a24dec84
replace Point with Vector2
2014-04-15 18:08:29 +08:00
917ae6e88b
deprecate Point, using Vector2 instead
2014-04-15 17:46:44 +08:00
312cd49b1a
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
2014-04-15 17:10:24 +08:00
d361efacae
add update
2014-04-15 17:10:11 +08:00
11fc8ac308
conversion from Vector2 and Point
2014-04-15 13:58:08 +08:00
3f496069b4
add interface in Vector2 for Point
2014-04-15 11:58:08 +08:00
ec5398e7c6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
2014-04-14 14:08:19 +08:00
503d270f8f
Fix loosing precision
...
I had a warning on building for iPhone 64 bit.
As you can see above variable "rc" has a type of size_t too( void Console::commandUpload(int fd) );
2014-04-13 01:55:43 +03:00
576d9d872c
Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next'
...
in ConsoleTest.
2014-04-11 20:07:54 +08:00
7af4d558c6
remove kmMat4 in AffineTransform.cpp
2014-04-11 17:19:32 +08:00
1670e07300
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
157fce785c
fix CCConsole linux crash
2014-04-10 18:31:28 +08:00
07ac817a7c
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-10 10:52:15 +08:00
890dd64d38
issue #4729 : some warning fixes and compilation error fixes on win32.
2014-04-10 01:29:13 +08:00
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
9d8d256bee
issue #4729 : Android build works ok.
2014-04-10 00:36:42 +08:00
43d6e1176a
issue #4729 : Compilation error fixes for linux
2014-04-10 00:36:42 +08:00
5b296a62e9
issue #4729 : Moved deprecated classes to 'cocos/deprecated' folder
2014-04-10 00:36:41 +08:00
504fa2aa60
remove kmMat4 interface in AffineTransform
2014-04-09 14:21:41 +08:00
93724b3806
Add in missing template parameter in function arg.
2014-04-08 12:34:22 -07:00
cbf85259cd
Convert tabs to spaces
2014-04-08 11:44:54 -07:00
14b210a082
RefPtr<T> - add move semantics
...
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
2014-04-08 11:34:27 -07:00
9391906738
modify const char* to std::string in CCConsole.
2014-04-08 18:20:06 +08:00
4e1284bd45
closed #4533:fix console upload hang issue
2014-04-08 14:52:53 +08:00
f147ef723a
Merge the alternate RefPtr<T> implementation
...
Merge in the version at: https://github.com/DarraghCoy/cocos2d-x/blob/add_refptr_class_alt_impl/cocos/base/CCRefPtr.h
This version sacrifices the ability to use forward references in some places in return for added type safety and ensures we can never assign a non cocos2d::Ref derived object to the pointer.
2014-04-07 16:04:00 -07:00
a3a3fa0907
fix Value's memory leak
2014-04-05 18:55:55 +08:00
411bb95025
add [director end] command's explain in CCConsole.cpp.
2014-03-28 13:50:06 +08:00
fb780f82da
add [director end] command in CCConsole.cpp.
2014-03-28 13:40:24 +08:00
036dc5542c
Add cocos2d::RefPtr<T>
...
This class which acts a smart pointer type class for cocos2d::Ref objects. Can be used to help automate memory management and remove manual retain/release calls from code, resulting in less code and less chance of errors. Also useful to implement the RAII idiom in certain scenarios, ensuring that an object gets released upon exiting a scope.
2014-03-26 15:30:15 -07:00
21ba509a35
Merge pull request #5989 from dumganhar/iss4559-ios-64bit
...
closed #4559 : Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
2014-03-26 15:27:57 +08:00
691442d80d
closed #4559 : Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
2014-03-26 15:04:11 +08:00
a374241f65
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
...
Windows Phone 8,0 cocos2d-x 3.0 changes
2014-03-26 13:58:46 +08:00
7a8db8271f
Merge pull request #5930 from andyque/Branch_issue4429
...
closed #4429 : Boolean value could not be written to specified plist file
2014-03-26 11:46:56 +08:00
b41879916c
issue #4429 , fixed Value to string precesion error
2014-03-24 12:03:25 +08:00
762433e8aa
enable CC_ENABLE_CACHE_TEXTURE_DATA for wp8
2014-03-22 06:12:04 -07:00
a14728f184
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:11:27 -07:00
347f91fcb6
Disabled console for wp8/winrt until networking code is added
2014-03-22 06:11:10 -07:00
6a4d459c77
Disabled console for wp8/winrt until networking code is added
2014-03-22 06:10:54 -07:00
cf86fd619f
fix lua bindings warnings
2014-03-20 16:48:12 +08:00
f26ae8a019
remove unused params warnings
2014-03-20 16:34:42 +08:00
e6645400a3
fix a paramers miss match
2014-03-20 14:54:09 +08:00
ae3310bffb
Merge branch 'develop' into fix_warnings
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2014-03-20 14:50:02 +08:00
7ae77c9335
fix cocos2dx engine internal warnings
2014-03-20 10:58:04 +08:00
bab53ef2bd
add test for ios and mac
2014-03-19 16:47:57 +08:00
cadbfbe9b1
add Bool Integer Float Double support to CCDictionary
2014-03-19 16:47:57 +08:00
fe1bc368ec
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:46:17 +08:00
4657b28c2d
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:42:36 +08:00
295bf7f7f2
rename variable
2014-03-17 11:06:50 +08:00
9167d39959
space
2014-03-15 18:18:56 +08:00
0a9ec91d6c
init Console variable
2014-03-15 18:13:29 +08:00
c033591e6a
[win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte.
2014-03-15 01:05:04 +08:00
600c661acb
remove script support
2014-03-07 15:12:46 +08:00
728d5f34de
CCConsole: add script support
2014-03-05 00:07:30 +08:00
fe574616f3
fix console loop
2014-02-26 23:51:45 +08:00
31a13a6262
remove unused function
2014-02-26 23:46:07 +08:00
9d6be63171
CCConsole:support file upload via telnet console
2014-02-26 23:41:47 +08:00
1dc6d1ad21
merge begin & end with one 'tap' command
2014-02-25 18:17:43 +08:00
6848e6dde0
use atof instead of stof to fix compile error on android
2014-02-25 16:31:21 +08:00
7f3aab2bfd
fix touchEnd lambda
2014-02-25 15:59:43 +08:00
f1376e7caf
fix help typo
2014-02-25 15:55:01 +08:00
a7d636f7bf
support touch swipe directive
2014-02-25 15:52:37 +08:00
e09a72f26d
add touch swipe
2014-02-25 11:47:53 +08:00
786aae2199
add touch move support
2014-02-25 11:04:59 +08:00
2f4e96527b
remove unused declare
2014-02-24 17:50:40 +08:00
9777c6e2a5
use closesocket insteadof close on windows
2014-02-24 16:51:08 +08:00
5956c3a380
fix compile on windows
2014-02-24 15:05:20 +08:00
minggo