minggo
|
49c6d1e746
|
Merge pull request #7819 from minggo/androidmk-optimize
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 16:11:40 +08:00 |
minggo
|
cdd67be77a
|
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 15:29:40 +08:00 |
minggo
|
dd1bc70cde
|
Merge pull request #7271 from newnon/v3_getPreviousLocation_fix
bug on began touch - prevpoint
|
2014-08-19 09:49:01 +08:00 |
teivaz
|
db805ee2c8
|
* Fixed WP8 cocos library project
* Fixed profiling macros
|
2014-08-19 19:24:56 +03:00 |
CocosRobot
|
4236e89245
|
[AUTO]: updating luabinding automatically
|
2014-08-18 15:26:32 +00:00 |
minggo
|
38fdef614a
|
Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling
add swallow touch and propagation to parent widgets customization
|
2014-08-18 23:16:22 +08:00 |
CocosRobot
|
85d505b427
|
[AUTO]: updating luabinding automatically
|
2014-08-18 14:47:35 +00:00 |
minggo
|
22fa650bbf
|
Merge pull request #7807 from samuele3hu/v3_3_3d_module
Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8
|
2014-08-18 22:38:58 +08:00 |
minggo
|
2f2ee43b21
|
Merge pull request #7808 from 2youyouo2/v3
fixed ArmatureAnimation::setSpeedScale
|
2014-08-18 18:19:23 +08:00 |
minggo
|
e2829cd68a
|
Merge pull request #7802 from SmartCat/v3
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32
|
2014-08-18 16:56:15 +08:00 |
kaile.yin
|
6abaf27b14
|
fixed ArmatureAnimation::setSpeedScale
|
2014-08-18 16:19:54 +08:00 |
samuele3hu
|
91fd40dd3a
|
Add a newline for some files
|
2014-08-18 15:27:54 +08:00 |
samuele3hu
|
2d8ae3a917
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module
|
2014-08-18 15:08:04 +08:00 |
samuele3hu
|
e0168c373c
|
Add manual lua bindings for 3d and adjust related test case on different platform
|
2014-08-18 15:04:32 +08:00 |
samuele3hu
|
7596a8a831
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-18 14:58:57 +08:00 |
samuele3hu
|
6259aebdab
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-17 23:45:56 +08:00 |
Dmitry Bushtets
|
1257f642c7
|
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)
|
2014-08-15 13:20:37 +03:00 |
CocosRobot
|
bdfc48b127
|
[AUTO]: updating luabinding automatically
|
2014-08-15 07:44:57 +00:00 |
minggo
|
f2f8035724
|
Merge pull request #7708 from super626/obb
AABB, OBB
|
2014-08-15 15:32:14 +08:00 |
andyque
|
0e637b4d9f
|
add swallow touch and propagation customization to UIWidgets
|
2014-08-15 15:28:28 +08:00 |
andyque
|
cf8e40f8ce
|
deprecated UICheckBox setSelectedState/getSelectedState, use isSelected/setSelected instead
|
2014-08-15 15:26:19 +08:00 |
minggo
|
b842c57954
|
Merge pull request #7794 from minggo/seperate-jpg-tiff-webp
Seperate jpg tiff webp
|
2014-08-15 15:24:09 +08:00 |
CocosRobot
|
24f0e8aada
|
[AUTO]: updating luabinding automatically
|
2014-08-15 07:23:17 +00:00 |
minggo
|
8364e179a4
|
Merge pull request #7780 from andyque/addOptionsForHardCodedValue
add customization to UIButton and UIPageView
|
2014-08-15 15:16:12 +08:00 |
minggo
|
e59283343a
|
Merge pull request #7751 from zawasp/win32_minimize
add minimize / restore for desktop (win32, linux, mac)
|
2014-08-15 15:00:13 +08:00 |
minggo
|
11b4793d75
|
Merge pull request #7793 from dabingnn/v3_fixRandomCrashForPrimitive
fix android background and foreground crash for primitive
|
2014-08-15 14:56:49 +08:00 |
minggo
|
408472625c
|
add CCModuleManager into CMakeLists.txt
|
2014-08-15 14:46:21 +08:00 |
minggo
|
aa052eb1c1
|
add CCModuleManager into vs project
|
2014-08-15 14:39:15 +08:00 |
minggo
|
bf75e9996a
|
separate jpeg, tiff and webp
|
2014-08-15 14:29:10 +08:00 |
Huabing.Xu
|
5e7b75c5c7
|
fix android background and foreground crash for primitive
|
2014-08-15 14:05:17 +08:00 |
minggo
|
bcbb589cfb
|
Merge pull request #7784 from Teivaz/v3
Fixed WP8 compilation errors
|
2014-08-15 13:39:05 +08:00 |
minggo
|
38fb58cf29
|
Merge pull request #7792 from minggo/fix-warning
fix warnings
|
2014-08-15 13:33:08 +08:00 |
minggo
|
db17084b6d
|
fix warnings
|
2014-08-15 12:06:16 +08:00 |
teivaz
|
90e5870499
|
* Fixed WP compilation errors (added CCPrimitive, CCPrimitiveCommand, CCVertexIndexBuffer and CCVertexIndexData to the project)
|
2014-08-14 15:35:36 +03:00 |
teivaz
|
885fd16b9e
|
* Fixed WP8 compilation error (Added missing files CCCamera.h/cpp to the project)
|
2014-08-14 15:20:48 +03:00 |
teivaz
|
e9563696db
|
* Fixed WP8 compilation errors (added path to CCGLView.h)
- Modified filters for CCCamera.h/cpp
|
2014-08-14 15:14:25 +03:00 |
yangxiao
|
a508477eda
|
remove unused code
|
2014-08-14 19:07:40 +08:00 |
yangxiao
|
2786e63824
|
Merge branch 'newcode' into obb
|
2014-08-14 18:58:46 +08:00 |
minggo
|
3f2fccb999
|
Merge pull request #7771 from samuele3hu/v3_3_module
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
|
2014-08-14 18:33:53 +08:00 |
minggo
|
1643c29a00
|
Merge pull request #7782 from liang8305/v3
mLastTickInNanoSeconds is the renderStart
|
2014-08-14 18:11:41 +08:00 |
yangxiao
|
84bb22780a
|
merge cocos2d
|
2014-08-14 17:16:20 +08:00 |
yangxiao
|
ab783d2702
|
merge cocos2d
|
2014-08-14 17:12:39 +08:00 |
胖梁
|
3619fb943a
|
mLastTickInNanoSeconds is the renderStart
because:
this.mLastTickInNanoSeconds = renderEnd - renderInterval;
renderInterval = renderEnd - renderStart
so:
this.mLastTickInNanoSeconds = renderEnd - ( renderEnd - renderStart );
so:
this.mLastTickInNanoSeconds = renderStart ;
so:
no need nanoTime() twice
|
2014-08-14 17:07:04 +08:00 |
andyque
|
e8a5147b92
|
copy new added widget property to clone method
|
2014-08-14 16:56:15 +08:00 |
Mircea Rila
|
d9a0c6a2ad
|
replace tabs with spaces
|
2014-08-14 10:48:09 +03:00 |
andyque
|
e27a2aee91
|
fix typo
|
2014-08-14 14:36:30 +08:00 |
yangxiao
|
1942a27a5c
|
Merge branch 'newcode' into v3_merge
|
2014-08-14 13:55:57 +08:00 |
lvlong
|
dbf58b8873
|
modify function name and add default to switch block.
|
2014-08-14 13:15:37 +08:00 |
andyque
|
18851d3e81
|
add customization to UIButton and UIPageView
|
2014-08-14 11:14:24 +08:00 |
samuele3hu
|
85ad4241a0
|
Modify Xcode project setting
|
2014-08-14 11:10:52 +08:00 |