Dale Stammen
|
d8c2927944
|
added base/allocator files
|
2014-12-30 21:41:46 -08:00 |
Dale Stammen
|
f73a07c7b9
|
added missing files
|
2014-12-30 17:27:37 -08:00 |
andyque
|
19dc8b5d19
|
fix conflicts and wp8, wp8.1 linker error
|
2014-12-25 18:11:59 +08:00 |
andyque
|
29e9ef7edf
|
Merge branch 'v3' into modifyWidgetDefaultBehavior
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
|
2014-12-25 18:08:07 +08:00 |
yusheng.lu
|
fa5b4f8df7
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
resolve the conflicts
|
2014-12-24 13:06:38 +08:00 |
huangshiwu
|
01eeb15a8d
|
fix allocator related compile error on wp8/8.1 and winrt
|
2014-12-24 10:45:29 +08:00 |
andyque
|
d8f726bc4f
|
modify widget default behavior
|
2014-12-23 15:03:31 +08:00 |
yusheng.lu
|
2de5ba7c2f
|
vs filters update
|
2014-12-22 19:43:14 +08:00 |
yusheng.lu
|
b0bfc2906a
|
change armature codes files path
|
2014-12-22 18:26:50 +08:00 |
pipu
|
26a6c9a724
|
Modify libcocos2d_wp8.vcxproj, libcocos2d_wp8.vcxproj.filters, libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters, cpp-tests.Shared.vcxitems, cpp-tests.Shared.vcxitems.filters
|
2014-12-02 12:30:34 +08:00 |
Dale Stammen
|
267edeafd3
|
fixed wp8 project files for flatbuffers
|
2014-11-27 05:22:07 -08:00 |
pipu
|
48f280b478
|
Update .vcxproj, vcxproj.filters files for wp8, Windows 8.1 WindowsPhone 8.1
|
2014-11-27 18:27:22 +08:00 |
pipu
|
889f84e540
|
newest v3 flatbuffers
|
2014-11-26 13:29:23 +08:00 |
Ricardo Quesada
|
9e10d2d32b
|
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
This reverts commit fa22b12628 , reversing
changes made to 8dce62b94c .
|
2014-11-24 10:19:53 -08:00 |
pipu
|
6be17520c7
|
Config android, linux, wp8
|
2014-11-21 18:08:09 +08:00 |
Dhilan007
|
a5f838496c
|
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
|
2014-10-20 16:25:24 +08:00 |
Dale Stammen
|
d5b0830c3b
|
added missing files
|
2014-10-16 11:15:39 -07:00 |
Dale Stammen
|
4bed458371
|
added missing protobuf-lite files
|
2014-10-14 17:41:40 -07:00 |
Dale Stammen
|
180fa4c324
|
added new cocos2d wp8 dll project files
|
2014-10-14 14:28:06 -07:00 |