zhangbin
|
119fec9efe
|
Merge branch 'develop' into dragonbones
# Conflicts:
# external/config.json
|
2016-09-13 16:29:59 +08:00 |
|
pandamicro
|
f581b673eb
|
Fix Android compilation issues for simulator
|
2016-09-08 15:40:01 +08:00 |
|
zhangbin
|
ed591faa19
|
Merge branch 'develop' into dragonbones
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# external/config.json
|
2016-09-08 09:52:09 +08:00 |
|
zhangbin
|
4acadb9595
|
Update the version of rapid json.
|
2016-09-02 11:40:59 +08:00 |
|
pandamicro
|
651551055a
|
Fix mac simulator
|
2016-09-02 10:57:21 +08:00 |
|
natural-law
|
a240bef9bc
|
Add dragonbones project for win32.
|
2016-08-30 15:21:48 +08:00 |
|
zhangbin
|
36bdf9aac7
|
Update the version of rapid json.
|
2016-08-30 11:48:57 +08:00 |
|
minggo
|
835acc20c8
|
fix crash
|
2016-07-20 10:40:09 +08:00 |
|
minggo
|
5f74ad1981
|
revert correct search path
|
2016-07-20 10:23:05 +08:00 |
|
zhangbin
|
b397ac686e
|
Solve the errors in simulator project.
|
2016-07-12 14:00:09 +08:00 |
|
2youyouo2
|
ea3f6634e0
|
fixed simulator http request
|
2016-06-24 17:52:33 +08:00 |
|
2youyouo2
|
47f7f34117
|
default support resize window in simulator desktop
|
2016-06-06 11:54:08 +08:00 |
|
Nan Wang
|
b47e5bf5ea
|
add prebult mk to output
|
2016-05-12 17:59:42 +08:00 |
|
Nan Wang
|
dd000ca571
|
tweaked title for resolution option
|
2016-05-04 09:54:28 +08:00 |
|
Nan Wang
|
946e4ba516
|
fix comma
|
2016-05-04 09:50:21 +08:00 |
|
Nan Wang
|
9690cf55c9
|
add iphone 6 resolution
|
2016-05-04 09:50:02 +08:00 |
|
2youyouo2
|
4a7b42fc3f
|
update simulator config.json
|
2016-05-03 14:33:33 +08:00 |
|
2youyouo2
|
fd876c82f9
|
fixed mac simulator
|
2016-04-15 10:36:44 +08:00 |
|
2youyou2
|
4cabfc4e45
|
update win32 project
|
2016-04-14 18:56:00 +08:00 |
|
2youyou2
|
5f83d4a2e3
|
update win32 config
|
2016-04-14 11:46:16 +08:00 |
|
2youyouo2
|
6ca97fef49
|
add simulator
|
2016-04-13 16:43:49 +08:00 |
|