子龙山人
|
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 |
WenhaiLin
|
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 |
WenhaiLin
|
5dd6d94c17
|
Test cases:improve small problems.
|
2015-08-18 22:19:24 +08:00 |
fusijie
|
f671d36e31
|
Fixed lua testacase setPointer error.
|
2015-08-18 11:19:32 +08:00 |
Ricardo Quesada
|
d2cf4bfc79
|
Squashed commit of the following:
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 13 00:13:38 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 61788a0b34188fed5367cab121817db97198bcd8
Merge: 8c1e211 5e21580
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:45:12 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f
Merge: 2ea66af 8d73883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:42:04 2015 -0700
Merge pull request #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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 09:14:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806
Merge: 9272765 08eeca9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 20:11:46 2015 -0700
Merge pull request #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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 10:39:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b
Merge: 5dddbb6 138df42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 06:53:48 2015 -0700
Merge pull request #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 0cbd71f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:49:33 2015 -0700
Merge branch 'v3' into cocos_net
commit 0bbc62ee1fbfd107a935131d5d93994e87865afa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:46:55 2015 -0700
more tests... and works
but there is huge bug.
ProgData <vector> needs the position of DownloadUnits <unordered_map>
but <unordered_map> does not guaranty the order.
So in my next commit I"ll merge DownloadUnit with ProgressData
commit 389ed8639a1942f628773616a8e340bc66a0c1d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 13:47:07 2015 -0700
debugging info
commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:47:31 2015 -0700
sync and async tests working ok
commit 999fa7a7bfb28565492f47b39caef7f1a079c183
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:38:38 2015 -0700
adding tests
commit 91ee294942510718400edc0d00d3c744d00339ee
Merge: 76ab703 7f215e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 10:03:50 2015 -0700
Merge branch 'v3' into cocos_net
commit 76ab7032d3a21156f05395a021391a16649f755a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 00:22:20 2015 -0700
Downloader tests
commit b65c4dad7089660bfe697c0dab3e9290d1a6d013
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 21:34:54 2015 -0700
compiles on Xcode 7
commit ec0d66340b8daf0b042d36333dff759cd424f465
Merge: 878e4b5 0d77838
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 11:02:24 2015 -0700
Merge branch 'v3' into cocos_net
commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 18:07:02 2015 -0700
working, yeah!
commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 17:49:59 2015 -0700
code is more thread-safe friendly
commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 16:39:02 2015 -0700
fixes callbacks
commit ddab4d753106c6ff11304c1c69739c5611e3f20a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 15:43:51 2015 -0700
cleaner code
runs callbacks in cocos2d thread only if needed
commit ef75844aaa010633e6e27ae6e69460174460d5c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:58:04 2015 -0700
removed weak_ptr<> from ProgressData
that logic of the code is added in the callbacks
commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:54:07 2015 -0700
checks whether or not the callbacks are in the cocos2d thread
commit ae6594a6f866f6b5015ba293db23343887063d2f
Merge: 4c61069 6831e24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 10:48:34 2015 -0700
Merge branch 'v3' into cocos_net
commit 4c61069a7e0e33fa0332df700cc8df4807178caf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 21:36:50 2015 -0700
almost there...
Downloader has std::vector<FILE*> instead of FileDescriptors
code cleaner...
commit c34d04a8218d2be5c316e0487e5ac46792bbed76
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 20:38:44 2015 -0700
passes progressData to batch
no need to alloc memory for each ProgressData
commit f7e8bbd8b85f214b919bce6118d4158dd6d26368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 17:47:23 2015 -0700
tidier code and more optimizations
commit a486dc78aedcf9c6178e490292edd572f8a7b374
Merge: 4178327 a06421b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 14:03:22 2015 -0700
Merge branch 'v3' into cocos_net
commit 417832705910a6ebd16a876cd98064ea16f0f45c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 18:13:13 2015 -0700
not finished yet...
...but trying to have a common inteface with batched and non-batched
downloads
commit 1d0e4652763c2e1511ac102a62defae6c6a89220
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 16:29:39 2015 -0700
ErrorCallback compiles
starting the batching code
commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18
Merge: c180425 8d836da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 10:28:51 2015 -0700
Merge branch 'v3' into cocos_net
commit c180425d8181b8e6f53be766d8d2b94f908ae168
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 15:35:53 2015 -0700
More progress on migrating multiple-file downloader
to the implementation file
commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 14:00:02 2015 -0700
Dowloader moved to `cocos2d::network`
commit 14b1d0825106701b5435a266b255f09291b6486b
Merge: 13cfc8d f744383
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:13:55 2015 -0700
Merge branch 'v3' into cocos_net
commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:11:45 2015 -0700
DownloadUnits belong to network
commit e6e17564ead1fb7f6f7df343b0627a104cd756f8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 12:23:36 2015 -0700
adds `check for option`
commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 10:37:51 2015 -0700
Downloader: using URLDownload in one case.
3 more to go. Not tested yet
commit 9b26e9cfac425635027189ccab835054b68bc83d
Merge: 20fe063 253d9c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 08:35:53 2015 -0700
Merge branch 'v3' into cocos_net
commit 20fe0636e36ae7f1da048545b3345f526d5b64de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 17:36:07 2015 -0700
URLDownload: initial commit
HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d
guidelines
Adds `CCIRULDownload` interface.
Adds `CCURLDownload` implementation based on libcurl. Not working yet.
`Downloader` uses `URLDownload` for some of its functions.
WIP
commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0
Merge: e408fe0 642ccac
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 14:00:43 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into cocos_net
commit e408fe0b9303813d20bab2f7bf548f3b7af416a6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 13:59:46 2015 -0700
Adds more files to Xcode project
...even if they are not being compiled. Much easier to add missing
functionality to the rest of the platforms
commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 11:36:57 2015 -0700
removes unneeded headers
|
2015-08-13 00:14:10 -07:00 |
andyque
|
9a83ed9b28
|
remove unneeded protocol in AppController.h.
|
2015-08-12 13:55:36 +08:00 |
pandamicro
|
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 |
WenhaiLin
|
772dab2002
|
Fixed minor problems in test cases.
|
2015-08-07 23:08:49 +08:00 |
pandamicro
|
3c2e66e425
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
|
2015-08-02 22:28:27 +08:00 |
WenhaiLin
|
875d01573a
|
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
|
2015-07-31 21:20:42 +08:00 |
dualface
|
ea594b92b4
|
add ActionTime lua test
|
2015-07-29 17:50:50 +08:00 |
dualface
|
184225519e
|
add ActionTime lua test
|
2015-07-29 17:36:54 +08:00 |
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
Vincent Yang
|
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 |
WenhaiLin
|
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 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
samuele3hu
|
ad4f5b8ec0
|
Fix the some lua tests case bug
|
2015-06-25 15:13:01 +08:00 |
Bin Zhang
|
c9c212d0e1
|
Solve the error when run tests projects with `cocos run`.
|
2015-06-24 15:33:13 +08:00 |
samuele3hu
|
5c5f3dcc79
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
|
2015-06-23 20:03:14 +08:00 |
samuele3hu
|
e2aa669b8d
|
Fix the LayerTest error about Lua
|
2015-06-23 20:02:26 +08:00 |
WenhaiLin
|
f95245312a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
|
2015-06-23 17:08:25 +08:00 |
WenhaiLin
|
cbb073e905
|
Fixed Application may be created more than once on Android.
|
2015-06-23 16:58:38 +08:00 |
Vincent Yang
|
27d011dd50
|
Fixbug: LabelTestNew New Label + CharMap's effect is wrong.
|
2015-06-23 16:02:38 +08:00 |
pandamicro
|
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 |
samuele3hu
|
3b766e5236
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
|
2015-06-23 10:20:05 +08:00 |
samuele3hu
|
683c5b4cb2
|
Fix the LabeLTestNew error.
|
2015-06-22 22:32:21 +08:00 |
samuele3hu
|
bc964c96da
|
Fix the error about the Camera3D Test
|
2015-06-22 09:28:18 +08:00 |
samuele3hu
|
0181a84883
|
Fix the bugs about the particle3DTest
|
2015-06-22 09:27:34 +08:00 |
Bin Zhang
|
85fe9e8816
|
Solve the error when build tests projects with cocos command on win32.
|
2015-06-19 18:32:32 +08:00 |
pandamicro
|
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 |
samuele3hu
|
6c749a77f2
|
Fix the bugs about the Physics3DTest for Lua.
|
2015-06-18 11:17:08 +08:00 |
samuele3hu
|
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 |
samuele3hu
|
9c550e0a11
|
Update the Physics3DTest for js and Lua by synchronizing the API.
|
2015-06-17 13:58:05 +08:00 |
Jacky
|
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 |
samuele3hu
|
2da760b655
|
Update the NavMesh test case
|
2015-06-17 09:49:31 +08:00 |
samuele3hu
|
1b20e463d8
|
Update the Lua binding about the Polygon and update the test case.
|
2015-06-11 14:38:38 +08:00 |
samuele3hu
|
0cccd6e765
|
Fix compile error on the Linux and update the test cases
|
2015-06-03 18:12:21 +08:00 |
samuele3hu
|
a20681aa21
|
Add Lua-bindings for NavMesh
|
2015-06-02 18:37:57 +08:00 |
samuele3hu
|
9934d73548
|
issue #12046: Add Lua bindings for material systems and related test cases.
|
2015-05-27 15:37:59 +08:00 |
Bin Zhang
|
c491b6a5c1
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-05-25 17:01:29 +08:00 |
samuele3hu
|
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 |
andyque
|
07eb116fb6
|
fix lua tests release mode linker issue
|
2015-05-23 08:48:53 +08:00 |
andyque
|
73902a4063
|
fix simulator vs2015 support
|
2015-05-22 17:47:48 +08:00 |
Bin Zhang
|
3d0c716ee9
|
Add script in build.gradle for sign the release apk.
|
2015-05-22 15:52:41 +08:00 |
Bin Zhang
|
94e2e1cb00
|
Modify the configuration for android studio support in console.
|
2015-05-21 18:27:30 +08:00 |
Bin Zhang
|
41792caa6b
|
Add files & configuration for android studio support in console.
|
2015-05-21 16:34:03 +08:00 |
Bin Zhang
|
78d4089215
|
Add the project.properties for the ndk-build of proj.android-studio.
|
2015-05-21 15:43:01 +08:00 |
Bin Zhang
|
37dddf9b15
|
Add execute permission for the gradlew in proj.android-studio.
|
2015-05-21 15:31:18 +08:00 |
andyque
|
03e8f16a8a
|
add vs2015 support
|
2015-05-21 13:55:01 +08:00 |
WenhaiLin
|
a569d877ba
|
[ci skip]Remove unnecessary code.
|
2015-05-20 18:05:46 +08:00 |
minggo
|
79f70c49ce
|
Merge pull request #11905 from WenhaiLin/v3-37
Remove unnecessary files.
|
2015-05-20 13:39:36 +08:00 |
WenhaiLin
|
df3548673f
|
Remove unnecessary files.
|
2015-05-20 10:19:32 +08:00 |
samuele3hu
|
b6a2299666
|
Add a newline
|
2015-05-19 16:55:37 +08:00 |
samuele3hu
|
7f728f029c
|
Add Scene3DTest and update TerrainTest based on the Lua
|
2015-05-19 16:52:39 +08:00 |
minggo
|
e700ef6d30
|
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
Add Android Studio support
|
2015-05-18 16:17:24 +08:00 |
WenhaiLin
|
26f094b1a7
|
Remove unnecessary files
|
2015-05-18 16:02:05 +08:00 |
WenhaiLin
|
54b6260dfd
|
Rename module
|
2015-05-18 15:17:05 +08:00 |
WenhaiLin
|
6dd3108e42
|
Rename module
|
2015-05-18 15:01:20 +08:00 |
WenhaiLin
|
68188f7424
|
Add native code for AS project.
|
2015-05-18 13:41:58 +08:00 |
WenhaiLin
|
7caa6bb2fc
|
Update Copyright.
|
2015-05-18 09:59:50 +08:00 |
samuele3hu
|
562c711cda
|
Update CocoStudioUIEditorTest for Lua and replace some deprecated functions.
|
2015-05-15 18:26:21 +08:00 |
WenhaiLin
|
dc8492948e
|
Add Android Studio support
|
2015-05-15 16:37:43 +08:00 |
samuele3hu
|
71595898ed
|
Update the Lua binding for Physics3D ,related test cases and the template project
|
2015-05-15 16:25:07 +08:00 |
samuele3hu
|
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 |
samuele3hu
|
8db62c82f8
|
Add Lua bindings for Physics3D and related test cases
|
2015-05-15 09:28:03 +08:00 |
WenhaiLin
|
c70bac7bb4
|
Add support for visual studio 2015.
|
2015-05-12 16:26:28 +08:00 |
yangxiao
|
2391558c96
|
add physics3d support
|
2015-05-08 15:49:33 +08:00 |
samuele3hu
|
037c17fe5d
|
Remove vs2012 support in v3
|
2015-05-05 16:11:26 +08:00 |
samuele3hu
|
5819159889
|
Add Lua-bindings for SpritePolygon and related test case
|
2015-04-28 18:19:57 +08:00 |
samuele3hu
|
c801d1868c
|
Update Sprite3DTest and VideoPlayerTest about Lua
|
2015-04-28 11:27:50 +08:00 |
samuele3hu
|
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 |
samuele3hu
|
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 |
samuele3hu
|
47e2698986
|
Fix the cocos3.6beta0 bugs
|
2015-04-22 10:20:21 +08:00 |
samuele3hu
|
b72034a3f6
|
Add Lua bindings for WebView and related test case
|
2015-04-17 14:08:47 +08:00 |
samuele3hu
|
dd3b6ced34
|
Fix the bugs that title and button disappeared because of camera setting
|
2015-04-14 15:40:12 +08:00 |
samuele3hu
|
24654a4847
|
synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 16:29:44 +08:00 |
minggo
|
da69dbd133
|
Merge pull request #11388 from xiaofeng11/v3
Reader update
|
2015-04-13 11:20:53 +08:00 |
samuele3hu
|
8896190d9b
|
Fix the bindings-generator error and add related Action Timeline test case.
|
2015-04-12 22:20:53 +08:00 |
samuele3hu
|
9bf2a920b4
|
Update the Lua bindings for terrain and TerrainTest.lua
|
2015-04-09 13:41:52 +08:00 |
minggo
|
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 |
samuele3hu
|
3a2601a1f8
|
Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 10:03:50 +08:00 |
samuele3hu
|
fd554c07da
|
Rename the file names
|
2015-04-07 09:31:04 +08:00 |
samuele3hu
|
a64e90d469
|
Update the related project setting for Luajit and related test cases
|
2015-04-06 22:41:34 +08:00 |
samuele3hu
|
921981833e
|
Update Sprite3DCubeMap test case
|
2015-03-28 14:59:47 +08:00 |
yangxiao
|
000e34c6d0
|
merge cocos
|
2015-03-26 12:50:18 +08:00 |
zhukaixy
|
52280e6376
|
add 3d test case(skybox and texture cube) for lua project
|
2015-03-20 17:53:05 +08:00 |
Martin Konopka
|
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 |
yangxiao
|
81bf776d09
|
do not use MoveTo::reserse
|
2015-03-13 14:10:51 +08:00 |
yangxiao
|
6a6877b39f
|
add particle to lua test
|
2015-03-04 12:59:22 +08:00 |
yangxiao
|
ea7dfe1147
|
lua test
|
2015-03-04 10:42:08 +08:00 |
yangxiao
|
d5bde9e536
|
add missing material
|
2015-02-28 12:57:15 +08:00 |
yangxiao
|
218de84cc5
|
remove expolosion particle
|
2015-02-28 11:31:15 +08:00 |
yangxiao
|
6f395edf0e
|
modify according to minggo
|
2015-02-26 17:37:45 +08:00 |
Nite Luo
|
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 |
Ray
|
83a7b8012c
|
3DParticle Reader and tests
|
2015-02-26 09:19:14 +08:00 |
Ray
|
ff07f62e83
|
fix CocosStudio 3DReader test resource
|
2015-02-25 15:49:04 +08:00 |
Ray
|
c66a4f28bc
|
Add CocosStudio UserCameraReader
fix Sprite3DReader Test
|
2015-02-25 14:19:08 +08:00 |
Ray
|
35e3e8d62d
|
Sprite3D Reader and tests
|
2015-02-23 00:34:30 +08:00 |
Ray
|
80a5b201f8
|
3DNode Reader lua Test
|
2015-02-19 17:28:51 +08:00 |
samuele3hu
|
9be620043f
|
Fix the search path error
|
2015-02-15 18:29:10 +08:00 |
samuele3hu
|
3a7cbe9d67
|
Add Particle3DTest for Lua and update related configure files
|
2015-02-15 15:56:20 +08:00 |
Vladimir Timofeev
|
5688202844
|
Modify MSVC project files to build executables in subfolders and properly copy resources to that subfolders.
|
2015-02-10 16:23:34 +03:00 |
samuele3hu
|
4f782e2330
|
Fix z-fighting error by using setDepthTest of cc.Director
|
2015-01-30 11:03:47 +08:00 |
samuele3hu
|
80c2e0c153
|
Add AsyncLoadSprite3D test case and update the related lua binding
|
2015-01-28 21:47:52 +08:00 |
samuele3hu
|
7628ec53bc
|
Remove useless comment
|
2015-01-28 11:06:00 +08:00 |
samuele3hu
|
82a95bf2fc
|
Modify some script files
|
2015-01-28 10:57:30 +08:00 |
samuele3hu
|
6208e9cba5
|
Add more test cases about 3D
|
2015-01-28 09:40:20 +08:00 |
samuele3hu
|
6e055ba41f
|
Fix some lua test cases bug
|
2015-01-23 15:35:15 +08:00 |
samuele3hu
|
d74fb0e8b5
|
Update LayoutComponent Test case of UIEditTest
|
2015-01-22 10:21:38 +08:00 |
samuele3hu
|
01bfe09c05
|
Add checked lua codes for issue #10107
|
2015-01-21 19:33:42 +08:00 |
minggo
|
45c4c16f93
|
Merge pull request #10010 from andyque/fixErrorFontName
fix font name typo in tests
|
2015-01-15 10:24:02 +08:00 |
andyque
|
f8200347cd
|
fix font name typo in tests
|
2015-01-15 10:10:53 +08:00 |
samuele3hu
|
1325ba0eaf
|
Fix some lua test cases bug
|
2015-01-15 10:01:16 +08:00 |
minggo
|
825f90564c
|
Merge pull request #9992 from samuele3hu/v3_4_issue9986
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 17:05:51 +08:00 |
samuele3hu
|
77912270f9
|
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 16:58:35 +08:00 |
samuele3hu
|
c026aa82f9
|
Add CC_DEPRECATED_ATTRIBUTE flag
|
2015-01-14 15:09:37 +08:00 |
samuele3hu
|
1d94ae4302
|
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 13:51:09 +08:00 |
samuele3hu
|
6a55fef70e
|
Update the VideoPlayerTest to passing the fullpath of video resource
|
2015-01-09 16:45:51 +08:00 |
samuele3hu
|
08ec8cc8bf
|
Fix some lua-tests bugs
|
2015-01-09 15:23:54 +08:00 |
WenhaiLin
|
718c400bfa
|
Fixed bodies display wrong in Physics:Pump test case
|
2015-01-09 10:21:50 +08:00 |
kaile.yin
|
b924dafe83
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
|
2014-12-22 11:14:31 +08:00 |
samuele3hu
|
7e8da62ebc
|
Add Websocket support for Mac platform
|
2014-12-09 18:29:20 +08:00 |
youyou
|
72aea55051
|
update lua timeline test
|
2014-12-05 20:21:21 +08:00 |
youyou
|
ca4d76997d
|
update lua action timeline test
|
2014-12-05 20:04:05 +08:00 |
samuele3hu
|
3e0852eb7a
|
Remove useless copy about luasocket on the android platform
|
2014-12-05 15:28:45 +08:00 |
samuele3hu
|
781afbec3f
|
Update CocoStudioActionTimelineTest
|
2014-12-04 15:14:19 +08:00 |
samuele3hu
|
802ba311d6
|
Fix the error that SpritePerformanceTest lua does’t work
|
2014-11-28 11:54:38 +08:00 |
minggo
|
dcc517e8d4
|
Merge pull request #9267 from samuele3hu/v3_strip
Adjust binding structure to decrease the package size of lua_empty_test
|
2014-11-27 20:21:06 +08:00 |
Dhilan007
|
4cda033a04
|
Fixed compiling and linking error of lua tests when using NDK r10 above.
|
2014-11-27 13:56:15 +08:00 |
samuele3hu
|
6398f99ed2
|
Update the CMakeLists.txt for lua-tests
|
2014-11-27 11:17:48 +08:00 |
Vladimir Timofeev
|
a689fc4c7e
|
sync with upstream
Conflicts:
CMakeLists.txt
|
2014-11-20 12:19:00 +03:00 |
Vladimir Timofeev
|
2bf77c10e8
|
Fix build on mingw again, disable USE_PREBUILT_LIBS with mingw (mingw can not link this libs). Eliminate some Find* modules, we can tune prebuilts without modify their code.
|
2014-11-19 03:28:41 +03:00 |
zhangbin
|
5aff5640b5
|
Solve the error when building android for sample projects of engine.
1. Update the project config.
2. Update the submodule cocos2d-console.
|
2014-11-18 18:39:53 +08:00 |
Vladimir Timofeev
|
b5266e95bf
|
mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)
|
2014-11-17 01:42:04 +03:00 |
Ricardo Quesada
|
2e3b2d9f28
|
Merge pull request #9080 from vovkasm/cmake-refactoring
Cmake refactorings and fixes
|
2014-11-13 15:42:47 -08:00 |
samuele3hu
|
9492a19dcb
|
Add test case for value type judge error
|
2014-11-13 15:36:43 +08:00 |
Vladimir Timofeev
|
72e59a53a8
|
cmake: Build application bundles on Mac for test applications (this allow run they from Xcode)
|
2014-11-11 10:30:48 +03:00 |
Ricardo Quesada
|
2ec1170943
|
treat warnings as errors in samples
|
2014-11-04 15:42:29 -08:00 |
samuele3hu
|
d29388eb30
|
Fix some lua-tests error
|
2014-10-22 17:04:18 +08:00 |
samuele3hu
|
2f9dbb7142
|
Update cocos2d basic lua files and LabelTestNew.lua
|
2014-10-21 15:56:38 +08:00 |
samuele3hu
|
c5abef0a60
|
Fix LuaBridgeTest require error
|
2014-10-21 11:52:33 +08:00 |
samuele3hu
|
20bcafa143
|
Fix the bug that callbacks aren’t triggered when response failed
|
2014-10-20 17:43:04 +08:00 |
samuele3hu
|
37ba316d0a
|
Update Lua AssetsManagerEx test
|
2014-10-20 14:12:55 +08:00 |
Huabing.Xu
|
ede7f75f5d
|
change lua asset manager test cases
|
2014-10-20 11:54:10 +08:00 |
samuele3hu
|
66a9d1c52e
|
Fix FontTest' output error message-> “cocos2d: removeChildByTag(tag = 0): child not found!”
|
2014-10-19 22:35:30 +08:00 |
samuele3hu
|
1194873b60
|
Fix Camera3DTest has not effect on the Linux
|
2014-10-19 22:20:34 +08:00 |
samuele3hu
|
634d42775e
|
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
|
2014-10-19 17:00:05 +08:00 |
minggo
|
8218804c52
|
Merge pull request #8820 from Dhilan007/v3-audioengine-lua
[LUA]Add New AudioEngine on window
|
2014-10-18 15:11:29 +08:00 |
samuele3hu
|
e74c3cd1e4
|
Remove some comments
|
2014-10-18 00:29:04 +08:00 |
samuele3hu
|
3348f8300e
|
Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case
|
2014-10-18 00:13:22 +08:00 |
Dhilan007
|
81a8e80496
|
[LUA]Add New AudioEngine on window
|
2014-10-17 17:53:33 +08:00 |
samuele3hu
|
1d6128443a
|
Update Mac project setting and some lua test cases about UI and ActionTimeline
|
2014-10-17 17:35:50 +08:00 |
samuele3hu
|
c4d3914230
|
Fix the lua-tests compile error in the release condition
|
2014-10-17 14:16:17 +08:00 |
samuele3hu
|
066d94530c
|
Update the Deprecated Func
|
2014-10-17 14:15:30 +08:00 |
samuele3hu
|
7198ae509c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-10-16 20:35:43 +08:00 |
samuele3hu
|
079df20541
|
Update lua bindings for Spine and related test case
|
2014-10-16 20:23:58 +08:00 |
minggo
|
0787a228d0
|
Merge pull request #8739 from huangshiwu/v3_iphone6hires
Add Default-667h@2x and Default-737h@3x launch images to support iPhone6...
|
2014-10-16 16:48:39 +08:00 |
huangshiwu
|
0a04da0a10
|
Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode
|
2014-10-16 15:53:12 +08:00 |
samuele3hu
|
b4c91f0712
|
Update the related cocosstudio lua test cases
|
2014-10-16 15:51:01 +08:00 |
samuele3hu
|
3f667fac85
|
Update the related AssetsManagerEx files and related project configure
|
2014-10-16 10:28:52 +08:00 |
samuele3hu
|
6c79ce50d2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
tests/lua-tests/src/mainMenu.lua
|
2014-10-15 15:07:30 +08:00 |
samuele3hu
|
a0c8ffb943
|
Modify Xcode project’s configure
|
2014-10-15 14:32:11 +08:00 |
samuele3hu
|
064e159c70
|
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
|
2014-10-15 13:41:27 +08:00 |
samuele3hu
|
3b4fbd8fff
|
Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes
|
2014-10-14 21:34:55 +08:00 |
samuele3hu
|
b064d9bbf8
|
Update project setting for Linux and Win32
|
2014-10-11 14:28:07 +08:00 |
samuele3hu
|
9b9b9d9700
|
Fix the lua-tests compile error
|
2014-10-11 14:14:08 +08:00 |
samuele3hu
|
115d81574c
|
Add CameraTest、OBBTest and related lua bindings
|
2014-10-10 09:49:25 +08:00 |
pandamicro
|
a26e91f839
|
no message
|
2014-10-09 18:30:39 +08:00 |
samuele3hu
|
f00187d3bb
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
Conflicts:
tools/tolua/cocos2dx.ini
|
2014-09-29 09:48:35 +08:00 |
samuele3hu
|
99e1c6640e
|
Add BillBoardTest and update related bindings files
|
2014-09-29 09:43:22 +08:00 |
samuele3hu
|
6b2acf88fc
|
Modify CameraTest and update related lua-bindings files
|
2014-09-28 16:47:06 +08:00 |
samuele3hu
|
e50eaf684f
|
Add CameraTest and update related lua-bindings files
|
2014-09-28 14:31:58 +08:00 |
samuele3hu
|
2ac96ed06e
|
Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement
|
2014-09-26 16:39:54 +08:00 |
samuele3hu
|
691074eb7c
|
Add Camra3DTest and update sprite3DTest
|
2014-09-26 16:00:57 +08:00 |
samuele3hu
|
2cc48d1f81
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-09-25 10:40:31 +08:00 |
Dhilan007
|
077ffb2b43
|
update lua binding
|
2014-09-22 15:54:35 +08:00 |
samuele3hu
|
f0608a6d70
|
Update lua bindings for Mesh and add a Sprite3DHitTest
|
2014-09-22 15:29:38 +08:00 |
Dhilan007
|
9942206c53
|
move AudioEngine in cocos2d:experimental namespace
|
2014-09-16 10:22:25 +08:00 |
minggo
|
7bb391ce55
|
Merge pull request #8033 from Dhilan007/v3-audio903
Lua bindings of AudioEngine.
|
2014-09-15 13:43:27 +08:00 |
Dhilan007
|
9cc9359b78
|
fix compile error
|
2014-09-15 11:16:27 +08:00 |
minggo
|
788f3c5c38
|
Merge pull request #8025 from andyque/fixEditBoxLuaBinding
fix Editbox lua binding
|
2014-09-15 09:36:36 +08:00 |
Dhilan007
|
51e3b1af7b
|
Add lua test case of AudioEngine
|
2014-09-14 22:54:48 +08:00 |
andyque
|
02d2282b83
|
add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox
|
2014-09-12 17:07:06 +08:00 |
huangshiwu
|
d9634057ab
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
|
2014-09-11 16:41:54 +08:00 |
huangshiwu
|
fb1d47900c
|
Deprecate DrawPrimitives and enhance DrawNode
|
2014-09-11 15:39:56 +08:00 |
Ricardo Quesada
|
9082ca18c3
|
Platform fixed
|
2014-09-09 16:50:02 -07:00 |
Ricardo Quesada
|
0ead7b6307
|
Squashed commit of the following:
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
|
2014-09-09 12:18:31 -07:00 |
andyque
|
6a4397a3eb
|
change toolset from 12.0 to 4.0
|
2014-09-09 15:57:21 +08:00 |
andyque
|
2e27a6865f
|
update project to vs2013
|
2014-09-03 14:10:38 +08:00 |
andyque
|
dafbf28283
|
fix release mode compile error
|
2014-09-02 16:42:23 +08:00 |
andyque
|
fadfa87afd
|
fix vs2013 compile error
|
2014-09-02 16:42:04 +08:00 |
zhangbin
|
e24a903c88
|
Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1.
|
2014-08-28 16:13:11 +08:00 |
samuele3hu
|
74624f5ba1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
|
2014-08-25 11:52:52 +08:00 |
samuele3hu
|
893e0b0a08
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-25 11:45:29 +08:00 |
minggo
|
e5ac6e204b
|
Merge pull request #7864 from minggo/module-devide
Module devide
|
2014-08-25 11:01:19 +08:00 |
samuele3hu
|
1126e950b2
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases
|
2014-08-25 09:52:48 +08:00 |