minggo
|
e4920ffdea
|
fix conflict
|
2014-08-29 15:45:21 +08:00 |
minggo
|
3679d66c8e
|
remove unneeded includes
|
2014-08-29 15:39:52 +08:00 |
andyque
|
cf0baef7c0
|
add web view javascript support
|
2014-08-29 11:50:08 +08:00 |
andyque
|
cd031c4493
|
Merge branch 'v3' into addWebView
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
|
2014-08-29 10:25:24 +08:00 |
minggo
|
b8447baf73
|
Merge pull request #7893 from slackmoehrle/glview_fix
Glview fix
|
2014-08-28 10:10:17 +08:00 |
Ricardo Quesada
|
781b0bc478
|
properties revert back to 10
|
2014-08-27 16:35:13 -07:00 |
Ricardo Quesada
|
3dda35b4ef
|
Adds `std::nothrow` to `new`
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
|
2014-08-27 16:31:57 -07:00 |
Slack-Moehrle
|
1b5413d8b4
|
comment out [glview release]; and [eaglview release];
|
2014-08-27 10:42:27 -07:00 |
Slack-Moehrle
|
d4d2b8c83e
|
comment out [glview release]; and [eaglview release];
|
2014-08-27 10:26:09 -07:00 |
andyque
|
3d97ddc739
|
Merge branch 'v3' into addWebView
Conflicts:
cocos/ui/Android.mk
|
2014-08-27 14:08:16 +08:00 |
minggo
|
04bfbdd5a1
|
fix conflict
|
2014-08-27 13:50:01 +08:00 |
minggo
|
d290076917
|
invoke nativeOnPause after onSurfaceCreated is invoked
|
2014-08-27 10:13:03 +08:00 |
minggo
|
b9c51e6994
|
remove unneeded codes
|
2014-08-26 18:19:28 +08:00 |
andyque
|
15815118a2
|
finish android version
|
2014-08-26 16:53:37 +08:00 |
andyque
|
631e1a70c4
|
add WebView-inl.h and refactor Android code
|
2014-08-26 14:26:37 +08:00 |
minggo
|
e5ac6e204b
|
Merge pull request #7864 from minggo/module-devide
Module devide
|
2014-08-25 11:01:19 +08:00 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07:00 |
huangshiwu
|
07af58c0c2
|
OpenGL context attributions setting revise -2
|
2014-08-22 16:22:16 +08:00 |
huangshiwu
|
7f57d15cb3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_glviewattrs
|
2014-08-22 11:04:13 +08:00 |
huangshiwu
|
7dec715288
|
OpenGL context attributions setting revise
|
2014-08-22 10:55:39 +08:00 |
minggo
|
4563e65427
|
fix compiling error on android and fix some coding style
|
2014-08-21 15:41:05 +08:00 |
minggo
|
b349ce43ae
|
use macro to control whether to use jpeg, tiff, webp or not
|
2014-08-21 15:19:26 +08:00 |
huangshiwu
|
2369a5900d
|
merge v3 to v3_glviewattrs
|
2014-08-21 10:18:55 +08:00 |
huangshiwu
|
2a03bea1a4
|
OpenGL context attributions setting
|
2014-08-21 09:35:32 +08:00 |
minggo
|
d91dc842de
|
Merge pull request #7822 from Teivaz/v3_WP8
Added method for custom precompiled shader program loading in WP8
|
2014-08-20 11:22:26 +08:00 |
teivaz
|
0e5a79d486
|
+ [WP8] Added method for custom precompiled shader program loading
|
2014-08-20 12:02:16 +03:00 |
Sergey
|
bfe6513706
|
setKeepScreenOn method
|
2014-08-19 15:00:58 +04:00 |
teivaz
|
0e7ec265ee
|
* [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res"
|
2014-08-20 11:54:41 +03: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 |
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
|
bf75e9996a
|
separate jpeg, tiff and webp
|
2014-08-15 14:29:10 +08:00 |
minggo
|
1643c29a00
|
Merge pull request #7782 from liang8305/v3
mLastTickInNanoSeconds is the renderStart
|
2014-08-14 18:11:41 +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 |
Mircea Rila
|
d9a0c6a2ad
|
replace tabs with spaces
|
2014-08-14 10:48:09 +03:00 |
andyque
|
e2d609c05d
|
add UITextField color & place hold color, fix double delete bug
|
2014-08-13 11:28:37 +08:00 |
Mircea Rila
|
cfafeb1e87
|
add minimize / restore for win32
|
2014-08-12 22:22:47 +03:00 |
minggo
|
bed1ccf0f3
|
Merge pull request #7733 from huangshiwu/v3_glviewfix
CCGLView modefy
|
2014-08-12 09:51:27 +08:00 |
huangshiwu
|
77bc3a0e60
|
GLView modefy additional
|
2014-08-11 16:55:23 +08:00 |
huangshiwu
|
1177b0d545
|
CCGLView modefy
|
2014-08-11 16:15:02 +08:00 |
cpascal
|
5e1570e36e
|
Fix a correct onGLFWCharCallback
|
2014-08-10 01:42:21 +09:00 |
huangshiwu
|
6ce16546b5
|
winrt compile fix -addtional
|
2014-08-08 10:47:14 +08:00 |
huangshiwu
|
8ee4340db3
|
fix winrt complie error
|
2014-08-07 18:38:11 +08:00 |
huangshiwu
|
b7aa046cd2
|
wp8 compile fix -additional
|
2014-08-07 14:09:22 +08:00 |
huangshiwu
|
0016c7af70
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix
|
2014-08-07 11:58:01 +08:00 |
huangshiwu
|
24d68305e1
|
WP8 compile fix
|
2014-08-07 11:56:28 +08:00 |
minggo
|
a7d5b7af56
|
Merge pull request #7691 from Dhilan007/v3
fixed can's set outline color for system font correctly on IOS.
|
2014-08-07 10:52:59 +08:00 |
minggo
|
7b11c6a74e
|
Merge pull request #7237 from martell/v3
Cmake update and remove old scripts from build folder
|
2014-08-07 10:36:10 +08:00 |
minggo
|
4542b1882d
|
Merge pull request #7617 from rny/SpriteFrameCache
SpriteFrameCache load from plist file content data
|
2014-08-07 10:20:36 +08:00 |
Dhilan007
|
9da4ba14f5
|
fixed can's set outline color for system font correctly on IOS.
|
2014-08-07 10:04:29 +08:00 |
martell
|
75911658aa
|
Make CMake More Robust
|
2014-08-06 15:43:19 +01:00 |