mannewalis
|
6b1f994c40
|
turn off global new delete
|
2014-12-17 13:55:14 -05:00 |
mannewalis
|
a6eab3c496
|
Merge branch 'v3' into mem_alloc_again
|
2014-12-17 11:59:24 -05:00 |
mannewalis
|
34a2f6f640
|
minor tweak
|
2014-12-17 11:56:19 -05:00 |
mannewalis
|
fd22242fb2
|
added locking semantics to fixed block allocator
pool allocator uses lockless semantics by default
|
2014-12-17 11:54:06 -05:00 |
minggo
|
9da1317f10
|
Merge pull request #9453 from sxd1140/v3
add stopActionByName()
|
2014-12-17 18:32:04 +08:00 |
minggo
|
e7fc2a5607
|
Merge pull request #9531 from samuele3hu/v3_4_bug
Synchronize the KeyCode Enum to Lua
|
2014-12-17 11:32:20 +08:00 |
samuele3hu
|
5c20885ad1
|
Synchronize the KeyCode Enum to Lua
|
2014-12-17 11:27:01 +08:00 |
minggo
|
d9953d4aac
|
Merge pull request #9519 from andyque/addNewRequirements
refactor Button restrict capInsetSize logic and cleanup ui coding style
|
2014-12-17 09:53:31 +08:00 |
minggo
|
f2eb185470
|
Merge pull request #9526 from CocosRobot/update_lua_bindings_1418726510
[AUTO]: updating luabinding automatically
|
2014-12-17 09:52:40 +08:00 |
CocosRobot
|
189e386846
|
[AUTO]: updating luabinding automatically
|
2014-12-16 10:44:15 +00:00 |
minggo
|
6ce24b05af
|
Merge pull request #9525 from natural-law/v3
[ci skip] Update the reference of submodule cocos2d-console.
|
2014-12-16 18:37:42 +08:00 |
minggo
|
cd7e8a6dac
|
[ci skip] Update CHANGELOG
|
2014-12-16 18:32:43 +08:00 |
minggo
|
116ff0de63
|
Merge pull request #9439 from andyque/addcreateMethodToLoadingBar
add TextureResType to LoadingBar's create method
|
2014-12-16 18:31:20 +08:00 |
minggo
|
e800b3d9ba
|
Merge pull request #9501 from joewan/v3-fix-mismatch
V3 fix uninitialized members.
|
2014-12-16 18:28:36 +08:00 |
minggo
|
048fc500c9
|
Merge pull request #9505 from CocosRobot/update_lua_bindings_1418695925
[AUTO]: updating luabinding automatically
|
2014-12-16 18:28:05 +08:00 |
zhangbin
|
bc81065220
|
Merge branch 'v3' of github.com:natural-law/cocos2d-x; branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2014-12-16 17:24:51 +08:00 |
zhangbin
|
f7a6472748
|
Update the reference of submodule cocos2d-console.
|
2014-12-16 17:19:06 +08:00 |
andyque
|
16cf396ed7
|
refactor Button restrict capInsetSize logic and cleanup ui coding style
|
2014-12-16 16:44:04 +08:00 |
CocosRobot
|
3d327deb6d
|
[AUTO]: updating luabinding automatically
|
2014-12-16 02:14:01 +00:00 |
minggo
|
5a4c4c61af
|
Merge pull request #9458 from natural-law/v3
Solve the environment conflict with Cocos.
|
2014-12-16 10:09:03 +08:00 |
minggo
|
b3731fa06a
|
Merge pull request #9486 from 2youyouo2/v3_EventFrame
fixed frame event
|
2014-12-16 09:53:43 +08:00 |
minggo
|
26d555cd0b
|
[ci skip] Update CHANGELOG
|
2014-12-16 09:50:37 +08:00 |
minggo
|
6b18305550
|
Merge pull request #9497 from Dhilan007/v3-game
Fixed content size of Label is incorrect after sets empty string.
|
2014-12-16 09:48:36 +08:00 |
minggo
|
392d8ece98
|
Merge pull request #9495 from vovkasm/pull/fix-tinyxml-usage
Fix usage of tinyxml2 in cocostudio code
|
2014-12-16 09:47:31 +08:00 |
mannewalis
|
640695c21c
|
reverting android properties change
|
2014-12-15 16:31:22 -08:00 |
mannewalis
|
9be9c09a9f
|
fixes to cpp-tests for android allocator tests
|
2014-12-15 16:21:39 -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 |
joewanchen
|
7b23e3ab1d
|
remove useless function call.
|
2014-12-15 19:47:25 +08:00 |
joewanchen
|
713d19c830
|
initialize _contentSizeDirty.
|
2014-12-15 19:43:54 +08:00 |
joewanchen
|
0cc4b58383
|
initialize _startPointCaptured.
|
2014-12-15 19:42:25 +08:00 |
Wenhai Lin
|
4ed5872ba3
|
Fixed content size of Label is incorrect after sets empty string.
|
2014-12-15 14:36:57 +08:00 |
zhangbin
|
399297179b
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2014-12-15 14:15:04 +08:00 |
youyou
|
69824ff07b
|
add space for readable
|
2014-12-15 09:36:21 +08:00 |
Vladimir Timofeev
|
be01bede63
|
Fix couple of warnings. Make forward declarations to match to real declarations.
|
2014-12-14 21:04:14 +03:00 |
Vladimir Timofeev
|
6494a7abae
|
Hide tinyxml2 from user visible header.
|
2014-12-14 20:32:24 +03:00 |
Vladimir Timofeev
|
9bd1ab74c7
|
Replace #include "tinyxml2/tinyxml2.h" to #include "tinyxml2.h" in new cocostudio code. This should fix build with cmake when USE_PREBUILT_LIBS=NO. Because FindTinyXML2.cmake find tinyxml2.h header (without prefix dir). And some systems install tinyxml2 includes without special directory.
Also this inclusion style match other existing files such as cocos/platform/CCFileUtils.cpp
|
2014-12-14 12:14:16 +03: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 |
youyou
|
579bb3f8d8
|
fixed frame event
|
2014-12-12 18:02:03 +08:00 |
minggo
|
e060360d9b
|
Merge pull request #9483 from cocoscodeide/v3
[ci skip]update runtime version
|
2014-12-12 15:49:17 +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 |
honghui
|
3c3b190be8
|
update runtime version
|
2014-12-12 15:47:12 +08:00 |
minggo
|
75d9fd1b63
|
Merge pull request #9482 from minggo/v3
[ci skip]update release note
|
2014-12-12 15:41:01 +08:00 |