| .. |
|
2d
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
|
2014-06-04 09:19:22 -07:00 |
|
3d
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
|
2014-06-04 09:19:22 -07:00 |
|
audio
|
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
|
2014-05-29 15:25:58 +08:00 |
|
base
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
|
2014-06-04 09:19:22 -07:00 |
|
deprecated
|
Point is no longer deprecated
|
2014-05-18 15:12:48 -07:00 |
|
editor-support
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
|
2014-06-04 09:19:22 -07:00 |
|
math
|
Point is no longer deprecated
|
2014-05-18 15:12:48 -07:00 |
|
network
|
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
|
2014-05-29 15:25:58 +08:00 |
|
physics
|
closed #4944: fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback.
|
2014-05-21 16:07:49 +08:00 |
|
platform
|
Merge pull request #6954 from visiblelight/AlphaIssues
|
2014-06-04 10:04:20 +08:00 |
|
renderer
|
Merge branch 'v3.1hotfix' into v3
|
2014-05-30 10:19:56 +08:00 |
|
scripting/lua-bindings
|
Merge pull request #6955 from samuele3hu/v3_fix
|
2014-06-05 11:49:40 +08:00 |
|
storage
|
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
|
2014-05-07 17:41:04 +03:00 |
|
ui
|
Compiles on Windows and Android
|
2014-06-04 09:48:35 -07:00 |
|
Android.mk
|
fix other platform compile error
|
2014-06-04 14:56:34 +08:00 |
|
CMakeLists.txt
|
Squashed commit of the following:
|
2014-05-18 14:49:16 -07:00 |
|
cocos2d-prefix.pch
|
Squashed commit of the following:
|
2014-05-16 14:36:00 -07:00 |
|
cocos2d.cpp
|
update version
|
2014-05-23 14:30:08 +08:00 |
|
cocos2d.h
|
move the capturen screen interface from Director to ccUtils
|
2014-05-27 10:44:23 +08:00 |
366beedbb2