5d006192aa
V3 multisampling support ( #18632 )
...
* Multisampling support
* fix opengl initialization with multisampling
* fix merge conflict
* reverted default attributes
2018-01-19 09:28:22 +08:00
ca46b062fd
spine res name update, because files name changed before ( #18586 )
2017-12-26 09:10:24 +08:00
5151dfd6f9
Remove ant projects ( #18532 )
...
* remove proj.android
* remove ant building and rename proj.android-studio to proj.android
* not pass --android-studio
2017-12-04 18:00:45 +08:00
9c67dcab9d
remove proj.android ( #18529 )
2017-12-04 11:26:43 +08:00
a7a61e6a83
travis build android studio projects ( #18515 )
2017-12-01 17:29:34 +08:00
b191318e15
Auto hide home indicator for iPhoneX. ( #18514 )
2017-11-27 17:08:34 +08:00
dacd8e664f
fix issue that can not generate archieve file with Xcode9 ( #18498 )
2017-11-24 10:38:41 +08:00
bb479e4f6d
Android Studio 3.0 + Switching to libc++ (c++_static) + Simplify PROP_* values + Adding default Proguard Config for cocos ( #18470 )
...
* Updated android build process to use c++_static
* Comment out org.gradle.jvmargs
* Updated all project in test directory
* Update C++ Template
* Update js and lua projects
* Update Proguard + Lower minSdkVersion to 14
* Added All PROP_* values + updated build.gradle
* Updated versions
2017-11-23 09:08:50 +08:00
69e5a056e6
Uses Images.xcassets instead of several icon png files. ( #18485 )
...
* Uses Images.xcassets instead of several icon png files.
* Renames AppIcon.
* Sets AppIcon from Images.xcassets
* Uses Images.xcassets instead of several icon png files for template projects.
* Modify permission to 644
2017-11-21 15:31:29 +08:00
cfaa77be28
Update spine ( #18427 )
2017-11-02 09:06:13 +08:00
496de07633
don't have to set NDK_MODULE_PATH manually
2017-10-26 13:40:27 +08:00
b275a3e2f0
fix conflict
2017-09-20 09:11:35 +08:00
0c5ba220b1
Supports full screen for iPhone X and uses Storyboard for launch screen. ( #18276 )
...
* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-empty-tests done.
* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-tests, js-tests, lua-empty-test, lua-tests done.
* Removes unused UILaunchImages for test projects.
* Removes unused UILaunchImages for template projects.
* Adds LaunchScreen.storyboard / LaunchScreenBackground for template projects.
* Fixes lua template.
2017-09-19 15:01:19 +08:00
186e05f7c5
adjust z order ( #18284 )
2017-09-18 17:18:20 +08:00
a73d5893b4
[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. ( #18271 )
...
* [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.
* Update AppActivity.java
* Update AppActivity.java
2017-09-18 15:12:30 +08:00
c4042c220b
[ci skip]fix issue that can not change position style, can not add new emitter ( #18272 )
2017-09-15 10:49:04 +08:00
19962a3b59
[ci skip]don't clean layer when switch to another layer ( #18267 )
2017-09-14 17:42:56 +08:00
36f7f3c37e
Merge branch 'v3.16' of github.com:cocos2d/cocos2d-x into syn-v316
2017-09-13 11:18:39 +08:00
ec83cc99cc
[ci skip] [lua-tests] fix wrong position of 'save' button in renderTextureTest. ( #18244 )
2017-09-08 16:42:12 +08:00
5cf8db85d4
Fixes crash of lua particle test while building lua-tests in release mode. ( #18221 )
2017-09-06 15:06:21 +08:00
30266b4ddd
[ci skip]Fixes crash of lua particle test while building lua-tests in release mode. ( #18222 )
2017-09-06 15:05:47 +08:00
afe7ddcad3
Updates EventDispatcherTest for js-tests and lua-tests. ( #18211 )
...
Fixes http://punchbox.info:3000/issues/26293
Uses removeFromParent(false) for not cleaning up EventListener associated with node.
2017-09-06 15:05:03 +08:00
c89e35e22a
Merge pull request #18216 from cocos2d/v3.16
...
V3.16
2017-09-06 14:59:36 +08:00
15b43659c2
update to use Android Studio 2.3.3 ( #18214 )
2017-09-01 17:46:26 +08:00
4a0b9b1fd3
[ci skip]remove tizen projects ( #18196 )
2017-08-28 14:33:01 +08:00
03635ecc4a
Improved Cocos2dxLuaLoader.cpp ( #18171 )
...
* Improved Cocos2dxLuaLoader.cpp
* Added testcase for new LuaLoader
2017-08-25 09:32:02 +08:00
d11674fd9c
[ci skip]implementation conversion lua table to ObjC Dictionary ( #18134 )
2017-08-24 14:17:21 +08:00
8fcf0d7fd9
fix gradle setting ( #17896 )
2017-06-05 11:35:48 +08:00
ee84d9f12e
update v3.15
2017-04-14 13:45:32 +08:00
e5e87311b6
[lua-tests] Check the validity of label instance before setString. ( #17664 )
...
* [lua-tests] Check the validity of label instance before setString.
fixed http://punchbox.info:3000/issues/26233
* Minor fix: Adds missing test case in NewAudioEngineTest.
2017-04-10 10:14:06 +08:00
513092bd88
fix error ( #17656 )
2017-04-06 16:18:28 +08:00
8a587a3681
[ci skip]fix some error for Android Studio project ( #17655 )
...
* use '/' for path separator on windows
* enable short commands
it is useful on windows because windows has length limitation of commands
2017-04-06 15:41:38 +08:00
9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
d2a5c194cc
adjust position ( #17622 )
2017-03-31 10:20:08 +08:00
b6d42e0b42
fix error effect ( #17612 )
2017-03-29 17:20:01 +08:00
9d81f16bc5
[ci skip]make android studio work for release mode ( #17610 )
...
* release mode of lua test case work with Android Studio
* add missing file
* fix error for debug mode
* make android studio work
2017-03-29 15:56:46 +08:00
c5140f7af2
remove unneeded test case ( #17609 )
2017-03-29 14:24:11 +08:00
c8af3fe0bd
fix crash in release mode ( #17592 )
2017-03-27 15:19:24 +08:00
db837ebdae
remove unneeded test cases and fix parameter length limitation on windows
...
* delete unnneded test case on windows
* delete unneeded test cases
* avoid parameter length limit when building android on windows
* adjust project setting to delete unneeded test cases
* remove unneeded test cases for windows10
* remove unneeded test cases for tizen
* remove unnedded test case for android
2017-03-22 13:43:12 +08:00
3bd09ae286
[win32] Fixes cpp-tests/FileUtilsTest crash. ( #17551 )
2017-03-22 11:17:52 +08:00
f90691eb63
Fix spelling: billborad -> billboard ( #17560 )
2017-03-22 09:21:34 +08:00
f8eccb9608
Added VS2017 support in project files ( #17548 )
...
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file
* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.
* Changed extension of CCStencilStateManager.hpp to .h
* Added support for VS2017 in project files.
2017-03-20 09:36:07 +08:00
ebdae8c2da
use different separator on different platforms and make path length short ( #17542 )
2017-03-17 11:54:36 +08:00
8be22ce55c
Fix typos in comments and strings ( #17534 )
2017-03-17 10:44:38 +08:00
010a724149
Solve the error when building Android Studio project. ( #17504 )
2017-03-15 15:45:50 +08:00
7d3b9de866
update gradle version and build tool version ( #17496 )
2017-03-14 18:13:47 +08:00
769f7830f0
Improve the AndroidStudio configurations of tests & templates ( #17495 )
...
* Improve the AndroidStudio configuration of test projects to fit the new implementation of cocos compile.
* Improve the AndroidStudio configuration of templates to fit the new implementation of cocos compile.
2017-03-14 13:41:28 +08:00
b04fcbcd30
fix the broken of lua-tests after PR #17445 was merged. ( #17454 )
...
repeat is a keyword in lua.
2017-03-07 10:14:55 +08:00
e293520057
Fix some local variable names in tests ( #17445 )
2017-03-06 10:01:53 +08:00
cfbbc65c71
Fix various typos in comments and strings ( #17410 )
2017-02-27 11:12:29 +08:00
454fd8518b
Fix minor typos in tests ( #17404 )
2017-02-24 12:45:41 +08:00
48cbc890c6
Typo fix: Rename `MutiTouchTest` to `MultiTouchTest` ( #17399 )
2017-02-23 17:05:08 +08:00
5ae8a95c6f
[ci skip]make all tests and template support Android Studio ( #17389 )
...
* make all tests and template support Android Studio
* use grable 2.2.3
2017-02-21 17:58:30 +08:00
619e012d9b
[WebSocket] Adds support for getting url and server selected protocol ( #17381 )
...
* [WebSocket] Adds support for getting url and server selected protocol
* Adds const keyword for getter methods, and make LOGE also works in release mode.
2017-02-20 09:44:20 +08:00
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
1baad6b962
Fix tizen compilation issue ( #17341 )
...
* fix tizen compile issue
* enable websocket test on tizen
* change application id of tizen projects
* improve cpp-tests websockets
* update template app id of tizen
* fix tizen cpp-tests in release mode
* update 3rd deps version
* bump external version to 123
2017-02-13 17:59:48 +08:00
c61cd9afe7
fix spine binding codes and test case ( #17335 )
2017-02-10 11:58:23 +08:00
8825a091bb
update spine to 3.5.35 ( #17331 )
...
* update spine to 3.5.35
* fix jsb compiling error
* fix lua compiling error
2017-02-09 16:57:42 +08:00
b1f2a056b2
Refactor WebSocket to support SSL (wss) ( #17172 )
...
* Refactors WebSocket:
1. Supports wss protocol
2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
3. Uses lws_create_vhost to create multiple virtual host, different protocols works
* Adds openssl include path to xcode project configuration.
* mac doesn’t depend on curl
* ca file path should be full path.
* More bug fixes like which in https://github.com/cocos2d/cocos2d-x/pull/6986
* Remove curl dependence for mac
* Updates Andorid.mk
* [win32] Adds wss support for win32, and updates openssl, libcurl, libwebsockets libraries.
* Updates external/config.json to 118.
* [win32] Updates cocos/2d/libcocos2d.vcxproj to fix compilation error while building in release mode.
* Linux support websocket ssl connection.
* Updates external/config.json
* Updates install-deps-linux.sh
* Adds dependence of binutils, print ld version
* Updates travis scripts.
* Updates travis scripts.
* Updates travis script, don’t output log while extracting.
* update before-install.sh
* updates before-install.sh
* updates before-install.sh
* don’t output log for installing software.
* Updates config.json to 120.
2017-01-19 13:55:14 +08:00
1b6c8cc5c1
bind FileUtils:getDataFromFile() to lua ( #17182 )
2017-01-13 13:39:58 +08:00
20d8ef9584
make it work with release mode on arm64 bit ( #17057 )
2016-12-23 16:44:29 +08:00
de670c1913
Lua tests ( #17005 )
...
* fix conflict effect
* set index to 1 before running a test case
2016-12-14 09:28:19 +08:00
ba7c977111
use no border policy ( #17004 )
2016-12-13 16:31:31 +08:00
91daa7a12a
Fixes NewEventDispatcherTest. ( #16983 )
...
fixed http://punchbox.info:3000/issues/26036
2016-12-12 09:39:20 +08:00
951b5174db
[lua-tests] Fixes PhysicsDemoBug5482 crashes. ( #16979 )
...
Fixed http://punchbox.info:3000/issues/26011
2016-12-09 14:12:57 +08:00
fb3055e98c
remove duplicated codes to fix crash in release mode ( #16978 )
2016-12-09 13:42:16 +08:00
e6aa2ace3e
[lua] Fixes AssetsManagerEx test crashes. ( #16977 )
2016-12-09 12:04:38 +08:00
a0b67fc99a
Fixes lua action test ‘Issue 1305’ crashes. ( #16974 )
...
* Fixes lua action test ‘Issue 1305’ crashes.
* Removes an unused log.
2016-12-09 10:39:34 +08:00
fb89672fff
Updates lua CCControlSliderTest. ( #16968 )
...
* Updates lua CCControlSliderTest.
fixed http://punchbox.info:3000/issues/26029
* [lua-tests] Fix the display position of CCControlSilderTest on win32.
2016-12-07 14:55:43 +08:00
3db39a27ea
Vibrate test ( #16966 )
...
* only show vibrate test on iOS and Android device
* vibrate no matter it is silient or not
2016-12-07 11:12:38 +08:00
1b0a6c2c5c
Sync editbox improvement from cocos creator ( #16965 )
...
* sync the changes from creator
* fix editbox vertical alignment
* improve android editbox multiline text vertical alignment
2016-12-07 09:21:17 +08:00
77fb210b3a
fix wrong codes and simplify codes ( #16964 )
2016-12-06 17:38:06 +08:00
84a6ab312c
use correct downloader implementation on mac ( #16955 )
2016-12-05 09:36:35 +08:00
babced8b7c
Fixes lua-tests/keypad test case. ( #16954 )
...
* Fixes lua-tests/keypad test case.
* Updates string
2016-12-02 15:50:53 +08:00
8f9b096792
fix url and use https protocol ( #16940 )
2016-11-30 17:51:57 +08:00
7e100135b6
disable menu item according different angle of view ( #16937 )
2016-11-30 16:49:50 +08:00
28e48c0af8
remove unneeded test case ( #16936 )
2016-11-30 16:21:33 +08:00
df13bc8856
Allows Arbitrary Loads for cpp-tests, js-tests, lua-tests project. removes exception dictionary. ( #16934 )
2016-11-30 15:29:48 +08:00
8f7d5cfc01
Updates ios project configuration, allows http connection to `httpbin.org` for cpp-tests,lua-tests. ( #16925 )
2016-11-30 11:17:24 +08:00
3b87e46280
Support compile & run project on Tizen by cocos command. ( #16783 )
...
* Add config files for build engine source code on tizen.
* Add config files for cpp-empty-test on tizen.
* Add missing files.
* Add config files for cpp-tests on tizen.
* Add Tizen config files for lua-bindings.
* Add Tizen config files for lua-empty-test.
* Solve the error when build lua-empty-test for Tizen.
* Add Tizen config files for lua-tests.
* Solve the error when build lua-tests for Tizen.
* Add tizen config files for templates.
* Update submodule cocos2d-console.
2016-11-02 17:41:26 +08:00
6b27f014fc
Correct the Skybox fov ( #16655 )
...
* Remove undrawn quads from the skybox mesh
CCSkybox had been implemented using a combination of two
inconsistent techniques. The rendering was being achieved via use of
the vertex shader's inherent support for cubemaps. That technique requires
only a single screen-covering quad, but the implemtation defined a cube.
Defining a cube mesh would be appropriate if one were simply mapping the
cubemap's 6 textures to faces, but is unnecessary if using the shader's
cubemap feature.
Not only was the use of a cube mesh unnecessary, but the particular way
the cube was defined and used meant that only one face would ever
contribute to the rendering. One of the other faces would always be culled
and the other four would be viewed edge on, mapping the the infinitesimally
thin lines defining the edges of the screen.
This commit simply removes the never-rendered faces, and adds comments
explaining the technique.
* Within test code, remove setScale calls applied to skyboxes.
A Skybox is defined in such a way that it's position, rotation and
scaling has no effect on it's rendering, so setScale has no effect.
The calls are removed from test code to avoid confusing anyone using
it as a template for their own programs.
* Make the Skybox correctly account for the camera's fov
The Skybox does not use the model/view and projection matricies. Instead
a single quad that maps exactly to the screen is rendered and the camera's
world matrix is passed into a shader that renders using cubemap lookups.
The way that works hardwires the fov to 90deg in both the horizontal and
vertical. That shows up particularly badly when the camera is pointed
directly downwards and rotated: the image deforms as it rotates.
This commit corrects the problem by using scaling factors from the
camera's projection matrix to prescale the matrix passed into the shader.
2016-10-17 13:46:26 +08:00
875cf45d1d
Lua: add cc.vec3 functions - add, sub, mul and dot ( #16706 )
...
Also update the lua test to use these functions.
2016-10-17 10:39:40 +08:00
56e0e6f741
correct search path ( #16660 )
2016-10-08 14:44:18 +08:00
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
921981833e
Update Sprite3DCubeMap test case
2015-03-28 14:59:47 +08:00
000e34c6d0
merge cocos
2015-03-26 12:50:18 +08:00
52280e6376
add 3d test case(skybox and texture cube) for lua project
2015-03-20 17:53:05 +08:00
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
81bf776d09
do not use MoveTo::reserse
2015-03-13 14:10:51 +08:00
6a6877b39f
add particle to lua test
2015-03-04 12:59:22 +08:00
ea7dfe1147
lua test
2015-03-04 10:42:08 +08:00
d5bde9e536
add missing material
2015-02-28 12:57:15 +08:00
218de84cc5
remove expolosion particle
2015-02-28 11:31:15 +08:00
6f395edf0e
modify according to minggo
2015-02-26 17:37:45 +08:00
dbba9e36a1
Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path
...
Fix win32 resource search path to be relative to the executable.
2015-02-25 20:24:07 -08:00
83a7b8012c
3DParticle Reader and tests
2015-02-26 09:19:14 +08:00
ff07f62e83
fix CocosStudio 3DReader test resource
2015-02-25 15:49:04 +08:00
c66a4f28bc
Add CocosStudio UserCameraReader
...
fix Sprite3DReader Test
2015-02-25 14:19:08 +08:00
35e3e8d62d
Sprite3D Reader and tests
2015-02-23 00:34:30 +08:00
80a5b201f8
3DNode Reader lua Test
2015-02-19 17:28:51 +08:00
9be620043f
Fix the search path error
2015-02-15 18:29:10 +08:00
newnon