XiaoFeng
b435f1df86
Fix wrong #endif statement
2015-12-07 10:44:52 +08:00
XiaoFeng
76bd37e109
Add missing export declaration.
2015-12-04 19:40:09 +08:00
XiaoFeng
e5d57b4fa2
update binding-generator sub module & code
2015-12-01 22:30:36 +08:00
XiaoFeng
5a2a343152
update code as comment
2015-11-26 17:38:32 +08:00
XiaoFeng
9811d6efcf
Combine studio change for LuaBinding, jsb and simulator
2015-11-25 21:52:44 +08:00
肖峰
3aeb5e0389
Fix when start simulator in CocoStudio to run a scene, can not read the correct config.json on MacOSX
2015-11-09 23:30:03 +08:00
XiaoFeng
c0c35c603e
Update version number & RELEASE_NOTES.md, prepare 3.9 release
2015-11-06 18:38:09 +08:00
XiaoFeng
218b5625bf
Fix can not start js project with simulator in CodeIDE
2015-11-02 17:36:47 +08:00
XiaoFeng
83a48ee501
Fix simulator run time only check screen direction flag, but won't check if size setting need swap
2015-10-19 19:43:10 +08:00
pandamicro
be45e0bc50
Merge pull request #14174 from noshbar/v3
...
CPPCheck fixes, correct deallocation, array size.
2015-10-19 10:05:01 +08:00
pandamicro
784dbc4c88
Merge pull request #14158 from cocos2d/revert-14144-v3
...
Revert "Remove screen direction check in simulator"
2015-10-18 22:49:09 +08:00
Dirk de la Hunt
88bcaad518
General fixes:
...
- changed some delete operations to be deletions of arrays where applicable
- changed some "free" operations to "delete" where memory was allocated with "new"
CCPUScriptCompiler.cpp:
- added checks to see if temp1 and temp2 are non-null before dereferencing them
FileServer.cpp:
- changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
2015-10-16 21:43:09 +02:00
pandamicro
8915fc6cb9
Revert "Remove screen direction check in simulator to avoid render error"
2015-10-16 11:36:20 +08:00
zhangcheng
3edbf0f4a3
Fix#22934
...
Node, Skeleton needs to show at the middle of the simulator.
2015-10-15 19:35:06 +08:00
XiaoFeng
ca8977b6f8
Remove screen direction check in simulator to avoid render error
2015-10-15 10:11:26 +08:00
XiaoFeng
90b96be690
Fix when scene been set a very large size(eg. 2048x1536), the simulator windows will been move out of window
2015-10-13 13:01:37 +08:00
pandamicro
d3504a9216
Update versions and html5 engine
2015-09-22 02:31:21 +08:00
zhangbin
2c6c35cb76
Update the version displayed in about dialog of windows simulator.
2015-09-01 18:00:50 +08:00
XiaoFeng
4cd3683e5b
Use solution path as root path
2015-08-31 18:14:38 +08:00
XiaoFeng
be2be30162
Fix missing config.json notice when simulator start to run a cocostudio project
2015-08-31 16:16:10 +08:00
pandamicro
6ee33499b4
Update changelog and versions for v3.8 rc0
2015-08-22 11:56:25 +08:00
Liam
7aa36d14be
fix the skybox display error from editor files
2015-08-17 13:04:25 +08:00
andyque
9a83ed9b28
remove unneeded protocol in AppController.h.
2015-08-12 13:55:36 +08:00
zhangcheng
613a6f48a9
Node, Skeleton needs to show at the middle of the simulator.
2015-08-04 15:41:12 +08:00
pandamicro
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
pandamicro
3fa016a280
Fix win32 project and add winrt support
2015-07-30 23:39:52 +08:00
pandamicro
f53ba42b3b
Fix test issues and Add audio engine to js templates
2015-07-29 21:22:44 +08:00
Wenhai Lin
70628c9dec
Fixed link errors on iOS/Mac
2015-07-29 13:59:58 +08:00
pandamicro
a2a32ef58c
Release docs for v3.7.1
2015-07-25 15:16:39 +08:00
Vincent Yang
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
Bin Zhang
0a6186d68f
Solve the error in Xcode project of simulator.
2015-07-22 13:44:34 +08:00
Vincent Yang
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
pandamicro
a9f98aefea
[Simulator JSB] Fix issue caused by video and web view binding
2015-07-07 09:38:38 +08:00
Bin Zhang
0bcdf898bf
Solve the error in simulator.
2015-07-04 10:17:40 +08:00
pandamicro
6f3fc302e6
Fix web view and video player in simulator
2015-07-04 08:39:49 +08:00
Bin Zhang
8d928e60c8
Update the version displayed in simulator about dialog.
2015-07-01 17:23:34 +08:00
Bin Zhang
d0fc1e9d34
Add link libs config in simulator project for framework.
2015-07-01 15:31:03 +08:00
Bin Zhang
bb77101f0b
Solve the error when building simulator for android.
2015-06-30 16:45:13 +08:00
Bin Zhang
9b45a9ee6f
Add preprocessor CC_ENABLE_BULLET_INTEGRATION=1 in simulator.
2015-06-30 16:14:25 +08:00
pandamicro
1f93fcfc2a
Remove duplicated code
2015-06-29 20:00:49 +08:00
pandamicro
f67ad0352c
Fix simulator js modules
2015-06-29 19:57:12 +08:00
Bin Zhang
0ac3da1636
Solve the error in framework-compile tools.
2015-06-26 21:00:32 +08:00
samuele3hu
a547d6aa33
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation
...
Conflicts:
tools/bindings-generator
2015-06-16 11:36:11 +08:00
yinjimmy
b1e40a98b0
fix simulator compile error
2015-06-03 22:58:25 +08:00
samuele3hu
a20681aa21
Add Lua-bindings for NavMesh
2015-06-02 18:37:57 +08:00
minggo
203203a92d
Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2
...
upgrade rapidjson to 1.0.2
2015-05-25 15:18:15 +08:00
andyque
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +08:00
samuele3hu
0492323ec8
Update the Lua template
2015-05-24 23:14:23 +08:00
子龙山人
49c0b44252
Merge pull request #11988 from andyque/add-vs2015-to-simulator
...
fix simulator vs2015 support
2015-05-23 09:48:32 +08:00
hugo
9a9fa7957f
[A] add generate libs and binary template
2015-05-22 19:47:16 +08:00