mogemimi
|
fc6c612c4c
|
Remove duplicate header includes
|
2016-05-26 23:25:44 +09:00 |
mogemimi
|
16878a53b1
|
Suppress MSVC warning C4800
|
2016-05-13 11:44:17 +09:00 |
minggo
|
a5602cc732
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
mogemimi
|
6433172fae
|
Fix shadow variable warning in GameNode3DReader
|
2016-05-02 10:57:03 +09:00 |
zilongshanren
|
482788c933
|
Add tizen support (#15518)
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
|
2016-04-28 09:49:55 +08:00 |
xpol
|
1e70fb5eb5
|
Remove include of cocos2d.h (#15435)
|
2016-04-18 15:09:21 +08:00 |
肖峰
|
44331137d8
|
Fix in cpp-test bugs test scene 13 crash
|
2016-03-29 16:45:16 +08:00 |
Xpol Wan
|
90456d29ba
|
Fixes 1605 include path in 541 files
using the tools/coding-style/include-linter.py with -f options.
|
2016-03-20 21:53:44 +08:00 |
XiaoFeng
|
0a657cd219
|
Remove cocos2dx.h reference from all cocos studio related files
|
2016-03-16 14:02:08 +08:00 |
geron-cn
|
7824acc34e
|
fix scrollview bugs:
- fix bar's position not right after size changed
- fix bar setAutoHideEnabled some time not right
|
2016-03-10 18:06:20 +08:00 |
beichen.liu
|
8f9233be00
|
Fix the bug that TextField may be set with a multi-line localized text.
|
2016-03-09 09:31:34 +08:00 |
beichen.liu
|
b207d559ae
|
Change the interface of LocalizationHelper::setCurrentManager.
|
2016-03-04 10:34:04 +08:00 |
geron-cn
|
4f6fd3ef64
|
Squashed commit of the following:
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
|
2016-03-03 14:17:48 +08:00 |
beichen.liu
|
4e4558e509
|
Modify the interface of localization manager.
|
2016-03-01 14:27:12 +08:00 |
beichen.liu
|
fe917e00fc
|
Add language localization support for Button, Text, TextField and TextBMFont.
|
2016-02-29 18:00:14 +08:00 |
Wenhai Lin
|
4992037c5c
|
Avoid creating temporary string objects
|
2016-02-03 23:12:37 +08:00 |
geron-cn
|
7b405b29bc
|
fix code indent
|
2016-01-21 11:33:13 +08:00 |
geron-cn
|
be6fd6a2ee
|
format code indent
|
2016-01-21 10:27:37 +08:00 |
geron-cn
|
87434e2774
|
add scrollview bar parse for cocostudio in reader
|
2016-01-20 21:13:59 +08:00 |
Wenhai Lin
|
4fa58602a8
|
Adds `std::nothrow` to the `new` statements
|
2015-12-16 14:02:55 +08:00 |
mogemimi
|
9ec1e2069a
|
Fix deprecated warnings
|
2015-11-13 14:38:48 +09:00 |
liamcindy
|
872141d547
|
update for light3d reader
|
2015-11-03 13:34:21 +08:00 |
unknown
|
917edbcf62
|
update for light3d reader
|
2015-10-29 09:53:54 +08:00 |
Liam
|
7280a963b3
|
fix light3D reader error
|
2015-10-20 15:24:34 +08:00 |
pandamicro
|
f64105b3dc
|
Merge pull request #14047 from liamcindy/v3.9
update for light3d reader
|
2015-10-10 11:43:05 +08:00 |
mogemimi
|
5993304e06
|
Fix typos
|
2015-10-09 17:59:11 +09:00 |
Liam
|
8368762b37
|
update for light3D
|
2015-09-29 18:33:28 +08:00 |
Liam
|
87a406febe
|
update for light3d reader
|
2015-09-29 11:27:01 +08:00 |
WenhaiLin
|
a17a702cd1
|
Refine components to improve performance
|
2015-09-18 14:34:02 +08:00 |
子龙山人
|
59c1b21d0b
|
Merge pull request #13634 from WenhaiLin/v3.8-textreader-refine
This is a small optimization about TextReader.
|
2015-09-01 09:40:52 +08:00 |
WenhaiLin
|
df383de894
|
This is a small optimization about TextReader.
|
2015-08-31 17:06:11 +08:00 |
Liam
|
ed49250b9b
|
update for reader
1.update for sprite3d cullface
2.sync js code
|
2015-08-27 18:29:45 +08:00 |
Liam
|
5a997cec1c
|
update reader with skybox valid
|
2015-08-26 10:22:20 +08:00 |
Liam
|
c998639c30
|
update interface for gamenode3d
|
2015-08-25 15:18:09 +08:00 |
Liam
|
650a5c2318
|
update reader with new skybox
|
2015-08-25 13:20:19 +08:00 |
pandamicro
|
11113c85da
|
Improved logic of skybox reader fix
|
2015-08-24 10:02:38 +08:00 |
Liam
|
110de9ee3e
|
fix skybox crash with error data
|
2015-08-24 10:02:37 +08:00 |
Liam
|
788be3016a
|
update annotation
|
2015-08-20 18:04:49 +08:00 |
Liam
|
aa6f2ec4b6
|
fix object size error while data is error
|
2015-08-20 11:27:01 +08:00 |
肖峰
|
0473b08dbb
|
Fix gamenode3d parse failed error
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
|
2015-08-17 22:42:21 +08:00 |
pandamicro
|
f1cbd00b30
|
Merge pull request #13414 from liamcindy/V3.8_reader
fix code informal
|
2015-08-17 17:21:01 +08:00 |
Liam
|
b40ef51337
|
fix code informal
|
2015-08-17 17:16:26 +08:00 |
pandamicro
|
66d99d392c
|
Merge pull request #13409 from liamcindy/V3.8_reader
fix userCamera flag error with old version files
|
2015-08-17 17:01:59 +08:00 |
Liam
|
e3ac9414f4
|
fix userCamera flag error with olg version files
|
2015-08-17 14:37:28 +08:00 |
Liam
|
7aa36d14be
|
fix the skybox display error from editor files
|
2015-08-17 13:04:25 +08:00 |
andyque
|
82f597ce98
|
Merge branch 'v3.7.1' into v3
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
|
2015-08-12 17:59:50 +08:00 |
Liam
|
34000f4bde
|
fix particle3d crash with error file
|
2015-08-06 15:13:54 +08:00 |
pandamicro
|
b9602127a4
|
Merge pull request #13187 from xiaofeng11/v3.7.1
Remove file error notice label from TextBMFontReader
|
2015-08-04 13:38:17 +08:00 |
XiaoFeng
|
0f90999419
|
Remove file error notice label from TextBMFontReader to keep consistency with other components
|
2015-08-04 11:45:29 +08:00 |
pandamicro
|
25cb0d2896
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
# web
|
2015-08-03 19:47:56 +08:00 |