e70918e325
extract Animation3DData
2014-06-12 14:03:33 +08:00
c2288936db
Remove `handleStudioEventListener` of LuaEngine
2014-06-12 13:50:52 +08:00
f687f63bfd
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
2014-06-12 13:44:15 +08:00
6c7b538ee1
Add deprecated support for the related UI addEventListener functions
2014-06-12 12:02:22 +08:00
3511d1e87e
1.Support setting up the line height and additional kerning of label.
...
2.Add more annotation
2014-06-12 12:01:15 +08:00
5c718e27da
Merge pull request #7044 from Dhilan007/v3-label-improve
...
Ensuring release cache texture in timely.
2014-06-12 11:39:36 +08:00
c5a8ba3a2c
Merge pull request #7043 from Dhilan007/v3-texturecachefix
...
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
2014-06-12 11:35:34 +08:00
379db53673
Reconstruct the _sendRequest function of LuaMinXmlHttpRequest
2014-06-12 11:24:46 +08:00
d755b7ffcb
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
2014-06-12 11:21:42 +08:00
05a65a68bb
issue #4693 : added enumerateChildren()
2014-06-12 10:41:08 +08:00
5349125ad0
Reconstruct the addEventListener for cocostudio ui control
2014-06-12 10:10:37 +08:00
108c0d0da9
Modify ini files for bindings-generator to fix the compile warning
2014-06-12 10:08:58 +08:00
9fe7c1a9da
loader
2014-06-12 10:01:54 +08:00
b268536385
fixed typo.
2014-06-12 09:46:18 +08:00
4d1bf0c1a2
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
2014-06-12 09:42:20 +08:00
775832a710
added missing files
2014-06-11 13:18:10 -07:00
28ae57c5fc
add AsyncReader
2014-06-12 00:38:23 +08:00
7cc3879257
Ensuring release cache texture in timely.
2014-06-11 22:03:10 +08:00
63a68632a5
fixed calculating height of multi-line string was incorrect on IOS.
2014-06-11 21:49:08 +08:00
aa06fab776
support relative path for reading json
2014-06-11 21:11:22 +08:00
f1bc0971aa
extract mesh data, material data, skin data into a header file for reuse in converter and engine
2014-06-11 18:24:14 +08:00
65acec013b
Merge branch 'v3' into v3Animation
2014-06-11 17:45:31 +08:00
8a5bfb9840
issue #4693 : add getName(), setName() and getChildByName()
2014-06-11 16:57:43 +08:00
5515c43bb2
improve lasers
2014-06-11 15:16:08 +08:00
18663609b4
add interface for speed and playback in animate
2014-06-11 15:07:37 +08:00
f50263402a
improve parser
2014-06-11 14:56:12 +08:00
ccb24abf52
Merge pull request #7028 from heliclei/cocos-version
...
[ccconsole]Add version command.
2014-06-11 14:49:47 +08:00
2f6f1b7151
improve binary format
2014-06-11 14:45:35 +08:00
d76525ced1
use my data temp
2014-06-11 14:20:14 +08:00
7a8f27ee0b
remove unused parser code
2014-06-11 14:15:34 +08:00
5b05ab6353
fix rendering bug
2014-06-11 14:05:35 +08:00
9ee6f1f3e0
adjust shader uniform settings
...
use a new fake data for testing
2014-06-11 12:07:25 +08:00
a8c321fe64
add use glprogram before setting uniform data for meshcommand
2014-06-11 11:34:04 +08:00
09a2ceb7df
add TimelineAction
2014-06-11 11:10:07 +08:00
818c478224
[AUTO]: updating luabinding automatically
2014-06-11 02:30:38 +00:00
4ce2d7f193
Update values of KeyCode used in the Lua to fix related error
2014-06-11 10:10:11 +08:00
cddad40ec0
make it rotate
2014-06-11 10:01:52 +08:00
b895018765
update parser
2014-06-11 09:35:24 +08:00
8ba4c7a083
GLProgram should not abort() if shader compilation fails, returning false will allow app to show custom error message to user (or use other simple shaders if a complicated shader fails to compile on some device).
2014-06-10 17:59:15 +05:30
6d09b50699
animation bug
2014-06-10 19:53:06 +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
46e5b72827
Add a log
2014-06-10 16:56:07 +08:00
90907f451e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
2014-06-10 16:50:26 +08:00
5aec5d4a83
Update `LuaStack::executeScriptFile` to support template project loading lua or luac files
2014-06-10 16:47:32 +08:00
d4a9640a5e
[ccconsole]Add version command.
2014-06-10 16:29:06 +08:00
24990b37bf
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-10 15:25:15 +08:00
48f7743daa
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-10 15:08:10 +08:00
d7af5eccd4
Merge pull request #7024 from pandamicro/SpriteFrame_Ctor
...
Issue #5533 : Add SpriteFrame's constructor
2014-06-10 13:38:27 +08:00
8bc531a0fb
Fixed #5533 : Fix usage of new SpriteFrame in engine
2014-06-10 12:04:20 +08:00
92a33225ff
Fixed #5533 : Make SpriteFrame's constructor and init functions public temporarily to avoid issues
2014-06-10 11:39:48 +08:00
aa877f2b50
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
2014-06-10 11:31:08 +08:00
5a80b4da2e
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
2014-06-10 11:30:39 +08:00
bb7cf801e6
Fixed #5533 : Add SpriteFrame's constructor and make constructor & init functions protected
2014-06-10 11:28:34 +08:00
0ca9a98f4a
Merge pull request #6920 from minggo/orrderOfArrival
...
don't have to set _orderOfArrival to 0 after visit
2014-06-10 10:28:38 +08:00
0c7cbda144
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-10 09:09:53 +08:00
a991940268
debug Sprite3D with .c3t
2014-06-09 18:37:58 +08:00
9517f9b852
Merge pull request #6996 from newnon/v3_setparent_fix
...
move node from one parent to another fix
2014-06-09 17:13:59 +08:00
66c7b85134
fix issue on Xcode 6
2014-06-09 17:06:40 +08:00
e2630f915d
[AUTO]: updating luabinding automatically
2014-06-09 07:30:49 +00:00
3975f55de7
issue #4437 : fix crash when doesn't support VAO, and make calculation more precisely.
2014-06-09 15:28:49 +08:00
8a3e64918d
Merge pull request #7014 from andyque/ImproveUIText
...
improve UIText
2014-06-09 15:27:04 +08:00
e1a43d8ac4
[AUTO]: updating luabinding automatically
2014-06-09 07:20:59 +00:00
ecf32bcbf7
Merge pull request #7015 from andyque/improveUITextField
...
add getStringLength to UITextField
2014-06-09 15:16:47 +08:00
d46025af64
Merge branch 'improvement/COC-3' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into improveUITextField
...
Conflicts:
cocos/ui/UITextField.h
2014-06-09 14:46:04 +08:00
b7c8759f3b
modify outline size parameter
2014-06-09 14:37:56 +08:00
a52532c3c5
Merge branch 'feature/COC-5' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into ImproveUIText
...
Conflicts:
cocos/ui/UIText.cpp
2014-06-09 14:17:57 +08:00
59c7b7e9a0
Merge pull request #7004 from Dhilan007/v3-labelfix
...
close issue#5158:Label's display may go bonkers if using outline feature.
2014-06-09 14:17:46 +08:00
48443b8d52
Merge pull request #7008 from visiblelight/ProgramState
...
Fix issue 5393
2014-06-09 11:47:57 +08:00
dff0fada28
issue #4437 : fix some bugs.
2014-06-09 11:36:44 +08:00
638f7f12c5
[AUTO]: updating luabinding automatically
2014-06-09 03:15:50 +00:00
ae16c88538
Save the bound texture unit so that the sampler can be updated dynamiclly.
2014-06-09 10:58:28 +08:00
6bc82ef5ab
restore UIScrollView constructor and destructor to public
2014-06-09 10:47:02 +08:00
c4f5e71bbd
restore Widget's constructor and destructor to public
2014-06-09 10:41:17 +08:00
1a933807b5
remove UIInterface.h header file
2014-06-09 10:35:54 +08:00
7a25fbfe29
refactor touch event
2014-06-09 10:23:11 +08:00
4e0759533b
close issue#5158:Label's display may go bonkers if using outline feature.
2014-06-09 10:12:22 +08:00
38f28d4bd5
fix KeyCode back compatible
2014-06-09 09:50:13 +08:00
46ed99f611
Merge pull request #7001 from CocosRobot/update_lua_bindings_1402278332
...
[AUTO]: updating luabinding automatically
2014-06-09 09:47:10 +08:00
c604c09069
[AUTO]: updating luabinding automatically
2014-06-09 01:46:34 +00:00
fa74de8511
Merge pull request #6993 from Teivaz/v3
...
* Set COCOS2D_VERSION to 3.2.0
2014-06-09 09:43:50 +08:00
904f157c2c
move node from one parent to another fix
2014-06-07 12:25:20 +04:00
0c95fe1fbd
animation test
2014-06-06 19:12:08 +08:00
fc5e58b521
issue #4437 : add dirty tag.
2014-06-06 18:03:44 +08:00
2640938c68
* Set COCOS2D_VERSION to 3.2.0
2014-06-06 12:58:32 +03:00
560053d23c
issue #4437 : add test and fix transform.
2014-06-06 17:33:27 +08:00
d7f808934d
Add const for getStringLength() function
2014-06-06 17:06:55 +08:00
e0cc5153fa
Remove misleading comment, add new comment
...
Remove misleading comment, add new comment for enableOutline
2014-06-06 16:54:51 +08:00
fabc4d03ee
Update UIText.cpp
2014-06-06 16:50:25 +08:00
03eeb2cade
Remove unnecessary Type::TTF Check
...
Remove unnecessary TTF type check on enableOutline or enableGlow function。
2014-06-06 16:41:45 +08:00
a8a5f6b230
issue #4437 : add new tmx.
2014-06-06 16:15:46 +08:00
4f22b03d7f
refactor Widget setColor & setOpacity
2014-06-06 16:14:35 +08:00
282264575b
refactor TextField setColor & setOpacity
2014-06-06 16:10:33 +08:00
5ae97da030
refactor TextBMFont setColor & setOpacity
2014-06-06 16:09:59 +08:00
d615de8299
refactor TextAtlas setColor & setOpacity
2014-06-06 16:09:13 +08:00
a37a6737ca
refactor Text setColor & setOpacity
2014-06-06 16:08:31 +08:00
f0f4d41813
refactor Slider setColor & setOpacity
2014-06-06 16:07:47 +08:00
3c80fe53d3
refactor LoadingBar setColor & setOpacity
2014-06-06 16:03:59 +08:00
6193893b2b
refactor ImageView setColor & setOpacity
2014-06-06 16:02:44 +08:00
0805c215b3
refactor UICheckBox setColor & setOpacity
2014-06-06 16:01:55 +08:00
46ad4edab3
refactor UIButton setColor & setOpacity
2014-06-06 16:00:28 +08:00
76d9916864
Merge pull request #6990 from Dhilan007/v3-wp8fix
...
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:43:43 +08:00
fd4e233432
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:41:17 +08:00
716769241a
Merge pull request #6938 from CaryZheng/v3
...
Simplify BlendFunc operator< judgement
2014-06-06 15:29:33 +08:00
bbff18c96f
add some comment
2014-06-06 12:09:39 +08:00
49f7b2aec1
Merge pull request #6986 from iSevenDays/patch-11
...
Fix CCImage to be compatible with UNIX2003
2014-06-06 12:05:58 +08:00
6cee3fe830
Merge pull request #6979 from visiblelight/TextureOptimize
...
Texture Optimize
2014-06-06 11:38:49 +08:00
6bbf5a1459
tests
2014-06-06 10:12:23 +08:00
770d5e91b7
Update CCImage.cpp
2014-06-05 18:02:45 +03:00
5f74b8568d
Fix CCImage to be compatible with UNIX2003
...
Without this wrapper I get errors below.
Mac Os X 10.9.3 Xcode 6 beta(the same problem also exists in Xcode 5)
I found a solution at http://stackoverflow.com/questions/8732393/code-coverage-with-xcode-4-2-missing-files and added one more wrapping function.
Undefined symbols for architecture i386:
"_fwrite$UNIX2003", referenced from:
_unixErrorHandler in libcocos2dx iOS.a(tif_unix.o)
_unixWarningHandler in libcocos2dx iOS.a(tif_unix.o)
_empty_output_buffer in libcocos2dx iOS.a(jdatadst.o)
_term_destination in libcocos2dx iOS.a(jdatadst.o)
_Fax3PrintDir in libcocos2dx iOS.a(tif_fax3.o)
_PredictorPrintDir in libcocos2dx iOS.a(tif_predict.o)
"_strerror$UNIX2003", referenced from:
_TIFFOpen in libcocos2dx iOS.a(tif_unix.o)
ld: symbol(s) not found for architecture i386
clang: error: linker command failed with exit code 1 (use -v to see invocation)
2014-06-05 16:54:00 +03:00
7ece807a63
Add shadow, outline, glow filter support for UITextField
2014-06-05 19:21:06 +08:00
87c7e2b0e9
worldmat cache in bone
2014-06-05 18:21:25 +08:00
b74040a2ac
Add getStringLength() support for UITextField
2014-06-05 17:59:54 +08:00
32ba5f2873
change comment
2014-06-05 16:47:03 +08:00
ed8f8a9cad
sprite3d with skin render&bundle
2014-06-05 16:36:01 +08:00
b749d0b5ca
[AUTO]: updating luabinding automatically
2014-06-05 07:06:07 +00:00
373d4dfb1a
Replace `log` with `CCLOG`
2014-06-05 14:49:02 +08:00
366beedbb2
Merge pull request #6955 from samuele3hu/v3_fix
...
Add xxtea encrypt support for lua and update the console submodule
2014-06-05 11:49:40 +08:00
c96a6086c3
improve parsing code
2014-06-05 11:43:43 +08:00
0010ed2e44
[AUTO]: updating luabinding automatically
2014-06-05 03:01:43 +00:00
860057c307
Use the image format instead of RGBA8888 when initializing a texture, this would remove the redudant conversion and save memories.
2014-06-05 10:58:27 +08:00
8690122c96
add version 300 parsing code in widget reader
2014-06-05 10:25:08 +08:00
b570487bf3
add cocostudio binary file parser
2014-06-05 10:24:12 +08:00
c90f2b3251
remove unused codes in CCTexture2D
2014-06-05 10:09:36 +08:00
59b966731e
Compiles on Windows and Android
2014-06-04 09:48:35 -07:00
0c2f8ed401
Lua compiles and runs
2014-06-04 09:26:39 -07: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
54caf26a57
animation3d
2014-06-04 18:17:09 +08:00
d1e664fd44
fix win7 compile error
2014-06-04 15:43:53 +08:00
d089b251db
fix other platform compile error
2014-06-04 14:56:34 +08:00
54e93f6c41
fix ObjectFactory refactor issue
2014-06-04 14:56:34 +08:00
f0d38290a1
refactor ObjectFactor and move it to base
2014-06-04 14:56:34 +08:00
38e274de73
refact ui header file include
2014-06-04 14:56:33 +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
700b0f7320
Merge pull request #6966 from kicktheken/v3
...
fix layout constant syntax error
2014-06-04 14:12:52 +08:00
b174481645
Merge pull request #6967 from ntotani/fix-lua-binding-release-build
...
fix lua-binding release build
2014-06-04 14:06:29 +08:00
a70d6628a7
[AUTO]: updating luabinding automatically
2014-06-04 05:58:29 +00:00
5432698674
Merge pull request #6969 from boyu0/bug5482_setPhysicsBody
...
closed #5482 : Node::setPhysicsBody() doesn't work after node added to another node.
2014-06-04 13:52:43 +08:00
56d931aa71
Merge pull request #6963 from andyque/refactorLayout
...
refactor Layout, remove sortChildren and unify doLayout
2014-06-04 12:01:07 +08:00
dd0eecb905
closed #5482 : fix issue: Node::setPhysicsBody() doesn't work after node added to other node.
2014-06-04 11:58:04 +08:00
c785d64ba1
Adjust the xxtea directory structure and modify configs files for platforms
2014-06-04 11:50:04 +08:00
d7fcf39386
fix layout constant syntax error
2014-06-03 20:26:59 -07:00
c7597e5396
surround tolua_isnumber with debug flug
2014-06-04 12:17:43 +09:00
c6cb3a56fb
refactor ListView, add do Layout
2014-06-04 10:51:32 +08:00
652c214374
remove sortChildren of Layout
2014-06-04 10:10:50 +08:00
2c9c94c4a9
Merge pull request #6954 from visiblelight/AlphaIssues
...
Make PNG files premultiplied alpha when loading
2014-06-04 10:04:20 +08:00
3fddb798ea
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-04 10:00:52 +08:00
e1310e2660
Adjust the xxtea directory structure and modify some grammar expressions
2014-06-04 09:59:29 +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
9e6304d84c
fixed EVENT_COME_TO_BACKGROUND has not been sent on android.
2014-06-03 18:10:22 +08:00
404db49538
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-03 17:17:11 +08:00
55bb9a7d09
Update setting for different platform
2014-06-03 17:15:28 +08:00
1c4838e7f0
we are only udpating PNG now.
2014-06-03 16:22:50 +08:00
0149fd81b5
no need for handling RAW_DATA
2014-06-03 15:19:01 +08:00
8af737739b
premultiplied alpha for PNG,TGA,WEBP,RAW_DATA
2014-06-03 15:06:15 +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
7b4ae98098
Merge pull request #6944 from minggo/treat-warning-as-error
...
Treat warning as error on iOS and Mac
2014-06-03 14:31:18 +08:00
26a4eaaac7
Merge pull request #6939 from dabingnn/v3FixAndroid
...
V3 fix android
2014-06-03 10:26:01 +08:00
691e606b34
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
...
Conflicts:
tools/cocos2d-console
2014-06-03 09:58:57 +08:00
b91d8255bd
Add xxtea encrypt support for lua and update the console submodule
2014-06-03 09:55:57 +08:00
449b588400
Compiles on iOS
2014-06-02 16:02:54 -07:00
b24c674d25
Little fixes for setNormalized
2014-05-30 21:50:39 -07: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
05b992c628
Bug fix
2014-05-31 00:13:08 +02:00
28b95bd54a
* Skip UTF8 BOM if it exists
...
* Fix when string isn't terminated if fread() reads less size than paramter at FileUtils getData
2014-05-31 00:06:56 +02:00
3bf4c5e985
fix mingw32/64 build:
...
MinGW uses system installed libcurl, rather than libcurl_imp.
2014-05-30 19:54:59 +08: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
4b979d67db
issue #5429 : treat warning as error on Mac
2014-05-30 16:46:01 +08:00
e76feceada
fix coding style
2014-05-30 15:13:59 +08:00
402dc9f9ce
fix memory leak
2014-05-30 15:10:57 +08:00
41d19007eb
Merge branch 'v3.1hotfix' into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-05-30 10:19:56 +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
ae7c93dd4e
Merge remote-tracking branch 'upstream/v3' into v3
2014-05-29 20:41:00 +08:00
05df2a4db1
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
...
Fixing cmake project for win32
2014-05-29 15:25:58 +08:00
b68525ac1f
Merge pull request #6916 from John-He-928/mingw-build
...
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-b...
2014-05-29 15:17:07 +08:00
5e62c4e069
closed #5392 : add comment for unscheduleUpdate() at schedulePerFrame()
2014-05-29 15:16:11 +08:00
e5cbe5439b
Merge pull request #6922 from zawasp/android_flicker
...
prevent flickering when opening another activity
2014-05-29 15:15:15 +08:00
91db87a2f6
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-05-29 13:51:43 +08:00
e1bb1c62c0
[hot fixed]issue#4999:fixed label is unsharp if it's created by smaller font.
2014-05-29 10:26:07 +08:00
299e93bca7
Merge branch 'mingw-build' of github.com:John-He-928/cocos2d-x into mingw-build
2014-05-29 01:33:44 +08:00
23b7d76797
prevent flickering when opening another activity
2014-05-28 16:33:35 +03:00
2e7865a4f6
coding style fix
2014-05-28 17:41:34 +08:00
99d1ccf41e
remove foreground event listener when GLProgramState is deleted
2014-05-28 16:51:33 +08:00
1618d2a4e2
don't have to set _orderOfArrival to 0 after visit
2014-05-28 15:50:42 +08:00
2084fc4ddc
using lambda function instead of member function
2014-05-28 15:50:37 +08:00
8f274e5a99
Merge pull request #6918 from minggo/fix-object-leak
...
Fix NSNotificationCenter and NSTimer leaks
2014-05-28 15:23:37 +08:00
2e70380dd9
invalidate NSTimer instance in destroy to prevent memory leak
2014-05-28 15:19:07 +08:00
013b3a328f
remove keyboard notifications from NSNotificationCenter
2014-05-28 15:17:26 +08:00
30f4f256d8
fix background/forground of Sprite3D on android platform
2014-05-28 15:16:00 +08:00
3d3fb6ad7e
Merge pull request #6914 from andyque/refactorLayoutExecutant
...
refactor: rename UILayoutExecutant to UILayoutManager
2014-05-28 13:47:54 +08:00
2aa4b9936c
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-bit platform.
2014-05-28 12:37:35 +08:00
769300d25e
rename UILayout
...
Executant.h to UILayoutManager.h
2014-05-28 10:17:34 +08:00
c5a118ee1b
refactor UILayoutExecutant to LayoutManager
2014-05-28 10:11:49 +08:00
8233b5bf93
fix mingw32/mingw64 compiling
2014-05-28 00:17:09 +08:00
99290b83c7
Merge pull request #6871 from asuuma/v3_Repeat_fix
...
Fix Repeat will run one more over in rare situations
2014-05-27 16:22:42 +08:00
0b661d8192
Merge pull request #6907 from visiblelight/screenshot_refactor
...
adding comments for the new utility
2014-05-27 14:52:09 +08:00
f3de239647
Merge pull request #6616 from xhcnb/fix_callback
...
Fix crash: use cocostudio gui editor, create a action in editor, when yo...
2014-05-27 14:51:36 +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
e1ab346e70
[AUTO]: updating luabinding automatically
2014-05-27 06:31:18 +00:00
e81db73b0a
adding comments for the new utility.
2014-05-27 14:29:52 +08:00
9d2c765fc0
Merge pull request #6862 from favorcode/v3
...
Update UILoadingBar.h doxygen comments
2014-05-27 13:54:52 +08:00
df13d4033c
refactor Layout and Widget
2014-05-27 13:49:00 +08:00
30582ffa6f
add constness to UIPageView's removeAllPages method
2014-05-27 11:30:37 +08:00
070abfdb44
add constness to UIVideoPlayer
2014-05-27 11:30:36 +08:00
3cda4e76a0
add constness to UIImageView
2014-05-27 11:30:36 +08:00
eb91aed3f2
add constness to UICheckBox
2014-05-27 11:30:36 +08:00
f87e4243ee
add constness to UIButton
2014-05-27 11:30:36 +08:00
884d4c5d1f
add constness to UITextField
2014-05-27 11:30:36 +08:00
5da1f1f78c
add constness to UIText
2014-05-27 11:30:36 +08:00
5acd2ed89d
add constness to UISlider
2014-05-27 11:30:36 +08:00
36e7c9cdfc
add constness to UIScrollView
2014-05-27 11:30:36 +08:00
e1f9ff7eaa
add constness to UIPageView
2014-05-27 11:30:36 +08:00
78ac4b4d86
add constness to UILoadingBar
2014-05-27 11:30:35 +08:00
0518e494b1
add constness to UIListView
2014-05-27 11:30:35 +08:00
b17de0cdcb
add const to UILayout
2014-05-27 11:30:35 +08:00
e32a637bf5
add const to ui framework methods
2014-05-27 11:30:35 +08:00
a01315e2f5
Merge pull request #6726 from visiblelight/screenshot
...
Add a new utility function to snap the screen
2014-05-27 11:18:25 +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
626e0acb9d
Merge pull request #6848 from newnon/v3_android_jni_improvements
...
android jni error clear & more readable log
2014-05-27 10:40:59 +08:00
f7450730fb
Merge pull request #6901 from andyque/fixDpadNavigation
...
issue #5176 , refactor FocusNavigationController
2014-05-27 10:40:00 +08:00
9e9cab9e53
[AUTO]: updating luabinding automatically
2014-05-27 02:21:22 +00:00
9cef55d62c
issue #5176 , refactor FocusNavigationController
2014-05-27 10:20:37 +08:00
94a1013f75
Merge pull request #6898 from andyque/5176
...
add FocusManager, refactor UI framework
2014-05-27 10:09:43 +08:00
d8d5139aaf
closed #5176 , refactor UILayout and focus
2014-05-26 23:04:44 +08:00
c72ae9e3c5
merge from the latest v3
2014-05-26 20:18:11 +08:00
f32044fca9
closed #5176 , fix FocusNavigationController
2014-05-26 18:38:03 +08:00
642969cc84
issue #5176 , move setting setFirstFocsuedWidget to setFocused method
2014-05-26 18:27:06 +08:00
69d5b486af
Revert "issue #5176 , fix compile error on other platforms"
...
This reverts commit 9118d7a98a
2014-05-26 18:19:23 +08:00
1a6dba8656
issue #5176 , refactor UIFocusManager
2014-05-26 18:17:47 +08:00
cc8b70b87d
issue #5176 , refactor UIFocusManager and UIScrollView
2014-05-26 17:34:56 +08:00
f40f0e0bb9
more define check
2014-05-26 17:00:31 +08:00
f619c096da
Merge pull request #6874 from HoGarfield/CCMenuLoader_v3
...
The default size of CCMenu in CocosBuilder is 0,0
2014-05-26 03:34:13 -05:00
b0bc406bdc
fixed Armature::getBoundingBox() is wrong when bone's display is null
2014-05-26 16:16:06 +08:00
bb4ce31644
new empty line appended to the file end
2014-05-26 16:15:30 +08:00
9118d7a98a
issue #5176 , fix compile error on other platforms
2014-05-26 15:35:43 +08:00
e866800044
issue #5176 , refactor UICheckBox releaseUpEvent
2014-05-26 14:44:28 +08:00
40f2128acd
Merge branch 'v3' into 5176
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
2014-05-26 14:00:23 +08:00
21f7e34d18
remove unused variables
2014-05-26 13:49:00 +08:00
3245aeedd4
[AUTO]: updating luabinding automatically
2014-05-26 05:44:22 +00:00
7edfe78f7d
remove the parameter rect
2014-05-26 13:42:47 +08:00
99b37c3048
Merge remote-tracking branch 'upstream/v3' into v3
2014-05-26 13:42:05 +08:00
75cb686573
Merge pull request #6894 from andyque/refactor5183
...
refactor Layout, LayoutParameter and LayoutExecutant
2014-05-26 00:41:04 -05:00
332f75a57c
Update CCActionObject.h Doxygen comments
2014-05-26 12:02:14 +08:00
32964de7c5
Merge pull request #6877 from sachingarg05/BetterJpegSaveQuality
...
[ci skip]Set jpeg save quality to 90 (default is only 75, on a scale of 0 to 100)
2014-05-25 22:30:26 -05:00
bff5fdfdda
[AUTO]: updating luabinding automatically
2014-05-26 01:58:46 +00:00
f29654ff6c
Merge pull request #6890 from visiblelight/FixTextureCache
...
Fix the crash in TextureAsync test
2014-05-25 20:55:13 -05:00
8112962778
issue #5183 , remove in class member initialization
2014-05-26 09:51:05 +08:00
634fea7c45
Merge remote-tracking branch 'upstream/v3' into refactor5183
2014-05-26 09:18:32 +08:00
399571f542
Merge pull request #6892 from samuele3hu/v3_fix
...
Update the OpenGL lua binding and related test case
2014-05-23 07:37:49 -05:00
3bd196f077
Update the openGL lua binding and related test case
2014-05-23 19:12:30 +08:00
e2ce876260
remove new lines
2014-05-23 18:01:17 +08:00
ffdf3d7b67
assure threading safety
2014-05-23 17:59:34 +08:00
fb6ea21ca8
assure threading safety
2014-05-23 17:49:25 +08:00
e3a365ad60
assure threading safety
2014-05-23 17:48:07 +08:00
8128bfce68
check the condition guard
2014-05-23 17:27:59 +08:00
66a33e7d93
no need to pass all the references
2014-05-23 17:21:46 +08:00
910099fbe5
add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks.
2014-05-23 17:08:22 +08:00
ca68a273e3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-05-23 16:38:03 +08:00
d612518421
fix ui widget copyProperties issue
2014-05-23 15:03:46 +08:00
6539b558bd
update version
2014-05-23 14:30:08 +08:00
5e198aaae2
Merge pull request #26 from cocos2d/v3
...
update cocos2d-x
2014-05-23 12:46:42 +08:00
6d9a21d0ed
issue #5176 , add focus event listener to UIScrollView
2014-05-23 11:18:26 +08:00
293ced84c2
[AUTO]: updating luabinding automatically
2014-05-23 03:12:39 +00:00
3f363f0e51
issue #5176 , add focus to UIScrollView
2014-05-23 10:59:18 +08:00
26be2708a0
issue #5176 , refactor UIScrollView
2014-05-23 10:08:53 +08:00
5601048829
Fixes compiler warnings for mac and ios
2014-05-22 16:34:16 -03:00
dff6b2f338
fix: Incorrect error buffer in two thread
2014-05-23 01:43:32 +08:00
f02a0c49c0
Merge remote-tracking branch 'github/v3' into v3
2014-05-23 00:47:59 +08:00
e263c5f2de
use shared_ptr for better readibility
2014-05-22 23:34:27 +08:00
eec7a81b02
Set jpeg save quality to 90 (default is only 75, on a scale of 0 to 100).
2014-05-22 16:24:29 +05:30
65fe431eae
issue #5176 , fix a typo
2014-05-22 18:11:27 +08:00
1165ba8bc3
issue #5176 , readd addChild methods into UIListView
2014-05-22 17:49:19 +08:00
d5d0df6933
The default size of CCMenu in CocosBuilder is 0,0
2014-05-22 16:21:51 +08:00
0ab8624d2f
[AUTO]: updating luabinding automatically
2014-05-22 08:08:54 +00:00
c8d9ab8122
issue #5176 , refactor passTouchEventToParent method of UIWidget
2014-05-22 15:23:13 +08:00
76d0448b12
Update UILoadingBar.h Doxygen comments
2014-05-22 15:08:53 +08:00
90cea76008
Fix Repeat will run one more over in rare situations
2014-05-22 15:59:47 +09:00
4d82d8d26b
issue #5176 , rename UIScrollInterface to ScrollViewProtocol
2014-05-22 14:15:29 +08:00
2344928945
issue #5176 , refactor AutoScrollDirection in UIPageView
2014-05-22 14:09:01 +08:00
0c065b4be0
issue #5176 , refactor Layout and UIPageView
2014-05-22 13:51:44 +08:00
a68515dbff
adding guard for the callback condition
2014-05-22 12:42:52 +08:00
111840f37b
add play ui
2014-05-22 11:52:49 +08:00
ebcb7b78a3
issue #5176 , refactor UIPageView
2014-05-22 11:43:02 +08:00
e70a772c0f
issue #5176 , refactor UIPageView
2014-05-22 11:01:58 +08:00
e88d91357b
issue #5176 , refacotr UIPageView
2014-05-22 11:01:58 +08:00
3b777646c4
issue #5176 . fix UIScrollView
2014-05-22 11:01:58 +08:00
e184ac9e0c
issue #5176 , refacotr UIPageView
2014-05-22 11:01:58 +08:00
e9ff42064f
issue #5176 , remove unneeded functions in UIPageView
2014-05-22 11:01:58 +08:00
d5e68e4803
issue #5176 , fix override problems
2014-05-22 11:01:58 +08:00
0e8197b6ee
issue #5176 , add UIFocusManager
2014-05-22 11:01:58 +08:00
d1df19794a
fixed ui header file include problem
2014-05-22 10:49:28 +08:00
cda9183e01
Merge pull request #6861 from boyu0/bug4944_physics_crash
...
closed #4944 : fixed bug: physics engine crashes occasionally when remove...
2014-05-21 18:32:19 +08:00
5547031e5c
Update UILoadingBar.h doxygen comments
2014-05-21 16:35:47 +08:00
b6274a469d
closed #4944 : fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback.
2014-05-21 16:07:49 +08:00
4679e08c3d
networkThreadAlone callback on main thread use lambda
2014-05-21 15:31:58 +08:00
dbd2de63b2
issue #5183 , fix Layout visit issue
2014-05-21 15:21:55 +08:00
3b5417a325
Merge pull request #6854 from MSOpenTech/wp8-v3-fix
...
Wp8 v3 fix for precompiled shaders and precompiled headers
2014-05-21 14:31:18 +08:00
d13ed93fc1
issue #5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.
2014-05-21 14:08:30 +08:00
ac258439b0
close issue#5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.
2014-05-21 11:38:45 +08:00
40df6a28a2
Merge pull request #6844 from Dhilan007/v3-labelfix
...
closed issue#5252:Label:It could be possible that for using outline cause crash.
2014-05-21 11:19:12 +08:00
70346c4437
Merge branch 'v3_wp8fix' of https://github.com/Dhilan007/cocos2d-x into v3-wp8
2014-05-21 10:44:48 +08:00
ed7ecabe8f
replace tab to space.
2014-05-21 10:44:07 +08:00
5a309fbc6e
Merge pull request #6721 from zifter/FixNodeConst
...
[ci skip]Getter always must be a const method.
2014-05-21 09:48:27 +08:00
2a7b223b5b
updated link() for wp8
2014-05-20 11:47:33 -07:00
3971666426
updated pch file for wp8
2014-05-20 10:06:24 -07:00
c0798a3c0a
updated precompiled shaders for wp8
2014-05-20 10:06:02 -07:00
f0e4c97bc6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into wp8-v3-fix
2014-05-20 07:50:12 -07:00
3db6856d27
added missing pch files for WP8
2014-05-20 07:48:42 -07:00
0efc070104
fixed shader compiler after cocos refactor
2014-05-20 07:48:12 -07:00
953ca4a44b
Add immediate send request
2014-05-20 20:08:26 +08:00
f734cc3f7b
[AUTO]: updating luabinding automatically
2014-05-20 11:46:42 +00:00
cd892abc77
android uni error clear & more readable log
2014-05-20 14:52:21 +04:00
a2ebe428da
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-20 18:11:28 +08:00
2d65f9bc6f
issue #5255:Add Sprite3D test cases for Lua
2014-05-20 18:09:04 +08:00
dd428b527b
Merge pull request #6843 from favorcode/v3
...
[ci skip]Update UIImageView.h param name
2014-05-20 17:34:56 +08:00
55c1319426
closed issue#5252:Label:It could be possible that for using outline cause crash.
2014-05-20 16:54:51 +08:00
855b8a2784
Update UIImageView.h
...
Update param name
2014-05-20 16:45:09 +08:00
480c8cfe8f
Merge branch 'fix_revert_pr' into refactor5183
2014-05-20 16:17:38 +08:00
b07e82f7c3
Revert "Revert "Merge pull request #6752 from andyque/refactorLayout""
...
This reverts commit 1ed9b9749e
2014-05-20 16:17:10 +08:00
723e01f5df
issue #5183 , refactor UILayoutExecutant doLayout method
2014-05-20 16:09:30 +08:00
9a276c66a0
Merge pull request #6740 from zifter/FixProgressTo
...
Fix Progress Action. Not working with charging from 100 to 0.
2014-05-20 15:36:10 +08:00
33d8973277
[AUTO]: updating luabinding automatically
2014-05-20 06:44:06 +00:00
1ed9b9749e
Revert "Merge pull request #6752 from andyque/refactorLayout"
...
This reverts commit ae118a9d226f2f2046c7
2014-05-20 14:36:29 +08:00
9cf21f9a6a
Merge pull request #6829 from favorcode/v3
...
[ci skip]Update UIText.h doxygen comments
2014-05-20 14:03:19 +08:00
5ed9e781e4
Update UIText.h
...
Update the doxygen comment
2014-05-20 13:05:20 +08:00
2c47eae1a0
[AUTO]: updating luabinding automatically
2014-05-20 04:10:28 +00:00
ae118a9d22
Merge pull request #6752 from andyque/refactorLayout
...
refactor Layout
2014-05-20 12:07:04 +08:00
6f2f2046c7
Merge pull request #6804 from hyqhyq3/v3
...
fix UIText's fontSize
2014-05-20 11:57:29 +08:00
993b735392
closed #5183 , done
2014-05-20 10:24:22 +08:00
432f688a67
issue #5183 , refactor
2014-05-20 10:16:19 +08:00
e0192e2a1b
issue #5183 , fix win32 compile error
2014-05-20 09:59:12 +08:00
fe01d12a21
issue #5183 , fix android compile error
2014-05-20 09:39:05 +08:00
28c3752641
issue #5183 , refacotr some variable names
2014-05-20 09:36:17 +08:00
834a72315a
issue #5183 , add deprecated function for Widget
2014-05-19 17:43:27 +08:00
9c5f7f0ce3
bug fix FontFNT.cpp
2014-05-19 18:42:11 +09:00
a9e1c50897
issue #5183 , refactor UIScrollView
2014-05-19 17:34:48 +08:00
ee24e137f7
issue #5183 , refactor obscure functions
2014-05-19 17:18:04 +08:00
121d6d3109
issue #5183 , refactor
2014-05-19 16:51:25 +08:00
5ddfc41414
Merge branch 'v3' into refactorLayout
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-19 13:54:16 +08:00
11dcf1e1dd
fix UIText's fontSize
...
if set fontsize before setting font family, fontsize was wrong
2014-05-19 11:38:45 +08:00
9f9b0bc426
[AUTO]: updating luabinding automatically
2014-05-19 03:16:40 +00:00
7d76d774e4
no need to use a singleton inside Director class
2014-05-19 10:00:56 +08:00
a7485bb4e9
[AUTO]: updating luabinding automatically
2014-05-18 22:18:07 +00:00
2ab70ca39b
Point is no longer deprecated
...
As discussed on the forums:
- Point must not be deprecated (not it must not be used internally)
- Point2, Point3, must not be used. Use Vec2, Vec3 instead
2014-05-18 15:12:48 -07:00
6461e26c9f
Squashed commit of the following:
...
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94#33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73#31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29#29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837ceahttps://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e#24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57#18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a#11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27#8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
2014-05-18 14:49:16 -07:00
81ddbaa7b1
update the calculation of device pixel resolution
2014-05-19 01:12:56 +08:00
d875f27c67
Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst
...
Conflicts:
cocos/ui/UIListView.h
cocos/ui/UIPageView.h
2014-05-17 10:40:36 +03:00
7da07342fe
Merge pull request #6734 from 2youyouo2/v3
...
fixed no effect with stopping tween between two frames
2014-05-17 12:17:34 +08:00
844cc9bcef
[AUTO]: updating luabinding automatically
2014-05-17 03:20:49 +00:00
ef700f2e3a
Fixes android build issues
...
also restores file for VS
2014-05-16 18:16:20 -07:00
a1243ca9ed
Squashed commit of the following:
...
commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:37:58 2014 -0700
little fixes in project
commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:33:11 2014 -0700
CopyTemplates working
commit 8c1555cb0369bf123f84733839ef30c30f70f4ff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:22:05 2014 -0700
Re-adds CopyTemplate to VS solution
commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 16:40:22 2014 -0700
Updated shaders
and project fixes
2014-05-16 17:38:52 -07: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
38b4e7ad2c
fix memory leak for GLProgramState create logic
2014-05-16 11:02:23 -07:00
e3f2c3985d
Merge pull request #6777 from boyu0/physics_rollback_for_lua
...
Roll back lua PhysicsTest.
2014-05-16 21:55:52 +08:00
540418840b
Merge pull request #6737 from seobyeongky/dispatcher_bug_fix
...
EventDispatcher bug fix
2014-05-16 18:35:51 +08:00
bf2250a67a
Merge pull request #6738 from cocoscodeide/v3
...
update template project lua
2014-05-16 18:10:10 +08:00
74335a92f7
Roll back lua PhysicsTest.
2014-05-16 17:19:02 +08:00
eb38809630
Merge pull request #6756 from zifter/FixTwiceCallingOnExit
...
Fix twice calling on exit
2014-05-16 17:10:42 +08:00
67a558c83d
for 93562d6aa6
...
update Cocos2dxHelper and AndroidManifest.xml template.
2014-05-16 15:55:00 +08:00
b434840bc9
issue #5183 , add layout parameter type to widget for convenient access
2014-05-16 10:33:28 +08:00
1b3c28ea90
Merge branch 'v3' into refactorLayout
...
Conflicts:
cocos/ui/UILayout.cpp
2014-05-16 10:22:53 +08:00
d6007a395c
Adds a virtual method for loading native libraries.
2014-05-16 10:20:49 +08:00
7e4597508c
Does not crash on Mac if the .ttf file is not found
2014-05-15 17:22:53 -07:00
9d1ab1ba07
uniform sampler CC_Texture0 MUST NOT be defined on shaders
...
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
2014-05-15 16:47:54 -07:00
234c902630
fixing cmakelist after merge
2014-05-15 22:26:41 +09:00
0bec438be8
Merge branch 'v3' of github.com:asmodehn/cocos2d-x into asmo_newv3_cmake_win32
2014-05-15 22:24:33 +09:00
9f67e74878
Merge pull request #6764 from minggo/monkey-test
...
EditBox: Check text content before being sent to cpp
2014-05-15 18:22:35 +08:00
6f6cfba21b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-15 16:57:08 +08:00
cde4e4811b
Update some GuiConstants and resubmission pr#6361.
2014-05-15 16:54:55 +08:00
44c6c4d542
[AUTO]: updating luabinding automatically
2014-05-15 08:18:44 +00:00
95dfbf7dae
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-15 15:40:28 +08:00
5a14b1d67b
fix compile error and synchronizate the UI change for Lua
2014-05-15 15:39:15 +08:00
385b2507aa
Merge pull request #6615 from xhcnb/fix_ActionObject
...
FIx: correct TotalTime of ActionObject.
2014-05-15 15:39:15 +08:00
c8a1004a4d
Little refactor.
2014-05-15 09:43:18 +03:00
fc8d286fcb
closed #5188 , fixed android NULL pointer exception
2014-05-15 12:11:11 +08:00
39d3d65157
Merge pull request #6754 from minggo/monkey-test
...
Matrix -> Mat4
2014-05-15 11:10:39 +08:00
67f809e223
Matrix -> Mat4
2014-05-15 11:09:17 +08:00
cfa0342618
Merge branch 'v3' into issue5005
...
Conflicts:
cocos/ui/UIWidget.cpp
2014-05-15 11:03:03 +08:00
3f08dd2758
issue #5183 , remove no needed type
2014-05-15 10:48:33 +08:00
b32ca246e7
issue #5183 , done
2014-05-15 10:44:19 +08:00
5697d2417a
issue #5183 , done
2014-05-15 10:23:25 +08:00
0639e49031
issue #5183 , add LayoutProtocol
2014-05-15 10:07:42 +08: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
6c025d22b5
Merge pull request #6746 from ricardoquesada/shadertest2_fixes
...
Improvments on the shader2 tests
2014-05-14 13:10:17 -07:00
839170c147
Improvments on the shader2 tests
2014-05-14 13:09:33 -07:00
7b45fc90a8
[AUTO]: updating luabinding automatically
2014-05-14 17:16:02 +00: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
6fcef92708
Fix Progress Action.
2014-05-14 19:13:14 +03:00
90e2b8a4af
move the method from ccUtils to Director
2014-05-14 19:42:24 +08:00
abc08e703f
Merge pull request #6728 from pandamicro/FixParticlesInit
...
Fixed #5040 : Remove memory allocation assertion to permit multiply init
2014-05-14 18:39:13 +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
967c071c68
issue #5183 , refator LayoutExecutant
2014-05-14 18:24:23 +08:00
8c8f9611f7
issue #5183 , add CCLayoutExecutant file
2014-05-14 18:03:44 +08:00
8a92b6cc7f
Merge pull request #6736 from CocosRobot/update_lua_bindings_1400061063
...
[AUTO]: updating luabinding automatically
2014-05-14 18:02:30 +08:00
76cd9911cb
bug fix
2014-05-14 18:58:55 +09:00
fba3bf2d15
Merge pull request #6735 from Dhilan007/v3_labelfix
...
label's small improvement.
2014-05-14 17:58:46 +08:00
6f6d233ea5
[AUTO]: updating luabinding automatically
2014-05-14 09:52:20 +00:00
db0ea94b8a
Merge pull request #6730 from andyque/refactor5110
...
refactor ui framework
2014-05-14 17:47:47 +08:00
6cb3b47488
closed #5110 , refactor
2014-05-14 17:07:24 +08:00
059ea3dd8a
label's small improvement.
2014-05-14 16:41:26 +08:00
dfb016dde3
move the utility from Renderer to UtilsHelper
2014-05-14 16:25:47 +08:00
9d5c2ba773
closed #5110 , add const specifier to getStringLength function
2014-05-14 16:25:30 +08:00
09fce798f0
closed #5110 , add const reference to typedef
2014-05-14 16:14:28 +08:00
437b30487c
issue #5110 , refactor UITextBMFont
2014-05-14 16:02:31 +08:00
76cefcaa3f
issue #5110 , refactor UITextAtlas
2014-05-14 15:51:50 +08:00
e6889dca36
issue #5110 , refactor UIText
2014-05-14 15:26:14 +08:00
e30e05ce92
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-05-14 15:13:38 +08:00
ee4e5e4800
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-14 14:45:15 +08:00
578ff2735d
issue #5110 , fix VideoPlayer android compile error
2014-05-14 14:44:04 +08:00
534ad2aafb
fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value
2014-05-14 14:43:10 +08:00
f22804241a
Merge pull request #6725 from dumganhar/ref-tracker
...
Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses
2014-05-14 13:44:22 +08:00
4c23ff5b8c
trackRef and untrackRef are static function now.
2014-05-14 11:55:20 +08:00
a463a1630f
Fixed #5040 : Remove memory allocation assertion to permit multiply init
2014-05-14 11:49:09 +08:00
46cf6251b6
issue #5110 , rename a member variable and delete gui prefix in ui tests
2014-05-14 11:26:04 +08:00
7b0cf3c860
replace std::function with const std::function&
2014-05-14 11:21:46 +08:00
e6a36fde18
issue #5110 , refactor VideoPlayer
2014-05-14 11:18:11 +08:00
08801c035e
issue #5110 . refactor UILoadingBar, remove unneeded deprecats
2014-05-14 10:48:16 +08:00
e7df247d65
replace more tabs with spaces to uniform the code styles.
2014-05-14 10:40:56 +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
20c50ef189
[AUTO]: updating luabinding automatically
2014-05-14 02:03:18 +00:00
0303e5d270
Merge pull request #6716 from andyque/issue4900
...
closed #4900 , add TTF font to UIText
2014-05-14 09:57:57 +08:00
ca4a7a7e53
issue #4900 , refactor
2014-05-14 09:55:55 +08:00
92d9120967
issue #4900 , refactor
2014-05-14 09:37:21 +08:00
df86b07f15
closed #5005 , refactor
2014-05-14 09:23:56 +08:00
021be6ef9b
Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot
2014-05-14 09:22:36 +08:00
723938e292
Adds effectNode in ShaderTest2
2014-05-13 18:12:58 -07:00
0171e27747
Merge pull request #6714 from Dhilan007/v3_nodefix
...
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
2014-05-13 14:14:27 -07:00
249dffa346
getter always must be a const method.
2014-05-13 23:28:04 +03:00
6462a1bf79
Adds simple sample for multitexturing
2014-05-13 12:55:34 -07:00
31dd70dba2
Matrix::identity() -> IDENTITY
...
consistency with the rest of the cocos2d API
2014-05-13 10:26:25 -07:00
541d03d668
Now it shoudl run fine on iOS
2014-05-14 01:06:26 +08:00
4df8624a54
Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot
2014-05-13 22:37:40 +08:00
a28bdb0ed5
closed #5005 , refactor
2014-05-13 18:41:38 +08: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
fe91f46882
The target filename shuld use a writable path.
2014-05-13 18:34:35 +08:00
2a25afbb76
closed #4900 . add comment
2014-05-13 18:15:53 +08:00
7d7d0b8251
Merge pull request #6712 from dumganhar/dont-using-cocos2d-namespace-in-header
...
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 18:07:18 +08:00
0b301d6602
Merge pull request #5 from cocos2d/v3
...
update cocos2d-x
2014-05-13 17:59:18 +08:00
31a2194dcb
closed #4900 , add TTF font to UIText
2014-05-13 17:45:15 +08:00
0de27ad4f1
Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot
2014-05-13 17:30:16 +08:00
1ced31a2d3
issue #5160 : Don't use static variables, use member variables
2014-05-13 17:29:05 +08:00
5459b581b0
replace tab with spaces; remove the 'flipped' parameter;
2014-05-13 17:17:15 +08:00
41fe56ee70
closed #5005 , fix a null pointer exception
2014-05-13 17:12:48 +08:00
0cd2196b88
closed #5160 : Dispatch a custom event after an animation frame is displayed
2014-05-13 17:08:30 +08:00
d0c98d6269
Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables.
2014-05-13 17:03:48 +08:00
2d88c8ea92
closed #5005 , fix visible and enable issue
2014-05-13 16:37:41 +08:00
1a7ca64be2
Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix
2014-05-13 16:36:42 +08:00
47e4ee4ff2
add a new utility function to capture the screen
2014-05-13 16:23:35 +08:00
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
cd194cad9f
Merge pull request #6711 from ricardoquesada/indent_issues
...
fixes more indentation issues
2014-05-13 00:10:30 -07:00
8aea6fe89f
fixes more indentation issues
2014-05-13 00:10:01 -07:00
7ad48b632a
[AUTO]: updating luabinding automatically
2014-05-13 07:03:12 +00:00
f25de7869b
indentation issues
2014-05-12 23:57:46 -07:00
1c47c833c6
issue #5005 , fixed widget visit method
2014-05-13 14:56:44 +08:00
810c25b85e
Merge branch 'v3' into issue5005
2014-05-13 14:52:49 +08:00
1a319b3f12
issue #5005 , deprecated setTouchEnabled
2014-05-13 14:52:27 +08:00
cdac920b5f
Merge remote-tracking branch 'cocos2d/v3' into multitexturingsupport
2014-05-12 23:52:02 -07:00
71848aca93
Initial multitexturing support
2014-05-12 23:51:37 -07:00
7d8cfc4cca
set parent transform dirty when addChild
2014-05-12 23:28:20 -07:00
75196d96ce
Merge pull request #6696 from andyque/issue5121
...
issue 5121, fix loading bar init flicker and refator percentage
2014-05-13 13:45:01 +08:00
a71ee9924e
closed issue:5020:The game still oriented in landscape mode when update the describes of orientation to Portrait in 'MainPage.xaml'.
2014-05-13 12:53:43 +08:00
7049fd253d
closed #5121 , add const to getPercent method
2014-05-13 12:06:28 +08:00
b2397f4059
issue #5005 , fix widget hittest problem
2014-05-13 12:04:43 +08:00
bf6ed6eb8b
[AUTO]: updating luabinding automatically
2014-05-13 03:39:46 +00:00
ccb55448da
Merge pull request #6685 from andyque/refactor5118
...
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-13 11:35:36 +08:00
7db02fc0e9
closed #5121 , change percentage from int to float
2014-05-13 10:34:08 +08:00
5e01c61d8b
closed #5118 , fix indent
2014-05-13 10:15:29 +08:00
9125673c1c
issue #5121 , fix LoadingBar percentage when initialize
2014-05-13 10:13:08 +08:00
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
c2f7c10f1c
closed #5118 , refactor, improving variable name
2014-05-13 09:56:10 +08:00
5d24b3d99a
Merge pull request #6693 from MSOpenTech/wp8-v3-fix2
...
Fixes for WP8 V3 build recently broken by recent commits
2014-05-12 10:06:32 -07:00
78df412669
updated project files to latest version of cocos2d
2014-05-12 09:27:52 -07:00
34b0245cfe
updated WP8 precompiled shaders
2014-05-12 09:27:27 -07:00
bad71e38d0
fixed for ABSOLUTE and RELATIVE winrt compiler reserved words
2014-05-12 09:26:39 -07:00
50336dca40
updated to latest version of cocos2d
2014-05-12 09:25:37 -07: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
ebffc66a83
closed #5118 , fix CCSGUIReader setAnchorPoint
2014-05-12 18:07:13 +08:00
a0a4df5ac5
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-12 18:00:54 +08:00
9ab2dae212
Merge pull request #6635 from dumganhar/iss4660-unicode
...
issue #4660 : ccUTF8 uses utf8-utf16 conversion in llvm3.4
2014-05-12 17:57:25 +08:00
16b31e3157
[AUTO]: updating luabinding automatically
2014-05-12 08:14:14 +00:00
f290d4d3ff
Merge pull request #6632 from andyque/refactor5057
...
issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of
2014-05-12 16:10:21 +08:00
9a8c87601c
Merge branch 'v3' into refactor5057
2014-05-12 15:52:47 +08:00
64b2562e1f
fixed compile fail on android.
2014-05-12 15:22:57 +08:00
1053cacc16
don't trigger onExitTransitionDidStart
2014-05-12 15:05:21 +08:00
da3e794631
issue #5057 , convert const char* to std::string&
2014-05-12 14:59:00 +08:00
fc72dc040d
Label:fixed wrong logic of alignment.
2014-05-12 14:34:25 +08:00
56f417c520
issue #5057 , fix windows compile error
2014-05-12 14:11:44 +08:00
Huabing.Xu