1c0602e130
Remove unnecessary arguments from some lua cc.mat4 methods ( #16658 )
...
* Lua: remove unused 3rd argument from cc.mat4.transformVector
cc.mat4.transformVector takes a mat4 and a 4vector and returns the result
of applying the mat4 to the vector. Strangely it had been made to also
require a third argument called dst which it doesn't use but did check
was a vec4. This commit allows cc.mat4.transformVector to be called
without the unnecessary argument. We still permit calling with it for
backward compatibility.
Also changed is the wrapper in Cocos2d.lua so that a second form of
cc.mat4.transformVector can be used where the vector is supplied as
4 separate numbers.
Changed the test files to call without the unnecessary argument.
* Lua: remove unused argument from cc.mat4.createTranslation/Rotation
Both these functions have an extra unnecessary argument called dst,
although neither use it either to pass in or out a value. This
commit removes the extra argument and updates the test programs
correspondingly.
Also, within Cocos2d.lua, remove some definitions that are later
overwritten by new ones
2016-10-08 14:33:50 +08:00
68ec773f39
lua: generate bindings for Sprite3DMaterial ( #16609 )
...
Add Sprite3DMaterial to the list of classes for autogeneration of
lua bindings.
Add a new test case to the end of Sprite3DTest.lua showing the
use of outline.material.
2016-09-30 09:34:16 +08:00
a6f3773aef
Luajit ( #16620 )
...
* update console
* load lua according architecture
* install android-13 in travis
2016-09-28 16:19:20 +08:00
84a102edf8
merge v3.13.1 back to v3
2016-09-15 10:08:28 +08:00
937525a4de
prevent restarting activity on some events ( #16525 )
2016-09-06 16:12:49 +08:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
e9a5a4e2bd
Revert luajit ( #16397 )
...
* revert to use lua
* comment lua bytecode test
* update release note
2016-08-19 11:49:19 +08:00
3ce4134ab3
use java reflection to avoid API level dependent, use app-abi 10 ( #16371 )
...
* use java reflection to avoid API level dependent, use app-abi 10
* add license header
2016-08-17 13:55:26 +08:00
86b8a633f3
Android arm64-v8a also uses Luajit. ( #16352 )
...
* Android arm64-v8a also uses Luajit.
* Updates external/config.json
2016-08-15 14:57:04 +08:00
12d022d6ea
[lua-tests] Reverts uniform after GetUniformTest. ( #16357 )
2016-08-15 09:41:18 +08:00
14b8fc0a71
Remove AppDelegate memory leak in Android projects ( #16333 )
...
* Remove AppDelegate memory leak from Android projects
AppDelegate object and all its members are never released.
As a solution I propose to use static unique_ptr that could destroy it
at the end of the application.
Issue:
https://github.com/cocos2d/cocos2d-x/issues/14110
* Correct code style in Android main.cpp files
- removed redundant headers (reduced dependencies)
- removed redundant code
- corrected code style
2016-08-08 10:53:04 +08:00
7131451f1b
change to use api 19 ( #16248 )
...
* change to use api 19
* update deps version
2016-07-29 13:57:01 +08:00
2945968614
Upgrades to Spine v3.4 ( #16242 )
...
* Upgrades to Spine v3.4
Github issue #16115
* compiles and works on windows
tested on:
* win32
* win10
* win8.1
* include-linter: don't test spine files
we need them unmodified
* spine bindings fixes
also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
2016-07-28 07:25:50 -07:00
5f2c1df448
use android 21 to fix compiling error
2016-07-22 10:53:56 +08:00
5bd2d74078
Fix spelling for `getPolygonCenter` function
2016-07-19 08:24:22 +09:00
05a772115e
fixes issue #15566
...
lua and javascript for arm64 is not compiled
version 103
uses JPEG 9b for android
using armeabi
uses Lua, and not LuaJIT for Android ARM64
2016-07-12 19:03:53 -07:00
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
afe36e4a00
feat: upgrades to GLFW v3.2
...
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script
fixes github issue #11748
uses WINAPI instead of APIENTRY
it seems that it is being redefined somewhere... but I couldn't find
exactly where
2016-06-29 16:11:30 -07:00
4dfa9d1719
[ci skip]Lua test case issue ( #15970 )
...
* modify title and replace or with BitOr
* remove unneeded codes
2016-06-27 18:44:09 +08:00
bac1870d16
fix android editbox custom font file ( #15924 )
...
* fix android editbox custom font file
* simplify get real font name on Android
2016-06-23 11:26:32 +08:00
9fd190d283
Merge pull request #15916 from dumganhar/fix/AssetsManager
...
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 15:25:18 +08:00
8e19db7d26
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 14:31:26 +08:00
359fdb92f2
remove studio related test cases
2016-06-22 14:05:58 +08:00
7214173e98
Added Particle Emitter Pause option, and tests ( #15836 )
...
* Added Particle Emitter Pause option, and tests
* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +08:00
93ed59bfb3
English grammar corrections.
2016-05-25 15:25:38 +01:00
6097c3abd1
English grammar corrections.
...
Make brackets consistent.
2016-05-25 15:18:57 +01:00
f0343bf219
Fixed APP_NAME for cpp, cpp-empty, js, and lua tests.
2016-05-13 22:13:05 -04:00
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
1de5141473
update label string every 0.1s
2016-03-29 15:25:18 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
589d7e47bf
fix polygon api typo
2016-03-17 17:16:56 +08:00
a1b4cd845f
Revert "Fix incorrect function name of getTrianglesCount"
2016-03-17 16:38:17 +08:00
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
2016-03-02 16:51:54 -08:00
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
9224a9d03b
Remove test/lua-tests/project/Classes/lua_module_register.h, use the one in libluacocos2d instead.
2016-02-17 14:54:15 +08:00
b43764fc92
fix lua deprecated function bindings
2016-01-25 14:48:17 +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
ffbac99dc5
fix script samples error with controlButton
2015-12-19 22:22:41 +08:00
ac4f66fff2
fix lua focus test
2015-12-19 18:32:43 +08:00
f6021d502d
Fix pageViewTest Horizontal scroll won't work in Lua-test
2015-12-19 13:12:32 +08:00
0e34a864b2
Merge pull request #14528 from xiaofeng11/v3_3dtouch
...
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-03 22:21:48 -08:00
b6fd2e9449
Permit http access to cocos2d-x.org in test projects
2015-12-03 18:00:48 +08:00
ebd5c1cca7
resolve conflict and fix checktexture bug
2015-12-02 11:26:05 +08:00
bb832f8d60
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-01 13:02:53 +08:00
dcfdfd3a78
LUA tests: add Sprite3DNormalMappingTest
2015-11-26 11:27:33 +08:00
668558b99f
Fix when leave "ComponentTest" scene, background music still go on playing in lua-test under Android system
2015-11-06 11:38:41 +08:00
80b2def648
Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status.
2015-10-28 14:12:24 +08:00
29c5ca6ea9
fix the #23309 bug
2015-10-14 11:23:11 +08:00
aee3244ad3
Fix test cocostudio test->cocostudio GUItest->MoveBy vertical direction under lua test project can not scroll back to page 1 from page 2
2015-10-10 17:50:48 +08:00
4df211fa0b
Fix particle test under lua test project display different in different platform
...
Fix cocostudio 3d test under lua test project crash bug
2015-10-10 14:51:14 +08:00
a1bbd43f9f
Add component test to lua-tests and remove it from lua empty test
2015-09-26 19:43:36 +08:00
3fc1349561
Merge pull request #13945 from WenhaiLin/v3-physics-testcase-fix
...
[ci skip]Lua-tests:Fixed physical test cases.
2015-09-19 00:05:26 +08:00
db102f2030
[ci skip]Lua-tests:Fixed physical test cases.
2015-09-19 00:03:21 +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
b1ed1a8a51
add UIEditBox support linux platform.
2015-09-18 17:11:58 +08:00
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
10e45ee744
Updates XMLHttpRequestTest.lua
2015-09-12 19:11:32 +08:00
8e9928ad99
Remove performance tests from lua-tests & js-tests.
2015-09-11 10:53:17 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
15156a015a
add RadioButton and RadioButtonGroup event type
2015-08-20 22:49:42 +08:00
72496ae426
add missing ui test in Lua
2015-08-20 15:25:09 +08:00
1f735b4f0e
Merge pull request #13437 from fusijie/fix_lua_testcase_setPointer_error
...
Fixed setVertexAttribPointer luabinding and Test case.
2015-08-19 11:43:18 +08:00
e3c88533fe
Merge pull request #13447 from WenhaiLin/v3.8-refine-testcases
...
Test cases:improve small problems.
2015-08-19 09:46:13 +08:00
5cdfdf8497
[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0
2015-08-18 22:37:00 +08:00
5dd6d94c17
Test cases:improve small problems.
2015-08-18 22:19:24 +08:00
f671d36e31
Fixed lua testacase setPointer error.
2015-08-18 11:19:32 +08: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
9a83ed9b28
remove unneeded protocol in AppController.h.
2015-08-12 13:55:36 +08:00
6644b06643
Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix
...
Fixed minor problems in test cases.
2015-08-08 12:04:30 +08:00
4575587cf7
Fix cocostudio 3d test crash on mobile platform
2015-08-08 11:57:40 +08:00
772dab2002
Fixed minor problems in test cases.
2015-08-07 23:08:49 +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
875d01573a
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-07-31 21:20:42 +08:00
ea594b92b4
add ActionTime lua test
2015-07-29 17:50:50 +08:00
184225519e
add ActionTime lua test
2015-07-29 17:36:54 +08:00
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
29cccf631e
Merge pull request #12550 from kompjoefriek/v3-vibrate
...
Vibrate support in v3
2015-06-30 10:28:59 +08:00
24eca337ca
[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.
2015-06-26 17:12:39 +08:00
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
ad4f5b8ec0
Fix the some lua tests case bug
2015-06-25 15:13:01 +08:00
c9c212d0e1
Solve the error when run tests projects with `cocos run`.
2015-06-24 15:33:13 +08:00
5c5f3dcc79
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
2015-06-23 20:03:14 +08:00
e2aa669b8d
Fix the LayerTest error about Lua
2015-06-23 20:02:26 +08:00
f95245312a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
2015-06-23 17:08:25 +08:00
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
27d011dd50
Fixbug: LabelTestNew New Label + CharMap's effect is wrong.
2015-06-23 16:02:38 +08:00
b08325dd5b
Merge pull request #12475 from samuele3hu/v3_7_test
...
[ci skip]Fix the some test cases error about Lua
2015-06-23 13:15:21 +08:00
3b766e5236
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
2015-06-23 10:20:05 +08:00
683c5b4cb2
Fix the LabeLTestNew error.
2015-06-22 22:32:21 +08:00
bc964c96da
Fix the error about the Camera3D Test
2015-06-22 09:28:18 +08:00
0181a84883
Fix the bugs about the particle3DTest
2015-06-22 09:27:34 +08:00
85fe9e8816
Solve the error when build tests projects with cocos command on win32.
2015-06-19 18:32:32 +08:00
000be8316b
Merge pull request #12415 from samuele3hu/v3_7_ui
...
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
2015-06-18 12:30:28 +08:00
6c749a77f2
Fix the bugs about the Physics3DTest for Lua.
2015-06-18 11:17:08 +08:00
31aae38fac
issue #12414:Add UIS9NinePatchTest for Lua and js
2015-06-18 09:41:16 +08:00
dc33a8d66e
Merge pull request #12243 from Wu-Hao/fix_spritepolygon2
...
Fix spritepolygon
2015-06-17 14:40:30 +08:00
9c550e0a11
Update the Physics3DTest for js and Lua by synchronizing the API.
2015-06-17 13:58:05 +08:00
3c5ab4f518
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
2da760b655
Update the NavMesh test case
2015-06-17 09:49:31 +08:00
1b20e463d8
Update the Lua binding about the Polygon and update the test case.
2015-06-11 14:38:38 +08:00
0cccd6e765
Fix compile error on the Linux and update the test cases
2015-06-03 18:12:21 +08:00
a20681aa21
Add Lua-bindings for NavMesh
2015-06-02 18:37:57 +08:00
9934d73548
issue #12046 : Add Lua bindings for material systems and related test cases.
2015-05-27 15:37:59 +08:00
c491b6a5c1
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-05-25 17:01:29 +08:00
074216bef9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
...
Conflicts:
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
tests/lua-tests/src/mainMenu.lua
2015-05-24 22:46:05 +08:00
07eb116fb6
fix lua tests release mode linker issue
2015-05-23 08:48:53 +08:00
73902a4063
fix simulator vs2015 support
2015-05-22 17:47:48 +08:00
3d0c716ee9
Add script in build.gradle for sign the release apk.
2015-05-22 15:52:41 +08:00
94e2e1cb00
Modify the configuration for android studio support in console.
2015-05-21 18:27:30 +08:00
41792caa6b
Add files & configuration for android studio support in console.
2015-05-21 16:34:03 +08:00
78d4089215
Add the project.properties for the ndk-build of proj.android-studio.
2015-05-21 15:43:01 +08:00
37dddf9b15
Add execute permission for the gradlew in proj.android-studio.
2015-05-21 15:31:18 +08:00
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
a569d877ba
[ci skip]Remove unnecessary code.
2015-05-20 18:05:46 +08:00
79f70c49ce
Merge pull request #11905 from WenhaiLin/v3-37
...
Remove unnecessary files.
2015-05-20 13:39:36 +08:00
df3548673f
Remove unnecessary files.
2015-05-20 10:19:32 +08:00
b6a2299666
Add a newline
2015-05-19 16:55:37 +08:00
7f728f029c
Add Scene3DTest and update TerrainTest based on the Lua
2015-05-19 16:52:39 +08:00
e700ef6d30
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
...
Add Android Studio support
2015-05-18 16:17:24 +08:00
26f094b1a7
Remove unnecessary files
2015-05-18 16:02:05 +08:00
54b6260dfd
Rename module
2015-05-18 15:17:05 +08:00
6dd3108e42
Rename module
2015-05-18 15:01:20 +08:00
68188f7424
Add native code for AS project.
2015-05-18 13:41:58 +08:00
7caa6bb2fc
Update Copyright.
2015-05-18 09:59:50 +08:00
562c711cda
Update CocoStudioUIEditorTest for Lua and replace some deprecated functions.
2015-05-15 18:26:21 +08:00
dc8492948e
Add Android Studio support
2015-05-15 16:37:43 +08:00
71595898ed
Update the Lua binding for Physics3D ,related test cases and the template project
2015-05-15 16:25:07 +08:00
fa63471c0a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
...
Conflicts:
tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
2015-05-15 09:31:53 +08:00
8db62c82f8
Add Lua bindings for Physics3D and related test cases
2015-05-15 09:28:03 +08:00
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
037c17fe5d
Remove vs2012 support in v3
2015-05-05 16:11:26 +08:00
5819159889
Add Lua-bindings for SpritePolygon and related test case
2015-04-28 18:19:57 +08:00
c801d1868c
Update Sprite3DTest and VideoPlayerTest about Lua
2015-04-28 11:27:50 +08:00
51bcac9e84
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest
2015-04-28 09:17:00 +08:00
8d9064b4e4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
...
Conflicts:
tests/cpp-tests/Classes/AppDelegate.cpp
2015-04-22 10:31:39 +08:00
47e2698986
Fix the cocos3.6beta0 bugs
2015-04-22 10:20:21 +08:00
b72034a3f6
Add Lua bindings for WebView and related test case
2015-04-17 14:08:47 +08:00
dd3b6ced34
Fix the bugs that title and button disappeared because of camera setting
2015-04-14 15:40:12 +08:00
24654a4847
synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
2015-04-13 16:29:44 +08:00
da69dbd133
Merge pull request #11388 from xiaofeng11/v3
...
Reader update
2015-04-13 11:20:53 +08:00
8896190d9b
Fix the bindings-generator error and add related Action Timeline test case.
2015-04-12 22:20:53 +08:00
9bf2a920b4
Update the Lua bindings for terrain and TerrainTest.lua
2015-04-09 13:41:52 +08:00
4bcfcb1d09
Merge pull request #11320 from samuele3hu/v3_terrain
...
#issue 10819:Add lua bindings for Terrain and two test cases about it.
2015-04-08 11:45:46 +08:00
3a2601a1f8
Add lua bindings for Terrain and two test cases about it.
2015-04-08 10:03:50 +08:00
fd554c07da
Rename the file names
2015-04-07 09:31:04 +08:00
a64e90d469
Update the related project setting for Luajit and related test cases
2015-04-06 22:41:34 +08:00
Paul Gardiner