Dale Stammen 8da06fb9cc Merge branch 'v3' into v3-win8.1-appstate		2014-11-25 08:07:29 -08:00
..
2d	Revert "Merge pull request #9193 from pipu/v3_flatbuffers"	2014-11-24 10:19:53 -08:00
3d	Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS	2014-11-18 17:48:54 +03:00
audio	Fix OpenAL include paths, cmake search include paths for case, when openal includes as "#include <al.h>"	2014-11-18 17:27:43 +03:00
base	sync with upstream	2014-11-20 12:19:00 +03:00
deprecated	Multi platform cmake support	2014-10-03 23:21:45 +01:00
editor-support	Revert "Merge pull request #9193 from pipu/v3_flatbuffers"	2014-11-24 10:19:53 -08:00
math	Update MathUtilNeon64.inl	2014-11-12 14:15:29 +08:00
network	Add finding curl. Fix some leftovers from websockets.	2014-11-16 13:55:42 +03:00
physics	try to fix ubuntu 12.04 compile error	2014-10-10 17:27:15 +08:00
platform	Merge branch 'v3' into v3-win8.1-appstate	2014-11-25 08:07:29 -08:00
renderer	added winrt and wp8 support for EVENT_RENDERER_RECREATED	2014-11-21 10:00:34 -08:00
scripting/lua-bindings	Merge remote-tracking branch 'origin/v3' into cmake-linux-mac-fixes	2014-11-25 15:24:07 +03:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #9205 from Dhilan007/v3-scriptfix	2014-11-24 15:22:00 +08:00
Android.mk	Revert "Merge pull request #9193 from pipu/v3_flatbuffers"	2014-11-24 10:19:53 -08:00
CMakeLists.txt	Move prebuilt libraries config to distinct file.	2014-11-20 12:05:15 +03:00
cocos2d.cpp	fixes compiler warnings	2014-11-14 13:07:34 -08:00
cocos2d.h	Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d	2014-10-20 16:25:24 +08:00