yinjimmy
|
e309dd69b1
|
add missing files
|
2015-01-09 11:33:24 +08:00 |
dualface
|
9030e32adc
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support
|
2015-01-09 11:30:35 +08:00 |
youyou
|
1d7a4a5c05
|
fixed event frame will go twice loop when goto frame
|
2015-01-09 10:24:38 +08:00 |
songmiao
|
9de5371202
|
fix bug and add notes
|
2015-01-09 10:23:40 +08:00 |
WenhaiLin
|
718c400bfa
|
Fixed bodies display wrong in Physics:Pump test case
|
2015-01-09 10:21:50 +08:00 |
htl
|
0cf63712e9
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-09 10:02:45 +08:00 |
Takao Kato
|
ba0beaffdc
|
fixed getParentToNodeTransform. it returned a wrong transform if _transformDirty was true.
|
2015-01-09 09:58:09 +08:00 |
minggo
|
3ebf8ef22b
|
Merge pull request #9885 from Dhilan007/v3-physics-fix-scale-rotation
Fixed can't update scale and rotation of static body
|
2015-01-09 09:45:04 +08:00 |
WenhaiLin
|
c9a8dfb6ee
|
Fixed can't update scale and rotation of static body
|
2015-01-09 09:37:55 +08:00 |
minggo
|
ae46980c0a
|
Merge pull request #9882 from yinjimmy/bugfix_executeScriptFile
Fix: executeScriptFile can not load .luac file when .lua is not exist
|
2015-01-09 09:30:27 +08:00 |
Nite Luo
|
e7480a7efb
|
Enable tansparent queue and create camera rotation demo
|
2015-01-08 16:30:00 -08:00 |
yinjimmy
|
bdac739541
|
Fix: executeScriptFile can not load .luac file when .lua is not exist
|
2015-01-09 04:18:41 +08:00 |
dualface
|
c041787f01
|
update proj.android for template
|
2015-01-09 04:14:31 +08:00 |
yinjimmy
|
d2a3a6a8c0
|
merge lua-template-default with lua-template-runtime
|
2015-01-09 04:08:41 +08:00 |
dualface
|
7046f508da
|
update proj.win32 for templates
|
2015-01-09 03:10:54 +08:00 |
yinjimmy
|
650b398419
|
move files
|
2015-01-08 21:12:44 +08:00 |
Jun Hiroe
|
e4d560b658
|
Replace tabs with spaces in cocos/2d dir
|
2015-01-08 20:17:45 +09:00 |
minggo
|
01798147d9
|
Merge pull request #9872 from Dhilan007/v3-fixtypo
Fixed typo
|
2015-01-08 18:27:42 +08:00 |
WenhaiLin
|
83cf479cb4
|
Fixed typo
|
2015-01-08 16:57:03 +08:00 |
songmiao
|
71820e6db1
|
add notes, deal with opengl shader in windows device, fix bug
|
2015-01-08 15:16:47 +08:00 |
Huabing.Xu
|
644e1e3502
|
Merge pull request #9864 from CocosRobot/update_lua_bindings_1420698630
[AUTO]: updating luabinding automatically
|
2015-01-08 14:37:52 +08:00 |
CocosRobot
|
6b67f55ab5
|
[AUTO]: updating luabinding automatically
|
2015-01-08 06:32:36 +00:00 |
Huabing.Xu
|
5f8d69d447
|
Merge pull request #9862 from Dhilan007/v3-physics-performance2
[Physics]Reduce temporary object creation and save mathematical labor
|
2015-01-08 14:27:52 +08:00 |
Wenhai Lin
|
61438f7297
|
[Physics]Reduce temporary object creation and save mathematical labor
|
2015-01-08 14:25:06 +08:00 |
Huabing.Xu
|
865ae56d9b
|
Merge pull request #9858 from CocosRobot/update_lua_bindings_1420684648
[AUTO]: updating luabinding automatically
|
2015-01-08 14:25:04 +08:00 |
minggo
|
d279a3908a
|
Merge pull request #9860 from CocosRobot/update_cocosfiles_1420697145
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-08 14:21:55 +08:00 |
yinjimmy
|
82f37fcf72
|
add libsimulator
|
2015-01-08 14:10:28 +08:00 |
CocosRobot
|
f6de697bde
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-08 06:05:46 +00:00 |
Huabing.Xu
|
4bdd3f0811
|
Merge pull request #9850 from dabingnn/v3_updatedep31
update deps to 31
|
2015-01-08 14:03:46 +08:00 |
yinjimmy
|
dee536def2
|
support win32
|
2015-01-08 13:36:59 +08:00 |
Huabing.Xu
|
2919e77532
|
Merge pull request #9859 from dabingnn/v3_updateChangeLog
[ci skip] update changelog
|
2015-01-08 11:03:57 +08:00 |
Huabing.Xu
|
0c4a180c2b
|
[ci skip] update changelog
|
2015-01-08 11:02:24 +08:00 |
CocosRobot
|
822c38b129
|
[AUTO]: updating luabinding automatically
|
2015-01-08 02:40:40 +00:00 |
Huabing.Xu
|
2b71c57b52
|
Merge pull request #9840 from Dhilan007/v3-physics-performance
Improve performance of Physics
|
2015-01-08 10:33:51 +08:00 |
Huabing.Xu
|
b5f8666caf
|
Merge pull request #9855 from huangshiwu/v3_XmlHttpRequest
Fix XmlHttpRequestTest parsing error of response header on iOS platform
|
2015-01-08 10:28:34 +08:00 |
htl
|
240b43891a
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-08 10:20:56 +08:00 |
huangshiwu
|
108e4d2b41
|
Add comments and improve code readability for HttpAsynConnection.m
|
2015-01-08 10:12:45 +08:00 |
minggo
|
1b612fd97a
|
Merge pull request #9842 from andyque/improveTextPerformance
improve ui::Text and ui::TextField creation performance
|
2015-01-08 09:31:49 +08:00 |
minggo
|
f0aaacae5d
|
Merge pull request #9853 from suzukaze/fix-indents
Replace tab with spaces.
|
2015-01-08 09:29:05 +08:00 |
Huabing.Xu
|
0f0e54a00b
|
Merge pull request #9839 from yinjimmy/bugfix_executeScriptFile
Compatibility code for executeScriptFile
|
2015-01-08 09:26:47 +08:00 |
yinjimmy
|
70e0874add
|
Compatibility code for executeScriptFile
|
2015-01-08 09:01:39 +08:00 |
yinjimmy
|
197ab05a99
|
cleanup
|
2015-01-08 08:56:31 +08:00 |
Nite Luo
|
b675a2ca61
|
Turn off Depth Write by default, only 3D opaque object will write to Depth buffer
|
2015-01-07 16:35:08 -08:00 |
huangshiwu
|
be02233815
|
Fix XmlHttpRequestTest parsing error of response header on iOS platform
|
2015-01-08 00:23:27 +08:00 |
Jun Hiroe
|
ca86bce60d
|
Replace tab with spaces
|
2015-01-07 23:46:28 +09:00 |
yinjimmy
|
f1f4e5f3c2
|
support android
|
2015-01-07 22:19:46 +08:00 |
yinjimmy
|
4fee8a5926
|
support iOS
|
2015-01-07 22:18:27 +08:00 |
dualface
|
ecd611d3eb
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support
|
2015-01-07 21:19:22 +08:00 |
Huabing.Xu
|
06d583c5ea
|
update deps to 31
|
2015-01-07 18:36:59 +08:00 |
songmiao
|
dfa6137ce9
|
modify arcball and fog shader
|
2015-01-07 17:58:10 +08:00 |