c599f071a4
Add missing include file in ProjectConfig.cpp.
2016-03-08 14:36:01 +08:00
c50d54339f
Add localization arguments in simulator start args.
2016-03-07 09:52:53 +08:00
709d79ad14
Add first search path to command param.
2016-03-04 13:16:37 +08:00
e46e392ff5
Merge pull request #15175 from FrostPolaris/v3_localizeManage
...
Add language localization support for Button, Text, TextField and TextBMFont.
It's OK, merged
2016-03-04 11:43:47 +08:00
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
b5a44bc2f4
Merge pull request #15170 from geron-cn/uitabcontrol
...
add TabControl TabHeader to tolua
2016-03-04 10:26:06 +08:00
008089a506
add TabControl TabHeader to tolua
2016-03-03 16:22:42 +08:00
0489fd76e8
1.Change the interface in LocalizationManager.
...
2.Add new args of localization in simulator.
2016-03-03 15:49:50 +08:00
cd4abc0a7f
don't remove chipmunk js auto bindings
2016-03-03 15:46:16 +08:00
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed6bf55ed
2016-03-03 14:17:48 +08:00
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
077b5e7bfc
Update the reference of submodule cocos2d-console
2016-02-15 10:49:57 +08:00
6bbfc846da
Update bindings generator and Activate new memory model by default
2016-02-14 09:48:29 +08:00
e2568b3a6f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
...
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
0f3cb16efd
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-14 16:16:37 +08:00
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
1554b6e676
Fix pre-compiled framework js project will crash if use "Force Quit" to terminate program.
2016-01-07 10:42:47 +08:00
7bd9ceda10
Use method same as MacOS solution fix js pre-compiled framework project crash when exit on windows.
2015-12-31 09:54:32 +08:00
0c0f241c5e
Fix pre-compiled frame work js project will crash when exit on MacOS
2015-12-30 19:42:19 +08:00
52fb3fd098
Fix js project with pre-build frameworks crash when exit program
2015-12-29 19:38:37 +08:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
1871813c2b
update cocos2d-console submodule to 6cc7a09dc64a57fd5307c2ba3a0a705f834dfd97
2015-12-24 20:35:12 +08:00
6c2fd67d08
Update auto bindings
2015-12-21 00:14:51 +08:00
4f94b03b86
Upgrade bindings generator
2015-12-19 17:18:39 +08:00
ef71d8cdcf
Merge pull request #14689 from GuoLunHao/v3.10_updateConsole
...
update cocos2d-console submodule to 1ad9331a9e3cbef9c499b6c7
2015-12-16 12:23:23 +08:00
b32d013dc4
update cocos2d-console submodule to SH1 1ad9331a9e3cbef9c499b6c785d64c25b2f7e133
2015-12-15 20:06:16 +08:00
6e20c3cc4f
Merge pull request #14681 from pandamicro/v3.10
...
Fix ComponentJS proxy management issue in JSB
2015-12-15 12:26:12 +08:00
64276bd664
Fix ComponentJS proxy management issue in JSB
2015-12-15 11:48:44 +08:00
280a8e9d9c
Merge pull request #14663 from xiaofeng11/v3.10
...
Update all version number to v3.10
2015-12-15 10:48:51 +08:00
41218a65e7
Merge pull request #14668 from pandamicro/v3
...
Sync v3 and Fix win32 js project crash issue
2015-12-14 13:12:42 +08:00
4815ec8b9a
Update version number to v3.10
2015-12-14 10:32:29 +08:00
8b2dfb1a4b
Mooooores fixes
...
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
2015-12-10 22:15:44 -08:00
96d391ea30
Squashed commit of the following:
...
commit aff4e27200a77db60b13ea30c2457558e5f53059
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 17:58:41 2015 -0800
compiles with new GC model
commit 1fa69cd71231d56371cd45a378e50a1888308b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 17:41:15 2015 -0800
Animation3D works Ok
commit d439969caf7e6fe83a74e37d078c4361a08cb816
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:39:50 2015 -0800
Sprite3d create: converted to new API
commit aabe449e4a968fad882c44df9be787eb7c3bfcec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:27:33 2015 -0800
ouch...
commit 688ab610a8cb7607bc3c51b8ca01d800ef3c9794
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:12:25 2015 -0800
Spawn/Sequence init* were not bound
Fixed. Now JS Scheduler Test works Ok
2015-12-10 18:02:55 -08:00
5872745593
fix compile error and link error on ios/Mac platform
2015-12-10 16:43:01 +08:00
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
13dc967b03
js_get_or_create_jsobject() and other stuff
...
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()
Squashed commit of the following:
commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:04:24 2015 -0800
logging added (and commented)
will be useful in the future
commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:00:09 2015 -0800
new js_get_or_create_jsobject<T>
Specializes Template on cocos2d::Ref.
When Ref, it calls the `jsb_ref` functions
commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 13:31:52 2015 -0800
singletons converted
commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 12:20:07 2015 -0800
getDescendants() converted
2015-12-07 19:05:23 -08:00
b435f1df86
Fix wrong #endif statement
2015-12-07 10:44:52 +08:00
0328c31596
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_xf
2015-12-07 10:27:38 +08:00
d02f4afd4a
using new bindings templates
...
ignores createInstance() from ui
2015-12-05 22:26:54 -08:00
cd8631ef09
sfunction "create" uses new optimized code
...
...although this code should never be called
2015-12-04 18:42:31 -08:00
76bd37e109
Add missing export declaration.
2015-12-04 19:40:09 +08:00
e5d722b2a8
new bindings
2015-12-02 15:24:49 -08:00
45b25666ea
reset submodule
2015-12-02 13:28:24 +08:00
ebd5c1cca7
resolve conflict and fix checktexture bug
2015-12-02 11:26:05 +08:00
df62e92d7b
Correct bindings generator ref
2015-12-01 23:50:52 +08:00
1b3cb97b71
fix script binding
2015-12-01 23:05:47 +08:00
e5d57b4fa2
update binding-generator sub module & code
2015-12-01 22:30:36 +08:00
01e0803587
not export Sprite3DMaterial::setTexture
2015-12-01 20:27:31 +08:00
84068c5189
not export Mesh::getTexture and Mesh::setTexture
2015-12-01 18:05:03 +08:00
f298e49bf3
not export lua Mesh::getTexture and Mesh::setTexture
2015-12-01 17:39:00 +08:00
6fe361f06e
not export Mesh::getTexture
2015-12-01 15:13:51 +08:00
ea077c5141
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
...
Conflicts:
cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +08:00
167aa9b648
Update console sub-module, update project template.json to meet file position change
2015-12-01 15:00:45 +08:00
9b371a55bf
js not export Mesh::setTexture
2015-12-01 14:35:39 +08:00
08837955a7
Skip Useless MenuItemToggle::initWithCallback to fix windows compilation issue
2015-11-30 23:54:42 +08:00
43c68aa16b
Fix Chipmunk bindings issue
2015-11-27 22:38:16 +08:00
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
c4b995fe59
updates to JniHelper, refactoring of existing JNI calls
2015-11-27 12:00:33 +03:00
ae2b75c8be
Fix issues causing by temporary RootedObject passed as function parameters
2015-11-27 01:35:06 +08:00
5a2a343152
update code as comment
2015-11-26 17:38:32 +08:00
9811d6efcf
Combine studio change for LuaBinding, jsb and simulator
2015-11-25 21:52:44 +08:00
be2a3077c2
Remove useless manual bindings for addEventListener functions in UI
2015-11-25 14:15:45 +08:00
930405d52c
Remove useless manual bindings for MenuItems
2015-11-24 16:32:02 +08:00
32f21ca5be
Binding ResouceData structure to js to fix auto compile error
2015-11-19 14:31:39 +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
c0c35c603e
Update version number & RELEASE_NOTES.md, prepare 3.9 release
2015-11-06 18:38:09 +08:00
01fdb60b7d
Merge pull request #14311 from natural-law/v3
...
[ci skip] Update the reference of submodule cocos2d-console.
2015-11-04 10:45:35 +08:00
47ea0dfb02
Update the reference of submodule cocos2d-console.
2015-11-04 10:43:30 +08:00
0dabb4cfb7
Merge pull request #14295 from xiaofeng11/v3_xf
...
Fix CodeIDE can not start js project with simulator
2015-11-03 17:37:01 +08:00
bfa50de768
Update the reference of submodule cocos2d-console.
2015-11-03 16:06:12 +08:00
0dd0233ba7
update sdkbox console
2015-11-03 13:06:09 +08:00
c6feb3d34d
update submodule cocos2d-console
2015-11-02 17:49:26 +08:00
218b5625bf
Fix can not start js project with simulator in CodeIDE
2015-11-02 17:36:47 +08:00
aa9f0d5bd5
Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist
...
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
2015-10-27 17:28:22 +08:00
a3c2904e7f
Fix cc.DrawNode.drawPoly
2015-10-27 16:46:25 +08:00
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
be45e0bc50
Merge pull request #14174 from noshbar/v3
...
CPPCheck fixes, correct deallocation, array size.
2015-10-19 10:05:01 +08:00
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
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
2bf7f8ae3f
update console
2015-10-16 16:10:08 +08:00
8915fc6cb9
Revert "Remove screen direction check in simulator to avoid render error"
2015-10-16 11:36:20 +08:00
3edbf0f4a3
Fix#22934
...
Node, Skeleton needs to show at the middle of the simulator.
2015-10-15 19:35:06 +08:00
ca8977b6f8
Remove screen direction check in simulator to avoid render error
2015-10-15 10:11:26 +08:00
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
f25b62b4b5
Update the reference of submodule cocos2d-console.
2015-10-12 14:16:18 +08:00
9a0ea79b61
remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue
2015-09-30 15:20:53 +02:00
4f6bdd6d74
Fix mistaken uploaded lua bindings
2015-09-29 14:52:47 +08:00
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
2a3526a3fd
Fix lua project
2015-09-26 19:43:36 +08:00
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
ddb636a022
Add ScriptComponent and ComponentJS
2015-09-26 19:43:36 +08:00
7e2b8c71a7
Improve lua script component
2015-09-26 19:43:35 +08:00
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
9eb05707fb
add custom spine skeletonAnimation test
2015-09-25 13:36:48 +08:00
d3504a9216
Update versions and html5 engine
2015-09-22 02:31:21 +08:00
4241df7af7
Fixed binding...
2015-09-21 15:41:14 +08:00
2288b7e8d1
Fixed tools/travis-scripts/before-install.sh...
2015-09-21 15:22:00 +08:00
460d0fd5a6
[ci skip]Fixed tools/travis-scripts/before-install.sh
2015-09-21 14:58:14 +08:00
1c7d4805ef
Fixed travis-scripts/before-install.sh
2015-09-21 13:52:28 +08:00
44329d96ba
Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine
...
Refine lua/js binding tool
2015-09-20 16:42:40 +08:00
a3f363735e
Refine lua/js binding tool
2015-09-19 00:08:15 +08:00
0cbc1e5f40
Merge pull request #13923 from WenhaiLin/v3-physics-refine
...
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
56ea700d37
Fix bug: new project created by template compile error.
2015-09-18 11:40:16 +08:00
aaabe42e75
Update the reference of submodule cocos2d-console.
2015-09-16 11:01:52 +08:00
4c4a007b99
Merge pull request #13797 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2015-09-15 10:06:24 +08:00
1e7b78b057
Merge pull request #13795 from pandamicro/v3
...
Update bindings-generator to initialize numeric/pointer variables
2015-09-14 11:54:02 +08:00
da24454c6c
Update the reference of submodule cocos2d-console.
2015-09-14 11:46:02 +08:00
b0dc83aed8
Update bindings-generator to initialize numeric/pointer variables
2015-09-14 11:22:06 +08:00
5d47ce8f23
Add tools for converting the performance tests data to excel files.
2015-09-14 09:52:21 +08:00
4509a316cc
add uniform conversion
...
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
2015-09-09 16:03:57 +08:00
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
d145416e1f
Update the reference of submodule cocos2d-console.
2015-09-07 17:36:54 +08:00
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
2c6c35cb76
Update the version displayed in about dialog of windows simulator.
2015-09-01 18:00:50 +08:00
4cd3683e5b
Use solution path as root path
2015-08-31 18:14:38 +08:00
be2be30162
Fix missing config.json notice when simulator start to run a cocostudio project
2015-08-31 16:16:10 +08:00
2520e16cc0
Update the reference of submodule cocos2d-console.
2015-08-31 12:04:18 +08:00
d6045fdbea
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
2015-08-27 10:40:04 +08:00
71f4b804ea
Add BlendFuncFrame auto binding
2015-08-26 13:42:52 +08:00
c2fae3987b
fix Jenkins template compile
2015-08-24 10:26:12 +08:00
6ee33499b4
Update changelog and versions for v3.8 rc0
2015-08-22 11:56:25 +08:00
72496ae426
add missing ui test in Lua
2015-08-20 15:25:09 +08:00
78ef019561
Made travis run for v3.8
2015-08-18 10:17:44 +08:00
81d5a8377f
Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError
...
Remove duplicate function definition, Add function adaptation
2015-08-17 22:56:59 +08:00
b19e02bdf6
Remove duplicate function definition, Add function adaptation
2015-08-17 18:18:38 +08:00
3f6816f2f7
Update the reference of submodule cocos2d-console.
2015-08-17 17:16:21 +08:00
559305646b
Merge pull request #13411 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2015-08-17 17:13:12 +08:00
9db78b2bb7
Merge pull request #13407 from liamcindy/v3.8
...
fix the skybox display error from editor files
2015-08-17 16:57:32 +08:00
deaf50e803
Update the reference of submodule cocos2d-console.
2015-08-17 15:41:56 +08:00
7aa36d14be
fix the skybox display error from editor files
2015-08-17 13:04:25 +08:00
6628dc47cb
Update the reference of submodule cocos2d-console.
2015-08-14 15:12:58 +08:00
5baa90c79e
libcurl.h not included in the header to avoid...
...
too many dependencies
2015-08-13 19:28:38 -07:00
d2e8cf53be
don't generate bindings for `getCocos2dThreadId`
2015-08-13 11:18:51 -07:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
9f63cf677e
Merge pull request #13340 from zilongshanren/fix-lua-checkbox-bindings
...
fix checkbox Luabindings issue.
2015-08-13 10:44:28 +08:00
d9645b63c7
fix checkbox Luabindings issue.
...
https://github.com/cocos2d/cocos2d-x/issues/13080
2015-08-13 10:04:16 +08:00
9a83ed9b28
remove unneeded protocol in AppController.h.
2015-08-12 13:55:36 +08:00
f91908d651
Add copy resources config of js-tests for web platform.
2015-08-10 12:00:53 +08:00
cf3f5ab26c
Update the reference of submodule cocos2d-console.
2015-08-07 15:56:52 +08:00
91b2191988
Move the framework-compile tools into cocos2d-console.
2015-08-05 17:54:32 +08:00
a06421b753
Merge pull request #13196 from chengstory/UpdateSimulator
...
Node, Skeleton needs to show at the middle of the simulator.
2015-08-04 17:00:25 +08:00
613a6f48a9
Node, Skeleton needs to show at the middle of the simulator.
2015-08-04 15:41:12 +08:00
d11605aa37
Update the reference of submodule cocos2d-console.
2015-08-04 14:35:56 +08:00
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
46bb4f8aae
Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404
...
Constructed with3d
2015-08-01 21:15:08 +08:00
beichen.liu