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 |
Kenichi Hamada
|
771996f9f3
|
Added a function getAssetManager() on CCFileUtilsAndroid
|
2014-08-06 13:36:04 +09:00 |
huangshiwu
|
9a3f231771
|
merge v3 into v3_wp8glviewhookpr
|
2014-08-04 16:49:42 +08:00 |
huangshiwu
|
efcb8b9962
|
wp8 glview hook solution 1
|
2014-08-04 14:17:14 +08:00 |
huangshiwu
|
372479d812
|
wp8 GLView Hook
|
2014-08-02 16:31:16 +08:00 |
huangshiwu
|
ef69faf3ba
|
GLView Hook
|
2014-07-31 00:53:04 +08:00 |
Ningyu
|
aebe8317bd
|
spaces
|
2014-07-29 17:22:13 +08:00 |
Ningyu
|
d5242ef4fa
|
add
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
|
2014-07-29 17:06:43 +08:00 |
minggo
|
191f7a57e1
|
Merge pull request #7078 from reckhou/v3
Optimize FPS control algorithm under Android.
|
2014-07-28 14:00:55 +08:00 |
minggo
|
9efbd6e4ef
|
Merge pull request #7600 from pandamicro/FileUtils_FILE_API
Refactor #5580: Improve searchFullPathForFilename and comments
|
2014-07-28 11:34:13 +08:00 |
pandamicro
|
823bd437d8
|
Refactor #5580: Improve searchFullPathForFilename and comments
|
2014-07-28 11:14:11 +08:00 |
minggo
|
cf7de08f22
|
Merge pull request #7594 from boyu0/image_premulti_alpha_refactor
Image premultiplied alpha refactor
|
2014-07-28 11:02:33 +08:00 |
boyu0
|
85b9765b8f
|
Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()
|
2014-07-28 10:38:22 +08:00 |
Dhilan007
|
f7a08d5697
|
Fix the size of VideoPlayer is incorrect on android.
|
2014-07-28 10:09:46 +08:00 |
boyu0
|
34a8d26124
|
Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image.
|
2014-07-25 18:19:04 +08:00 |
boyu0
|
e3b79f4150
|
delete Image::_preMulti, Deprecate Image::isPremultipliedAlpha(), change Image::hasPremultipliedAlpha() meaning.
|
2014-07-25 18:01:32 +08:00 |
minggo
|
20e3a61524
|
Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2
mac custom font fix v2
|
2014-07-25 11:38:38 +08:00 |
minggo
|
98943b4517
|
Merge pull request #7548 from yongkangchen/v3
fix Label::setTextColor did not have any effect.
|
2014-07-25 11:18:10 +08:00 |
minggo
|
b0c922d91e
|
Merge pull request #7188 from pandamicro/FileUtils_FILE_API
Refactor #5580: Add new file&directory apis into FileUtils and test cases
|
2014-07-24 22:18:10 +08:00 |
Reck Hou
|
44c675f9ee
|
Fix: Application::setAnimationInterval() not implemented.
|
2014-07-24 19:22:17 +08:00 |
Unai Orbe
|
ae56e637f8
|
allow setting bundle to use in file utils
|
2014-07-24 11:56:59 +01:00 |
Sergey
|
9501b9912d
|
load font v2
|
2014-07-24 12:25:07 +04:00 |
Sergey
|
59cbc153d4
|
Copyright & small fixes
|
2014-07-22 15:49:38 +04:00 |
Sergey
|
9c0493d40b
|
mipmaps loading fix
|
2014-07-22 15:49:37 +04:00 |
Sergey
|
600dbebfb0
|
pvr 2bpp decompression fixed
|
2014-07-22 15:49:37 +04:00 |
Sergey
|
1a617ad804
|
pvr display fix pvr decompression on 64 bit platforms fix
|
2014-07-22 15:49:36 +04:00 |
Sergey
|
2acce6771f
|
software per decompression support
|
2014-07-22 15:49:36 +04:00 |
minggo
|
8cc25f82e6
|
fix compiling error
|
2014-07-22 17:03:27 +08:00 |
Yongkang Chen
|
bb7d6ba3d4
|
fix Label::setTextColor did not have any effect.
|
2014-07-22 14:52:41 +08:00 |
zhangcheng
|
bc254cab25
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CocosStudioSurpport
|
2014-07-21 20:46:55 +08:00 |
Huabing.Xu
|
3403182f3e
|
change define macros to avoid run error on mac 32 bit
|
2014-07-21 18:12:46 +08:00 |
zhangcheng
|
6cfc5b72dc
|
1. CocosStudio adapt to cocos2d-x v3.2.
|
2014-07-21 17:45:56 +08:00 |
pandamicro
|
d2c6602dea
|
Refactor #5580: Merge createDirectories to createDirectory
|
2014-07-21 16:51:48 +08:00 |
minggo
|
45fa2363e8
|
Merge pull request #7517 from dabingnn/v3_dll
V3 dll
|
2014-07-21 11:53:36 +08:00 |
minggo
|
e128a432c1
|
Merge pull request #7521 from andyque/fixTextFieldDeleteBug
fix TextField backspace delete bug
|
2014-07-18 18:37:07 +08:00 |
andyque
|
73b38fbc6b
|
fix TextField backspace delete bug
|
2014-07-18 18:13:17 +08:00 |
minggo
|
aef1e01ce5
|
Merge pull request #7518 from natural-law/android-dependencies
Android dependencies
|
2014-07-18 17:57:42 +08:00 |
Huabing.Xu
|
0be2210724
|
rename CGSize to NSSize
|
2014-07-18 16:51:29 +08:00 |
pandamicro
|
b614854cf9
|
Refactor #5580: Improve createDirectories
|
2014-07-18 15:09:00 +08:00 |
Huabing.Xu
|
8afd7614d1
|
Merge branch 'v3' into v3_dll
|
2014-07-18 14:01:17 +08:00 |
Dale Stammen
|
24462e1ded
|
updated wp8 precompiled shaders
|
2014-07-17 09:41:07 -07:00 |
minggo
|
867fb18c5d
|
Merge pull request #7503 from CaiCQ/v3
修正Linux下中文显示问题
|
2014-07-17 22:05:15 +08:00 |
Dhilan007
|
51aba5dae4
|
fixed magic number.
|
2014-07-17 21:19:09 +08:00 |
Dhilan007
|
229b30ed8b
|
Fixed VideoPlayer can't quitting the full screen mode by press the back key.
|
2014-07-17 21:10:26 +08:00 |
Huabing.Xu
|
21b3e55339
|
Mac dylib version works now
|
2014-07-17 20:58:50 +08:00 |
CCQ
|
2bda9f62a1
|
Merge branch 'v3' of github.com:CaiCQ/cocos2d-x into v3
|
2014-07-17 18:58:55 +08:00 |
CCQ
|
cb3b9b8405
|
修正Linux下中文显示不全问题
|
2014-07-17 18:42:23 +08:00 |
Huabing.Xu
|
3c6e87d34e
|
Merge branch 'v3' into v3_dll
Conflicts:
cocos/base/ccUtils.h
|
2014-07-17 14:12:10 +08:00 |
minggo
|
e58626c11c
|
Merge pull request #7476 from Dhilan007/v3-gc0717
Fixed bugs[Ouya controller]
|
2014-07-17 11:12:31 +08:00 |
Dhilan007
|
1ff937aa48
|
Fixed bugs[Ouya controller]:
1.fix joysticks are reporting the same keycode
2.fix lose disconnected event
|
2014-07-17 11:09:08 +08:00 |
minggo
|
43fe305cc9
|
Merge pull request #7283 from taug/v3
could add seach path and resolution order path in front.
|
2014-07-17 10:34:45 +08:00 |
minggo
|
4c7d777f25
|
Merge pull request #7471 from visiblelight/wp8_shader_update
Wp8 shader update
|
2014-07-17 10:14:54 +08:00 |
vision
|
c47d844d20
|
update the buildin shaders on WP8. Disable the effect 3d test.
|
2014-07-17 10:08:49 +08:00 |
minggo
|
a653d0eb28
|
Merge pull request #7440 from boyu0/add_utils_atof
Add utils::atof(), fix bug: particle not shown on android.
|
2014-07-17 09:59:15 +08:00 |
Dhilan007
|
7e76b7b9a1
|
Remove prompt box of connect controller[Nibiru].
|
2014-07-16 14:48:22 +08:00 |
zhangbin
|
7e7c3a1e55
|
Merge branch 'v3' into android-dependencies
|
2014-07-16 13:49:20 +08:00 |
Huabing.Xu
|
0350186589
|
Merge branch 'v3' into v3_dll
|
2014-07-16 11:15:16 +08:00 |
boyu0
|
c7fec217ba
|
Change atof() to utils::atof()
|
2014-07-14 20:45:24 +08:00 |
Huabing.Xu
|
469dbea7da
|
window dll version work now
|
2014-07-14 14:40:47 +08:00 |
Dhilan007
|
b3017fb773
|
fixed crash cause by incorrect font name.
|
2014-07-14 10:01:29 +08:00 |
zhangbin
|
b0c465d96b
|
Adjust the dependencies between modules on android.
|
2014-07-14 09:48:16 +08:00 |
minggo
|
bf4b376ae5
|
return correct language type
|
2014-07-12 20:40:15 +08:00 |
minggo
|
ecb915fabf
|
fix warnings
|
2014-07-11 17:39:56 +08:00 |
minggo
|
f205c0b704
|
Merge pull request #7392 from xhcnb/fix_CC_ENABLE_SCRIPT_BINDING_build
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
|
2014-07-11 13:41:33 +08:00 |
minggo
|
6c37541657
|
Merge pull request #7363 from Dhilan007/v3-event-clear
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
|
2014-07-11 13:36:52 +08:00 |
Jason Xu
|
d94941243a
|
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
|
2014-07-11 10:27:00 +08:00 |
Dhilan007
|
dfbeb0fb63
|
Update Nibiru SDK and remove prompt box of install driver .
|
2014-07-10 22:33:58 +08:00 |
Dhilan007
|
6cff8cb564
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
Dhilan007
|
dbcb20b886
|
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
Make clear EVENT_COME_TO_FOREGROUND event.
|
2014-07-09 23:03:04 +08:00 |
minggo
|
eba1735d04
|
Merge pull request #7347 from Dhilan007/v3-memory-leak
fixed memory leak cause by singleton.
|
2014-07-08 21:13:56 +08:00 |
minggo
|
c2474ea7c0
|
Merge pull request #7262 from pandamicro/origin_v3
Indicate correct button and cursor position infomation in mouse move event
|
2014-07-08 21:07:09 +08:00 |
pandamicro
|
d597a535c1
|
Refactor #5580: Make isDirectoryExist support relative path
|
2014-07-08 18:26:11 +08:00 |
Dhilan007
|
10defddc2e
|
fixed memory leak cause by singleton.
|
2014-07-08 18:22:48 +08:00 |
minggo
|
b0d260d293
|
Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9
Fix UITextField IME can't auto detach
|
2014-07-08 10:56:16 +08:00 |
Dhilan007
|
6e2caf1c78
|
fixed can's set color for LabelTTF correctly on IOS.
|
2014-07-08 10:31:14 +08:00 |
Dhilan007
|
d1034fdaae
|
1.fixed lose disconnected event.
2.fixed incorrect device name and device id;
|
2014-07-07 17:47:07 +08:00 |
Dhilan007
|
68bd717ea7
|
issue #4689: support external key.
|
2014-07-07 12:06:24 +08:00 |
LinWenhai
|
992245e744
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor
|
2014-07-04 15:29:40 +08:00 |
Dhilan007
|
552a9251c4
|
issue #4689: Refactor controller API.
|
2014-07-04 15:22:53 +08:00 |
minggo
|
1a089f4a18
|
Merge pull request #7286 from Dhilan007/v3-gc0702
fixed can't get valid value from trigger button.
|
2014-07-02 16:24:24 +08:00 |