Wilson E. Alvarez
5dd81e758a
Add controller support for Linux and Win32 ( #17990 )
...
* Add controller support for Linux and Win32
* Fix iOS and Mac linker issue
* Fixed documentation. Removed unnecessary whitespace.
2017-07-10 10:30:04 +08:00
minggo
4b61ea1f1e
use travis to build iOS and mac ( #17999 )
2017-06-29 16:41:06 +08:00
minggo
4ce443bac2
use prebuilt version of bullet ( #17950 )
...
* use prebuilt bullet
* prebuilt bullet work ok on linux
* update search path
* update search path
* fix compiling issue for lua/jsb projects
* prebuilt bullet work on windows
* update 3rd party lib version
* add bullet search path
* fix script bindings issue
* fix scripting binding
2017-06-21 13:39:38 +08:00
pyrosphere
5ce38d14fe
On XCode projects, removed specific SDK versions from framework paths. ( #17929 )
2017-06-15 09:53:32 +08:00
minggo
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
mogemimi
48cbc890c6
Typo fix: Rename `MutiTouchTest` to `MultiTouchTest` ( #17399 )
2017-02-23 17:05:08 +08:00
James Chen
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
James Chen
4237639dd6
Some fixes for websocket ( #17342 )
...
* libwebsockets & curl are dynamic libraries now, modify project configuration for win32.
Updates WebSocketTest.cpp to test wss connection.
* Corrects some logic in WebSocket.cpp. Adds wss test case. WebSocketTest suggests developers to use `WebSocket::closeAsync` method which will not block current thread.
* mutex unlock fix in WebSocket.cpp. Reverts TEST URL.
* Allows self-assign cert.
* Each ws connection will create a virutal host now. Supports self-signed cert and update test case to suggest developer use ‘closeAsync’.
* Updates deps to 123.
2017-02-13 15:15:23 +08:00
Ricardo Quesada
e63a2d0dc2
Scale9Sprite refactor ( #16891 )
...
* Squashed commit of the following:
commit 026eee59c9ece7fc59d71fead41104f375f72eb5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 22 21:45:12 2016 -0800
yay!
everything works!
commit a645c99d44f0d7674e6238afae7628d8d2a030b1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 22 14:55:31 2016 -0800
more fixes in Scale9Sprite
commit 3a688f4ea70c0abe311232c65ed14a7e9acc7611
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 21 23:06:45 2016 -0800
rotated sprites
commit 45e2085df3aa4b52236c817f7db7c1f6602c1e95
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 21 17:10:44 2016 -0800
android patch 9: fixes
is not 100% backward compatible since the previous version
had some artifacts. fixed the artifacts. now it renders ok
commit 4655d894387fa40a7e63b074a36bfed20e41d5f9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 21 16:31:29 2016 -0800
sprite: correct size for "fake scale9"
commit cb98aba27cc1c82a986268d5b74afb55b6cca2f3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Nov 18 21:55:51 2016 -0800
sprite: adds setStrechEnabled for backward compatibility
and other fixes
commit c0fe67aac54cd62e3846810d56f87133f3a7343b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Nov 18 18:49:42 2016 -0800
implemts missing functions in scale9sprite
commit e471ef318725ccabc9eca2c062e285e9ca4f9a81
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Nov 18 18:42:30 2016 -0800
"batched" works
commit 33124bfb14d1f275d4b0ffca8989975625a8a76d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 18:59:38 2016 -0800
more fixes
commit 149f8206269843af63a1739885c00ed8d94c239c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 18:37:12 2016 -0800
scale 9 rotated not fixed yet.
but making progress
commit 27f98275d94ce00c8d5ff0b6f74b5c22723cc3c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 15:32:57 2016 -0800
sprite: streching works ok with normal sprites
commit 2519498cac8b77a32dee5bdf1805be56fbda5ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 12:12:28 2016 -0800
somes fixes... still not working
commit 43580d0b4aa976b0200717611a286bf1035c472d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 15 23:15:22 2016 -0800
more bug fixes related to untrimmed setCenterRect...
...in SCale9Sprite
commit 407247616e506afaa0415c58ad7fce38efed0cd9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 15 22:13:38 2016 -0800
spritecale9: untrimmed vs. trimmed capInsets
WIP. there still a few bugs
commit 3d845b2af3500be287fabb04bb6ba0ec04dbb401
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 14 23:11:17 2016 -0800
started progressbar
commit 0a44b00daf723869b7105689890f29cd53a62608
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 14 17:43:23 2016 -0800
adds EditBox test
commit 330304bd9b2e762de95c2f27f1ae3ceee83b2fbf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 16:57:08 2016 -0800
adds elastic to scroll view
commit a06a35f8691ff56a143953c44acd947b519150b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 15:58:29 2016 -0800
yay! scrollview works
commit 37748a885c62eca8c00d2c9c11ee103f1d95e71c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 15:33:58 2016 -0800
yet more scrollview fixes
commit a6e563b497adef7b141ac7c92c844d479b244c59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 14:48:28 2016 -0800
initial scroll view
commit 4243edd7548e5533ca03c26d5042f8dc5517445a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 8 17:50:15 2016 -0800
sanity check in frames.
missing files
commit 159d88603ad22f3c01761b60bacec98d52b9041d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 19:21:00 2016 -0800
three buttons working
commit 6764cfc7937a1a81d6993d5e32a21f17457b8e0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 18:50:22 2016 -0800
missing files
commit 11c1fa3812e706a7d34137fe2626f05ab73ee3e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 18:49:59 2016 -0800
button works!
commit 26b6de4c28fc973e332dd51fcd763a6249c0b4c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 18:19:47 2016 -0800
Scale9: more fixes.
complies with odd Rect::ZERO behavior
commit ce561268096afe322f25034eeab3508a60027afd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 11:50:42 2016 -0800
label: setTitleLabel
commit 51b5536cd2af36896002621f75c7310960c3f5e7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 17:41:08 2016 -0700
UIButton kind of working
commit 7562a49a761ef70c383a99d2addefc63d77e279f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 11:11:42 2016 -0700
missing resoruces
commit a9890dee5da0104bff6872cc04e8786a6c0a9018
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 10:54:55 2016 -0700
setCenterRect to .cpp file
commit c9c4bb55ed3fc55709eca46c43d1bfe5301c317f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 00:19:51 2016 -0700
removed unused paramter
commit e47732934cca79c08e6fe96e46ebdf075508e568
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 18:19:31 2016 -0700
flipping works!
commit c9769bacd321aeddf84e1772dd270f12194d2f04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 17:57:53 2016 -0700
spirte flip fixes... not finished yet
commit 1cbdc8e12cc6d0d2728c06dfabaada001784a178
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 09:53:16 2016 -0700
centerRect changes
commit aeb1b14c00331dabba640f52d79ab0e255fa3407
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 09:10:41 2016 -0700
changes from v3
commit e7a61c4a20d786c2bc1d6f57e33bf3ac95cb6f21
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 17:01:15 2016 -0700
sprite: rotated slice 9 works as expected
commit 91049389426051deb49a9d951364bf60abaf4532
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 15:39:54 2016 -0700
more bug fixes in scale9sprite support
commit 9feb12449078441c439df16dc7bcfb4506c7a226
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 13:22:52 2016 -0700
Android's Patch 9 works as expected
commit 1cf46afe3e7f7f5f714d30779caefc25a9bb1b3b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 10:18:47 2016 -0700
Sprite: uses capInsets instead of centerRect
just to share the same API as Scale9Sprite
commit e944fa0248a7eb58012aacb229de1a9b814e0aef
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 25 18:59:42 2016 -0700
scale9sprite support fixes
commit b08765740d480b6ae1491800161b40d88f458767
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 25 17:38:47 2016 -0700
more scale9sprite fixes
commit 388a34d93de5e6007a2cecea959c929f26427cab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 25 17:20:01 2016 -0700
UI::Scale9Sprite refactoring
subclass of Sprite... much cleaner!
commit c84ec8ee654f74d4b38be2d0a3d7ffe6adbc6faf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 20:58:36 2016 -0700
supports tiled sprites
commit d2b18eb47a647b29319488bd53edac9f304acb84
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 19:21:57 2016 -0700
testing tiled sprite
commit b4832ab2facc01cbb624db587ede01fe7acf23e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 16:53:19 2016 -0700
using correct top-left coordinates for setCenterRect
commit 29d8de86a71cc597b2338f59f7951a28ee0c93b2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 16:46:13 2016 -0700
fixes from scale_sprite9 branch
commit ccbe1063bea7db75397ecaf9046aac3dd977a621
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 19:01:50 2016 -0700
updated example
commit 24f7f85d4eba80f8e543810dcbc1a02447900bdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 18:47:28 2016 -0700
more fixes in nine slice
commit df3358fae68f2d81baf3a8cbe033a4c400ea50da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 18:22:14 2016 -0700
anchor point fixes
commit 4ac7409bc72425abb0dc747b956ec346fbd1b2fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 17:01:48 2016 -0700
support for slice-9 from creator
commit a3221375d3a9defc2e03df0b1c2da1b36dfdd491
Merge: 73e5389 d7490d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 14:13:38 2016 -0700
Merge branch 'sprite_scale9' into creator_cpp_support
commit d7490d94896ad0ce8705dc0695252cee34329b5e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 13 14:34:52 2016 -0700
Adds slice9 support for Sprite.
how to use it:
// points coords
sprite->setCenterRect(Rect(x,y,w,h));
// normalized coords
sprite->setCenterRectNormalized(Rect(x,y,w,h));
starts scale9sprite in sprite
more slice 9 changes
sprite 9 slice works?
kind of works
correct anchor point
slice 9 works, at least with non-rotated atlases
streched works ok
better Y invert code.
cleaner, compatible with the previous code
yay, scaling workings...
need a better api now
sets scale correctly
yay! works as expected!
more fixes and tests
better test for box
setContentSize() changes size in non-9-slice mode sprites as well
setCenterRect() -> setCenterRectNormalized()
yet another test
adds setPositionNormalized()
adds setCenterRect() tests
remove devel team from xcode
tests: add one more tests
fun test!
improved test
yet another test for slice 9
commit 73e5389ef719880096067d0f7d0bffd6e1f3cfd1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Oct 9 18:54:22 2016 -0700
kind of ProgressBar support
commit 4db5e9e7369e93ceba1d9512ab88c26b843c43d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 7 16:23:54 2016 -0700
new generatred ui files
commit 75aa06f3d39df8c6aa898d5e6810b3cd8015c07b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 6 10:44:59 2016 -0700
bette canvas support
commit 89beacac478fc7f58ef930963b6393f3da4a743c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 5 21:47:11 2016 -0700
sprites tests
commit 5fe930ad50c2c1b6d868982709c7b659176f9889
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 5 18:35:44 2016 -0700
more label tests
commit d3f615a097d080d78f2ebd95f3e2388da45f92db
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 5 18:08:24 2016 -0700
label tests
commit 2a4018922ce8d36117f7092fc324e37cf75fdeab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 4 21:52:56 2016 -0700
label fixes
commit 41fafbd023de63e376d014311605f2b156add307
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 4 19:14:58 2016 -0700
updated test
commit 06919fc28fffbc5a20cd14bdcc2ad2ff997e0da1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 4 18:50:45 2016 -0700
creator tests: works
commit 6e362e7cc7f68dc216b569a7f7f90aaa110c0e4a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 27 23:15:56 2016 -0700
autogen: new data
commit e78078b2ad84b4e364827a66f1c459de7384a91d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 26 18:18:57 2016 -0700
fix: initial test for CPP support for Creator
* adds more documentation
* adds more documentation
2016-11-24 09:59:00 +08:00
Adrien de Sentenac
460c68125f
Use resolved file name (through dictionary lookup) in font atlas creation ( #16797 )
...
* Use resolved file name (through dictionary lookup) in font atlas creation, to prevent creating multiple atlases for the same file.
Add font tests with and without font name replacement (through dictionary lookup).
* Fix cpp-tests xcode and cmake project
* Additional fix for cmake project
2016-11-18 09:23:44 +08:00
pyrosphere
1667a5c444
Toggle between windowed/fullscreen on desktop ( #16762 )
...
* GLViewImpl methods for desktop window management - toggle between fullscreen/windowed
* Window management tests (mac)
* Added window management tests to Win32 and Linux
* Added const keyword. Removed platform macros.
2016-10-31 14:02:02 +08:00
Ricardo Quesada
323ea7c0d4
Sprite scale9 ( #16702 )
...
* Adds slice9 support for Sprite.
how to use it:
// points coords
sprite->setCenterRect(Rect(x,y,w,h));
// normalized coords
sprite->setCenterRectNormalized(Rect(x,y,w,h));
starts scale9sprite in sprite
more slice 9 changes
sprite 9 slice works?
kind of works
correct anchor point
slice 9 works, at least with non-rotated atlases
streched works ok
better Y invert code.
cleaner, compatible with the previous code
yay, scaling workings...
need a better api now
sets scale correctly
yay! works as expected!
more fixes and tests
better test for box
setContentSize() changes size in non-9-slice mode sprites as well
setCenterRect() -> setCenterRectNormalized()
yet another test
adds setPositionNormalized()
adds setCenterRect() tests
remove devel team from xcode
tests: add one more tests
fun test!
improved test
yet another test for slice 9
* fixes anchorPoint issues
* adds documentation
* fix: using top-left coordinate for setRect
* sprite: fixes related to scale9 and tiled
* Sprite: slice 9 fixes
works Ok with rotated frames
uses `setCapInsets` instead of `setCenterRect` to be more familiar
with `UIScale9Sprite`
* fixes js and lua bindings for Autopolygon
2016-10-26 18:45:40 -07:00
Ricardo Quesada
9dea92b2e0
feat: add support for Game Controllers on Mac ( #16461 )
...
it shares 100% the same code with iOS.
it only adds a few #ifdefs.
github issue #16460
2016-08-29 16:58:44 -07:00
minggo
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
Ricardo Quesada
0872cccd67
fix: collection of vr fixes ( #15948 )
...
* fix: collection of vr fixes
* Node::additionalTransform() and Node::setNodeToParentTransform() can be used at the same time
* Node allocs _additionalTransform in runtime taking 60 bytes lees for 99% of the nodes
* Node calculates the transform faster when an additionalTransform is being used
* VR works when the camera is being moved manually with setNodeToParentTransform
* VR has its own tests
* VR can be disabled and works as expected
* doc: documentation for the new fix
* fix: restore submodule web
* fix: compile and link on iOS
* fix conflicts
2016-06-24 16:55:28 +08:00
Ricardo Quesada
69d2ac1786
fix: collection of vr fixes ( #15947 )
...
* fix: collection of vr fixes
Node: additionalTransform() has its own dirty variable
VR: disabling VR works as expected
VR: works with camera3d test
VR: iOS Tracking works even if it doesn't have any input
fix: setNodeToParentTransform() and setAdditionalTransfrom() work...
...at the same time.
Also, this PR makes the size of Node smaller. `_additionalTransform` is
no longer an inline object.
Instead, it is allocated on demand making 99% of the Nodes smaller by 60
bytes.
fix: compile in windows
* doc: documentation for this fix
2016-06-24 10:03:38 +08:00
James Chen
e1d39343d3
Adds missing ccs-res folder to XCode project.
2016-06-22 11:31:07 +08:00
Ricardo Quesada
c387f953fa
fix: TextureCache ASSERTS if image is invalid
...
Github issue #15776
2016-06-17 16:07:33 -07:00
子龙山人
51f4deee01
Add system label overflow ( #15827 )
...
* Add system font overflow
1. currently only iOS, Mac and Android platform are supported
add mac label overflow shrink
modify system font overflow test
fix warning and possible memory leaks
add ios system label overflow support
add iOS system font overflow support
fix iOS system font overflow
fix Mac System font overflow
add android system font clamp
add Android system font shrink
cleanup iOS shrink related code
fix Android system font clamp
add core text to project template
fix iOS tests project
fix mac and iOS shrink
improve iOS and Mac clamp feature
fix header file include path
* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
minggo
98bee7e12a
remove unneeded test case and fix resource missing ( #15804 )
...
* remove unneeded test case and fix resource missing
* remove unneeded test case
2016-06-08 13:36:36 +08:00
Ricardo Quesada
b830b7de4c
fix: add code/resources to reproduce issue_15594
...
github issue #15594
2016-05-25 09:00:32 -03:00
minggo
5019dc7878
don't strip png text
2016-05-24 10:06:28 +08:00
minggo
8068c51d94
remove studio related test cases and resources ( #15574 )
...
* remove studio related test cases and resources
* remove unneeded files
2016-05-06 13:38:19 +08:00
minggo
3c676d9712
Merge pull request #15037 from Shulepov/spriteframecache_pixel_format
...
SpriteFrameCache: take pixelFormat into account if specified
2016-03-23 09:48:35 +08:00
Xpol Wan
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
geron-cn
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
2016-03-03 14:17:48 +08:00
Ricardo Quesada
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 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 09:37:24 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Feb 27 01:11:13 2016 -0800
correct paths for win8.1
commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 22:46:58 2016 -0800
projects works on win32
commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:57:10 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:26:55 2016 -0800
trying to make it compile on win32
commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 10:28:12 2016 -0800
quick hack to make it compile...
...autogenerated files will fix it.
commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 09:20:59 2016 -0800
Squashed commit of the following:
commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 20:10:13 2016 -0800
compiles.. sort of
commit a7990e2888d5ef1e43b811148b23c0b899105ab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:55:24 2016 -0800
more chipmunk fixes
commit 1174f6ec8201324161d7946af0f493b136a56690
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:36:15 2016 -0800
more chipmunk fixes
commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
Merge: f942c5a 0594d3c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:29:27 2016 -0800
Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed
commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:28:51 2016 -0800
correct path for chipmunk
commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 18:44:05 2016 -0800
compiles on ios
commit 379503399c384ad77d25d68a2f83b71a829b1c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:51:36 2016 -0800
chipmunk include fixes
commit 95839fb7b406a32255853294b016d8c15aec1ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:09:04 2016 -0800
fixes for cmake + mac
commit 39449ea3b7efccae2946785c1c11433d964ee480
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:51:25 2016 -0800
correct includes
commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:35:40 2016 -0800
fixes chipmunk with cmake
commit 337f21f9466703722847635301d841ace9b757cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:42:01 2016 -0800
updates android and linux projects
commit 7111a9993b97f78cf73206804b25665c21a59ca8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:18:26 2016 -0800
cosmetic changes
commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:53:41 2016 -0800
chipmunk autogenerated files
commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:47:41 2016 -0800
compatibility both in JS (to reduce space)
and in C for (C++ users)
commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:10:02 2016 -0800
mooooore fixes
commit 9ab23014093677e8eda69b105f50410b8c792aa3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:30:58 2016 -0800
doesn't crash with collision handler
commit 69275a16817a038244bbaaff9e82a011b6729cb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:16:29 2016 -0800
adds missing space functions
commit a6b97bbc76cb9ab293356bb7451cfa858353f589
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 22:22:27 2016 -0800
queries... better
commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 19:48:41 2016 -0800
adds more missing functions
fixes other chipmunk JS issues
commit 3797a033896d059da58a05ce0de832ed9c150eff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 18:30:21 2016 -0800
yep... poly works ok
commit d1bb57776891605b9d3e4fb90736c6869d96b944
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:29 2016 -0800
neede compat files
commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:04 2016 -0800
query working!
commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:57:03 2016 -0800
almost there
commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:18:46 2016 -0800
fixes return values
commit 7218778da846e1e36a510c0a19a5ee76f91db032
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 20:36:14 2016 -0800
cpMomentForSegment is manual since parameter 4 is optional
in chipmunk 6, but not in 7
commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 17:29:28 2016 -0800
yeah... process the arguments correctly
works both for functions and auto_classes
commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 16:49:00 2016 -0800
compiles and links
fixes some issues with the queries.
returns shapes instad of the queryInfo
commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 15:03:18 2016 -0800
adds removeCollisionHandler and other fixes
commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 18 20:59:24 2016 -0800
compiles... doesn't work yet
commit bd64de81713fb2d7652a538d667d73f05f5d9320
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 17 18:17:39 2016 -0800
WIP: chipmunk bindings
2016-02-29 13:53:00 -08:00
Mikhail Shulepov
c26fe122ad
SpriteFrameCacheTest: test for PixelFormat
2016-02-12 19:06:16 +03:00
Ricardo Quesada
4a318c0048
Renderer improvments: TriangleCommand and QuadCommand merged
...
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
- QuadCommand is just a subclass of TriangleCommand (simpler)
- but statically it allocates indices internally (like any TriangleCommand) (more
memory, but not that much)
- adds more tests for SpritePolygon
- adds test for batching Tri + Quad command
- and fixes some other bugs
Squashed commit of the following:
commit cce893a9114da5dda91a895e4e661894f365e2c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 8 06:56:57 2016 -0800
QuadCommand: indices are static
thanks @Darinex
commit e5fd1c14e93d2f07b8266bfec03cf7206d348f59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:18:42 2016 -0800
little improvements in xcode proj management
commit 6cd29764e01ad300f4e89e62aa6b399f73e94f01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:05:52 2016 -0800
Renderer improvments: TriangleCommand and QuadCommand merged
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
and fixes some other bugs
Squashed commit of the following:
commit af7a209435c5f2430c31ab3ebcc7f45051eacb1a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:55:27 2016 -0800
adds test for batching quads and tris
commit 25816e3eaeffd4b0cfe5fa15e97ff84e9013b8be
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:40:15 2016 -0800
cleanup renderer
commit 7f9785056681756c865d603516c7e14c46040e82
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:34:48 2016 -0800
clean up docs
commit 92a8b679dd404e4ca2839d85e2bd925195b12996
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:18:52 2016 -0800
QuadCommand converted to Triangles command
commit 7e21ec12d3781f6964b4d639cfa4bdc79eb8ae80
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 16:17:29 2016 -0800
adds missing files... new test as well
commit d1bd4391785515bdc2e1bebbeb3f321f983b51f2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 14:35:41 2016 -0800
more tests for poly sprites
commit 5775a25b1046671bd0f5af4c5ab52b308b34bb39
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 00:30:13 2016 -0800
malloc instead of std::vector
commit 14a5d45cc978c55a182c03f181ca2bc603776561
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 21:40:46 2016 -0800
little optimization
commit 5667cb2b62416f8a439a54c3973d5841fbe1b68b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 19:13:13 2016 -0800
quad works as expected
commit 462aef05baa6586591882faa366839bead4be068
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 15:22:59 2016 -0800
works
commit c789e6c42811278563c7682b5620296ae8d84aeb
Merge: d6c3729 de62924
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 14:08:49 2016 -0800
Merge branch 'v3' into uniform_matrix_auto
commit d6c37297954af752ebf42ec5f71e5e2fe28c9cc2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 13:54:07 2016 -0800
works ok...
commit 45c288631989ea735cc31ec5aa683d9d41aacab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 12:58:34 2016 -0800
quad works!
commit 7137cff51df09adee7129738cea2b69da090756e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 3 16:19:34 2016 -0800
more optimizations... WIP... doesn't work yet
commit a8324c1a9acb6b82102e05eee6e5e5f341306c7b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 2 21:59:42 2016 -0800
compiles in release mode
more tests... better threshold
commit 884ffc756e7520fcbb9252260181538ec81b8368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 2 17:21:32 2016 -0800
initial uniform_auto_matrix commit
Changes the CC_matrix uniform in runtime depending on whether the command can be batched or not.
Lot of things missing, though... like performance tests.
2016-02-08 11:25:37 -08:00
Ricardo Quesada
b599f2f8d1
Merge branch 'v3_js_fixes_squashed' of github.com:ricardoquesada/cocos2d-x into v3_js_fixes_squashed
2015-12-29 18:30:25 -08:00
Ricardo Quesada
2ee5dafbbc
fixes xcodeproj
2015-12-29 18:28:34 -08:00
Ricardo Quesada
7cd80cb669
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 15:29:01 2015 -0800
Merge branch 'v3' into v3_js_memory_test_and_fixes
commit 79e926a970e3153ee826b299c3417fb6ac599153
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 21 21:27:19 2015 -0800
fixes crashes
commit 76f3910748e15c4ea179eab846f24f3e65d52d2d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 21 11:57:56 2015 -0800
Adds standalone test for JS GC memory
and fixes leaks on extended/subclassed objects
2015-12-29 17:36:02 -08:00
Ricardo Quesada
8e02749993
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 15:29:01 2015 -0800
Merge branch 'v3' into v3_js_memory_test_and_fixes
commit 79e926a970e3153ee826b299c3417fb6ac599153
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 21 21:27:19 2015 -0800
fixes crashes
commit 76f3910748e15c4ea179eab846f24f3e65d52d2d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 21 11:57:56 2015 -0800
Adds standalone test for JS GC memory
and fixes leaks on extended/subclassed objects
2015-12-29 17:33:08 -08:00
Ricardo Quesada
77aa3871b6
fixes compilation issues on tvOS
2015-12-29 12:30:00 -08:00
Ricardo Quesada
666a6c6f88
adds missing scheme files
2015-12-28 16:42:44 -08:00
Ricardo Quesada
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
zhangbin
e3161eb127
Remove performance tests from cpp-tests project.
2015-09-10 16:01:56 +08:00
zhangbin
f3ade30b0b
Add proj.android & proj.android-studio support.
2015-09-09 16:02:33 +08:00
zhangbin
523d4420bf
Add Container tests.
2015-09-08 16:33:03 +08:00
zhangbin
5bb3f1b9c4
Add Math tests.
2015-09-08 15:49:04 +08:00
zhangbin
44b916ad74
Add Callback tests.
2015-09-08 15:29:56 +08:00
zhangbin
8bceb9c0ba
Add Scenario tests.
2015-09-08 14:06:23 +08:00
zhangbin
669fc10d37
Clean the data when the auto tests are finished.
2015-09-07 16:40:47 +08:00
zhangbin
0571383889
Add EventDispatcher tests.
2015-09-07 16:20:20 +08:00
zhangbin
646190af0e
Add Label tests.
2015-09-07 13:42:24 +08:00
zhangbin
5ce4ddfb1d
Add Texture tests.
2015-09-06 17:39:00 +08:00
zhangbin
bd47385bbd
Add Sprite tests.
2015-09-06 16:35:13 +08:00
zhangbin
cc2dd7b225
Add Particle3D tests.
2015-09-02 14:31:35 +08:00
zhangbin
c664756dbe
Add particle tests.
2015-09-02 11:21:17 +08:00
zhangbin
013ed60c15
Add node children tests.
2015-08-31 17:40:26 +08:00