mogemimi
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +08:00
minggo
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
Adrien de Sentenac
eafceb38b7
Fixed simulator project files to add tinyxml2 to the include paths
2016-06-21 11:13:10 -04:00
Adrien de Sentenac
dac9be5016
Various CMake improvements
...
- Added c++_shared (LLVM) to Android toolchain options. Fixed AndroidNdkGdb.cmake.
- Fixed includes when not using prebuilt libs. Added option to use sources in external when not using prebuilt libs.
- Added option in CMake to be able build Box2D without using it as physics library in cocos2d-x (similar to what is done in the Visual Studio solution).
2016-06-14 10:20:57 -04:00
BQ
6097c3abd1
English grammar corrections.
...
Make brackets consistent.
2016-05-25 15:18:57 +01:00
minggo
997011601e
revert correct search path
2016-05-06 15:58:43 +08:00
minggo
3d09e529ee
use Ref::release() to release Ref instance
2016-04-29 17:11:36 +08:00
Xpol Wan
5c632adf5e
Use pre-processor condition rather than runtime check.
...
This avoids compiler warning.
2016-03-29 21:54:23 +08:00
beichen.liu
c599f071a4
Add missing include file in ProjectConfig.cpp.
2016-03-08 14:36:01 +08:00
beichen.liu
c50d54339f
Add localization arguments in simulator start args.
2016-03-07 09:52:53 +08:00
zhangcheng
709d79ad14
Add first search path to command param.
2016-03-04 13:16:37 +08:00
beichen.liu
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
beichen.liu
0489fd76e8
1.Change the interface in LocalizationManager.
...
2.Add new args of localization in simulator.
2016-03-03 15:49:50 +08:00
zhangcheng
c449f61124
Add "-use-local-script" command to control whether to load js script files from simulator local directory.
2016-02-29 13:53:49 +08:00
zilongshanren
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
GuoLunHao
5872745593
fix compile error and link error on ios/Mac platform
2015-12-10 16:43:01 +08:00
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
fnz
c4b995fe59
updates to JniHelper, refactoring of existing JNI calls
2015-11-27 12:00:33 +03: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
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
zhangcheng
613a6f48a9
Node, Skeleton needs to show at the middle of the simulator.
2015-08-04 15:41:12 +08:00
yinjimmy
b1e40a98b0
fix simulator compile error
2015-06-03 22:58:25 +08:00
andyque
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +08:00
andyque
73902a4063
fix simulator vs2015 support
2015-05-22 17:47:48 +08:00
WenhaiLin
158181d4eb
Console:Fixed crash
2015-05-21 18:14:21 +08:00
WenhaiLin
80367e978d
Console:Fixed crash
2015-05-19 18:33:06 +08:00
yinjimmy
d78d8b2c1f
move menu bar to system menu
2015-05-14 13:43:17 +08:00
samuele3hu
037c17fe5d
Remove vs2012 support in v3
2015-05-05 16:11:26 +08:00
yinjimmy
2c0f1c1a50
add lua runtime template
2015-04-21 01:25:44 +08:00
Jimmy Yin
185435a388
Add missing file for win32
2015-04-19 00:09:52 +08:00
Jimmy Yin
a9542813f4
Add missing file for android
2015-04-18 23:20:41 +08:00
yinjimmy
1e32322350
revert runtime files
2015-04-17 18:26:47 +08:00
yinjimmy
587ee21e4b
revert lua runtime
2015-04-02 18:27:53 +08:00
SunLightJuly
6c2eb01213
cleanup proj.android
2015-03-10 23:33:09 +08:00
SunLightJuly
b77801a99b
cleanup proj.win32
2015-03-10 22:56:03 +08:00
SunLightJuly
ba55f14fbf
removed runtime in libsimulator
2015-03-10 18:28:59 +08:00
yinjimmy
2042633294
update runtime to 2.0
2015-02-27 14:49:04 +08:00
SunLightJuly
aaf6ad03c8
called initGLContextAttrs() before create glview
2015-02-13 13:45:15 +08:00
yusheng.lu
7fde1d0e0d
When reading csd/csb and the simulator's resolution is changed, change the root node's size to fit the simulator windows size. It will make sure the layout component feature works.
2015-01-19 18:10:30 +08:00
dualface
bc75849ac7
update template/runtime version
2015-01-16 23:22:03 +08:00
zhangbin
b1f9fb4b8e
Rename the Xcode target of libsimulator.
2015-01-16 14:29:48 +08:00
yinjimmy
ccdf723d20
Optimize OutDir and IntDir for libsimulator
2015-01-15 14:39:56 +08:00