mannewalis
fd22242fb2
added locking semantics to fixed block allocator
...
pool allocator uses lockless semantics by default
2014-12-17 11:54:06 -05:00
mannewalis
640695c21c
reverting android properties change
2014-12-15 16:31:22 -08:00
mannewalis
a095635459
android fixes
2014-12-15 16:21:12 -08:00
mannewalis
b532ce74d8
diagnostics track allocator enable
2014-12-15 16:16:35 -08:00
mannewalis
c50bf94c59
removing Allocator<T> and inheriting base directly.
2014-12-15 09:34:25 -08:00
mannewalis
cb547413d2
fix range error on reporting all allocators
2014-12-13 11:45:08 -08:00
mannewalis
58be92b35f
added more diagnostic info.
...
still crashing, but only on device. Suspect a free(p) that was allocated with new.
2014-12-13 11:42:35 -08:00
mannewalis
e81e9a7f47
fixing some issues, still crashing, but want to keep changes.
2014-12-13 10:40:45 -08:00
mannewalis
7b2fea798a
add total count and fix remaining reporting issues
2014-12-12 17:16:44 -08:00
mannewalis
00da483e1b
minor changes
2014-12-12 14:54:24 -08:00
mannewalis
595b3c1cd2
some minor tweaks comments and logging
2014-12-12 10:54:59 -08:00
mannewalis
bc7757a366
adding allocator system
2014-12-12 08:57:06 -08:00
minggo
cf8b6120a0
Merge pull request #9481 from super626/v3
...
CullFace state change bug and fix #9465
2014-12-12 15:48:31 +08:00
XiaoYang
b106b2f7ce
Merge pull request #175 from lvlonggame/v3
...
fix bug: same model in mirror state cullFace problem.
2014-12-12 09:52:01 +07:00
minggo
7acb8bfddf
Merge pull request #9477 from pipu/update_serialize_plist_file_name
...
Update that serialize plist file name and load plist file
2014-12-12 10:13:18 +08:00
pipu
accf66c49f
Update that serialize plist file name
2014-12-11 19:15:04 +08:00
minggo
93561fcb8e
[ci skip]update version
2014-12-11 18:14:28 +08:00
minggo
07c9251557
Merge pull request #9462 from edwardzhou/fix_UIText_clone_missing_contentSize
...
Fix UIText miss copy contentSize for clone
2014-12-11 17:55:32 +08:00
minggo
f0f393654e
Merge pull request #9459 from pipu/fix_#9457
...
Fixes #9457
2014-12-11 15:12:48 +08:00
minggo
d7c722c67f
Merge pull request #9455 from samuele3hu/v3_cocostudio
...
Add Websocket support for Mac platform
2014-12-11 15:12:10 +08:00
lvlong
d0ce99413d
fix bug: same model in mirror state cullFace problem.
2014-12-11 14:24:26 +08:00
Edward Zhou
1ca92411fc
Fix UIText miss copy contentSize for clone
2014-12-11 13:33:28 +08:00
pipu
70b9767c56
1. Fixes #4957 that click test TestChangePlaySection, then it will crash.
...
2. Modify default value of selectedState to serialize check box data.
2014-12-11 11:34:31 +08:00
minggo
a1c60bcf24
Merge pull request #9452 from minggo/java-style
...
[ci skip]use java coding style
2014-12-11 10:55:14 +08:00
minggo
48345a0d65
Merge pull request #9441 from pipu/update_reader
...
Update Reader
2014-12-11 10:02:38 +08:00
minggo
7c07bc6a90
Merge pull request #9449 from Dhilan007/v3-keycode
...
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-11 09:58:57 +08:00
samuele3hu
5d3008d6ac
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
2014-12-11 09:51:18 +08:00
minggo
1d1028a68b
Merge pull request #9410 from andyque/fixEditBox_v3
...
Fix edit box v3
2014-12-10 18:54:20 +08:00
minggo
0e7470505f
replace tab with 4 spaces
2014-12-10 18:32:58 +08:00
Dhilan007
8b78c181ce
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-10 18:11:07 +08:00
minggo
77ed7a47e2
use java coding style
2014-12-10 18:07:46 +08:00
pipu
d3351a4b11
1. Fix bug that after load .csb file, call Text widget's setString(), content of string dosen't line wrap and content of Text is chaotic.
...
2. Update how to parse attribute scale9Enabled
2014-12-10 17:35:39 +08:00
pipu
e81dca372a
Update that sets default value of font name for ButtonReader, TextFieldReader, TextReader
2014-12-10 15:46:58 +08:00
pipu
6b6fe4129d
Update Reader
2014-12-10 12:36:14 +08:00
minggo
33a8c0d49b
Merge pull request #9434 from CocosRobot/update_lua_bindings_1418121129
...
[AUTO]: updating luabinding automatically
2014-12-10 11:15:09 +08:00
minggo
eef6d08813
Merge pull request #9402 from doomsdayer/v3_listview
...
V3 listview
2014-12-10 11:13:42 +08:00
samuele3hu
4b43fab3e6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-12-09 21:03:01 +08:00
CocosRobot
b0aacdc287
[AUTO]: updating luabinding automatically
2014-12-09 10:34:49 +00:00
samuele3hu
7e8da62ebc
Add Websocket support for Mac platform
2014-12-09 18:29:20 +08:00
pipu
f54254494c
Update CCActionTimelineCache.cpp, LayoutReader.cpp, PageViewReader.cpp, ScrollViewReader.cpp, TextFieldReader.cpp, TextReader.cpp
2014-12-09 15:13:09 +08:00
minggo
5ab4f16fb1
Merge pull request #9411 from pipu/v3_reader_update
...
V3 reader update
2014-12-09 13:44:55 +08:00
yusheng.lu
7426a32d9f
1. ListView demo compeleted.
...
2. Optimized ListViewReader format.
2014-12-08 19:00:12 +08:00
minggo
7749e11614
Merge pull request #9414 from CocosRobot/update_lua_bindings_1418033522
...
[AUTO]: updating luabinding automatically
2014-12-08 18:16:50 +08:00
CocosRobot
e510f24663
[AUTO]: updating luabinding automatically
2014-12-08 10:14:41 +00:00
minggo
dd5659b6eb
Merge pull request #9401 from minggo/iss9398-not-close-dir
...
invoke closedir after invoke opendir
2014-12-08 18:10:41 +08:00
minggo
b6b9a5013f
Merge pull request #9404 from super626/v3
...
bug fix
2014-12-08 18:08:25 +08:00
pipu
56a25a2644
Update reader
2014-12-08 15:48:24 +08:00
andyque
119a68afd9
fix EditBox move animation position is wrong on iPhone6 Plus
2014-12-08 15:34:58 +08:00
andyque
d53d71610b
Merge branch 'v3' into fixEditBox_v3
2014-12-08 15:20:06 +08:00
pipu
c3365a4654
Add interface that create node with flat buffers object for simulator
2014-12-08 14:32:33 +08:00