minggo
|
3581c00301
|
Merge pull request #9619 from yinjimmy/trackLogForWindows
Track log for windows
|
2014-12-26 09:28:23 +08:00 |
yinjimmy
|
b21eaab047
|
using suitable variable name
|
2014-12-25 19:39:44 +08:00 |
yinjimmy
|
b4a442cd8c
|
fix compile error on windows
|
2014-12-25 09:33:28 +08:00 |
minggo
|
42f1d5fdf3
|
Merge pull request #9601 from minggo/set-glcolor
Director supports setting clear color
|
2014-12-24 14:45:43 +08:00 |
minggo
|
b925689435
|
Director supports setting clear color
|
2014-12-24 11:53:38 +08:00 |
minggo
|
5d8e004b9b
|
Merge pull request #9600 from huangshiwu/v3_allocator_wp
fix allocator related compile error on wp8/8.1 and winrt
|
2014-12-24 10:54:16 +08:00 |
huangshiwu
|
01eeb15a8d
|
fix allocator related compile error on wp8/8.1 and winrt
|
2014-12-24 10:45:29 +08:00 |
yinjimmy
|
a26f62186b
|
track log for windows
|
2014-12-24 01:26:13 +08:00 |
minggo
|
dea483b6ef
|
performance improve
|
2014-12-23 18:07:22 +08:00 |
minggo
|
40d00e3d97
|
Merge pull request #9554 from super626/sync_load
create 3d sprite asynchronously
|
2014-12-23 12:00:13 +08:00 |
yangxiao
|
3d77c7535d
|
merge cocos
|
2014-12-23 10:35:35 +08:00 |
yangxiao
|
2309a524fd
|
simplify AsyncTaskPool
|
2014-12-23 10:12:37 +08:00 |
mannewalis
|
9d885fe664
|
default lock macros to nothing for unsupported platforms
|
2014-12-22 19:49:20 -05:00 |
mannewalis
|
09f2eed4b8
|
default lock macros to nothing for unsupported platforms
|
2014-12-22 19:46:16 -05:00 |
mannewalis
|
aad45d6952
|
fixing windows8 build
|
2014-12-22 19:43:40 -05:00 |
yangxiao
|
1ba826ea17
|
modify code style
|
2014-12-22 17:40:02 +08:00 |
minggo
|
20beb3b9e0
|
Merge pull request #9567 from joewan/v3-improve-perf
fix serious performance problem of Animate.
|
2014-12-22 14:57:26 +08:00 |
joewanchen
|
3765f87651
|
fix.
|
2014-12-21 00:49:23 +08:00 |
mannewalis
|
50bd3cf2b7
|
modify inline macro to work on windows
|
2014-12-19 10:57:19 -05:00 |
XiaoYang
|
6be4538f3d
|
Merge pull request #181 from songchengjiang/sync_load
fix errors on Windows
|
2014-12-19 13:33:20 +07:00 |
WenhaiLin
|
4366fb7230
|
Fix compile error on WIN32.
|
2014-12-19 11:49:40 +08:00 |
songchengjiang
|
f5f95c5693
|
fix errors on Windows
|
2014-12-19 11:30:51 +08:00 |
yangxiao
|
f4dbaa53e4
|
add to linux
|
2014-12-19 10:29:10 +08:00 |
yangxiao
|
5aad841080
|
add stop task
|
2014-12-19 10:22:02 +08:00 |
mannewalis
|
467a5e9c12
|
minor changes for linux build
|
2014-12-18 18:21:49 -05:00 |
mannewalis
|
c05a6c877d
|
adding files to cmake files
|
2014-12-18 18:10:13 -05:00 |
yangxiao
|
f54f8a4826
|
remove return value of enque
|
2014-12-18 16:16:04 +08:00 |
yangxiao
|
6e99698c59
|
Merge branch 'newcode' into sync_load
|
2014-12-18 14:03:07 +08:00 |
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 |
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
|
0cc4b58383
|
initialize _startPointCaptured.
|
2014-12-15 19:42:25 +08:00 |
yangxiao
|
5ad408530c
|
merge cocos
|
2014-12-15 17:47:05 +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 |
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 |
yangxiao
|
5bc74e55df
|
modify comment
|
2014-12-05 15:59:21 +08:00 |
yangxiao
|
b665daf2f8
|
add comment
|
2014-12-05 15:55:01 +08:00 |
yangxiao
|
60e1b54b1a
|
fix ~ThreadTasks() bug
|
2014-12-05 15:25:56 +08:00 |
yangxiao
|
c99185b755
|
add async load test
|
2014-12-05 15:01:30 +08:00 |
yangxiao
|
bc57e47ddb
|
add async task callback dipatcher, call it in the main thread
|
2014-12-04 18:31:10 +08:00 |