James Chen
|
1e39b59c8d
|
Update CHANGELOG [ci skip]
|
2014-01-23 11:56:59 +08:00 |
CocosRobot
|
b0c828b471
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-23 03:56:45 +00:00 |
James Chen
|
9292d92f63
|
Merge pull request #5143 from pandamicro/develop
closed #3806: SAXParser was supported with manual binding in JSB
|
2014-01-22 19:50:15 -08:00 |
James Chen
|
5ede8088c8
|
Update CHANGELOG [ci skip]
|
2014-01-23 11:26:24 +08:00 |
James Chen
|
aba15dfc2d
|
Merge pull request #5172 from dumganhar/use-unified-cceglview
Using unified 'desktop/CCEGLView.h/cpp' for Windows platform too.
|
2014-01-22 19:23:44 -08:00 |
James Chen
|
8bcdb0ace0
|
Merge pull request #5173 from lihex/issue#3781
Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows
|
2014-01-22 19:22:24 -08:00 |
James Chen
|
bb650729c3
|
Updates cocos_files.json.
|
2014-01-23 11:08:10 +08:00 |
James Chen
|
5dfcb76398
|
Updates template CMakeLists.txt.
|
2014-01-23 11:07:54 +08:00 |
lihex
|
ecdd64a889
|
issue #3781, Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows.
|
2014-01-23 10:48:03 +08:00 |
James Chen
|
3829a1aa46
|
Merge pull request #5166 from heliclei/develop
[jenkins]add post build script
|
2014-01-22 18:47:43 -08:00 |
James Chen
|
ce28972269
|
Updates cocos/2d/cocos2d.vcxproj.
|
2014-01-23 10:36:44 +08:00 |
James Chen
|
19062d716d
|
Updates includes path to 'desktop/CCEGLView.h'. And added windows relevant codes.
|
2014-01-23 10:27:42 +08:00 |
samuele3hu
|
86bd3e12df
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
|
2014-01-23 10:18:12 +08:00 |
samuele3hu
|
36421ca3b9
|
fix:Update the RELEASE_NOTES.md file
|
2014-01-23 10:10:39 +08:00 |
James Chen
|
9b02f97217
|
Updates windows project to use the unified 'desktop/CCEGLView.h/.cpp'.
|
2014-01-23 09:58:12 +08:00 |
minggo
|
a1729fa1b4
|
Merge pull request #5159 from natural-law/develop
Add test case for issue 2572
|
2014-01-22 17:49:56 -08:00 |
Ricardo Quesada
|
d8dae17a56
|
Merge pull request #5170 from ricardoquesada/release-notes-fixes
Updates releaes notes with renderer updates
|
2014-01-22 17:43:50 -08:00 |
Ricardo Quesada
|
a2d167b885
|
Updates releaes notes with renderer updates
|
2014-01-22 17:43:17 -08:00 |
Ricardo Quesada
|
c48415ef3c
|
Merge pull request #5163 from dabingnn/develop_improve_renderer
Develop improve renderer
|
2014-01-22 17:04:19 -08:00 |
Ricardo Quesada
|
647dca3a3b
|
Merge pull request #5169 from ricardoquesada/update_template_linux
updated template for Linux
|
2014-01-22 14:33:43 -08:00 |
Ricardo Quesada
|
ae09cce83f
|
updated template for Linux
|
2014-01-22 14:32:40 -08:00 |
Ricardo Quesada
|
7421310072
|
Merge pull request #5168 from ricardoquesada/cceglview_in_desktop
Cceglview in desktop
|
2014-01-22 14:19:53 -08:00 |
Ricardo Quesada
|
dceb9cb1b9
|
compiles on Linux
|
2014-01-22 14:17:32 -08:00 |
Ricardo Quesada
|
6b8781241c
|
code is cleaner
|
2014-01-22 13:51:01 -08:00 |
Ricardo Quesada
|
7249d3ca76
|
Unified CCEAGLView on Linux and Mac
|
2014-01-22 13:05:37 -08:00 |
Ricardo Quesada
|
83f16e25e3
|
merge from develop
|
2014-01-22 11:44:48 -08:00 |
Ricardo Quesada
|
c1fb0a697c
|
Merge pull request #5167 from martell/size_t
Fixed x64 builds of testcpp with long to size_t changes
|
2014-01-22 11:32:47 -08:00 |
martell
|
50176a038f
|
Fixed x64 builds of testcpp with long to size_t changes
|
2014-01-22 19:21:25 +00:00 |
Ricardo Quesada
|
1b6dfcda40
|
Merge branch 'develop' into cceglview_in_desktop
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-01-22 11:21:16 -08:00 |
heliclei
|
04ee67481a
|
set pr status at post build stage
|
2014-01-23 00:21:58 +08:00 |
pandamicro
|
7e4f82db1d
|
Issue #3806: Update shared tests_v3.0 of js test cases
|
2014-01-22 22:57:34 +08:00 |
pandamicro
|
29fcf46497
|
Fixed #3806: Update tests 3.0
|
2014-01-22 22:41:30 +08:00 |
pandamicro
|
913360e526
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-01-22 22:32:44 +08:00 |
pandamicro
|
d6df71cc11
|
Fixed #3806: Change parameters to const &
|
2014-01-22 22:31:26 +08:00 |
James Chen
|
45bbbca8c6
|
Merge pull request #5164 from Dhilan007/develop_label
close #3642:fix bounding box of new label is incorrect.
|
2014-01-22 06:23:39 -08:00 |
Huabing.Xu
|
159f44a5dc
|
issue #3812: performance improvement, 1. add vector reserve 2. use C++11 range loop
|
2014-01-22 18:24:23 +08:00 |
James Chen
|
c984416d3e
|
Merge pull request #5165 from CocosRobot/updategeneratedsubmodule_1390384981
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-22 02:04:00 -08:00 |
CocosRobot
|
e900504e8b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-22 10:03:04 +00:00 |
Dhilan007
|
ec297a2c31
|
close #3642:fix bounding box of new label is incorrect.
|
2014-01-22 18:01:37 +08:00 |
Dhilan007
|
a2f5146731
|
close #3642:fix bounding box of the new label is a bit off.
|
2014-01-22 17:45:56 +08:00 |
James Chen
|
351814c0be
|
Merge pull request #5158 from Dhilan007/develop_label
Label:remove unused code and optimization performance.
|
2014-01-22 01:24:48 -08:00 |
James Chen
|
1b89a058fa
|
Merge pull request #5160 from samuele3hu/developBugFix
fix:Update the some test cases for lua
|
2014-01-22 01:21:50 -08:00 |
James Chen
|
49481172e9
|
Update AUTHORS [ci skip]
|
2014-01-22 17:18:36 +08:00 |
James Chen
|
292c5a17c6
|
Merge pull request #5161 from pyrasis/develop
[Win32] fix localStorageGetItem crash when column text is NULL.
|
2014-01-22 01:17:32 -08:00 |
samuele3hu
|
e1476c8d60
|
fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache()
|
2014-01-22 17:09:33 +08:00 |
Huabing.Xu
|
cc39ca4f16
|
issue #3812: rename convertToWorldCoordiantes->convertToWorldCoordinates
|
2014-01-22 17:09:13 +08:00 |
zhangbin
|
462b9a7ace
|
issue #2572, Optimize the code of test case for issue 2572.
|
2014-01-22 17:04:54 +08:00 |
James Chen
|
573bab945d
|
Merge pull request #5162 from CocosRobot/updategeneratedsubmodule_1390381054
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-22 01:02:22 -08:00 |
CocosRobot
|
f9615d891e
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-22 08:57:36 +00:00 |
minggo
|
9c6a65baba
|
Merge pull request #5156 from minggo/deprecate-function
deprecated some functions in Object
|
2014-01-22 00:51:50 -08:00 |