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
|
02b9269cff
|
completed multiplatform projects
|
2014-12-22 19:39:10 +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
|
117d7bd5e8
|
fixed universal app project files for flatbuffers
|
2014-11-27 05:34:36 -08:00 |
pipu
|
1633b7f475
|
Reset libcocos2d_8_1.Windows.vcxproj, libcocos2d_8_1.Windows.vcxproj.filters, libcocos2d_8_1.WindowsPhone.vcxproj, libcocos2d_8_1.WindowsPhone.vcxproj.filters
|
2014-11-27 20:02:03 +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 |
Dale Stammen
|
b6329c6c7b
|
added correct options to compile c file
|
2014-10-23 13:27:24 -07:00 |
Dale Stammen
|
b520e80e04
|
updated 2d and base file locations
|
2014-10-23 09:03:35 -07:00 |
Dale Stammen
|
a4f13a91ab
|
added CC_NO_GL_POINTSIZE preprocessor define
|
2014-10-23 07:36:23 -07:00 |
Dale Stammen
|
89d3d7b7cf
|
added missing cocos2d files
|
2014-10-23 07:29:57 -07:00 |
Dale Stammen
|
d5b0830c3b
|
added missing files
|
2014-10-16 11:15:39 -07:00 |
Dale Stammen
|
8983a57869
|
added Windows 8.1 universal app project files
|
2014-10-14 14:25:01 -07:00 |
Dale Stammen
|
eb74b642da
|
added Windows 8.1 universal app project files
|
2014-10-14 14:23:39 -07:00 |