Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,112 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

36112 Commits

Author SHA1 Message Date
Ricardo Quesada ed30993f59 fix: add testcase for issue #14050 fix 2016-06-28 17:08:56 -07:00
Ricardo Quesada 92fe9a33b4 Merge pull request #15984 from ricardoquesada/issue14070 
fix: detect sqlite headers in linux
 2016-06-28 16:17:11 -07:00
Ricardo Quesada b8601493bb fix: detect sqlite headers in linux 
fixes github issue #14070

PR based on https://github.com/cocos2d/cocos2d-x/pull/14098
by @firefly2442
 2016-06-28 15:12:25 -07:00
Slack-Moehrle d17709565d Update Release Notes -> add Tizen, add VR, removed some old test 
add Tizen, add VR, removed some old test, fixed some language.

Please delete this branch when merged.
 2016-06-28 16:55:59 -04:00
pandamicro 6e54080e83 Fix style issue in html page 2016-06-28 21:59:37 +08:00
minggo 0c290540df Merge pull request #9823 from ericmux/frame-independent-ms 
Making CCMotionStreak _maxPoints framerate independent.
 2016-06-28 18:29:14 +08:00
minggo bbd837aefa merge v3.12 back to v3 2016-06-28 17:53:50 +08:00
minggo e8e5cb7211 Merge pull request #15979 from minggo/update-release-note 
[ci skip]Update release note
 2016-06-28 17:22:40 +08:00
minggo 23d16494fa update release note 2016-06-28 17:21:43 +08:00
pandamicro ed71d539c8 Merge pull request #15977 from pandamicro/v3.12 
[ci skip] [Web] Fix TransitionsTest issue on render type detection
 2016-06-28 15:11:25 +08:00
pandamicro 417ddcc9e7 [Web] Fix TransitionsTest issue on render type detection 2016-06-28 15:10:42 +08:00
minggo 9815f2713f Merge pull request #15976 from pandamicro/v3.12 
[ci skip]Fix LoaderTest
 2016-06-28 14:28:41 +08:00
pandamicro 6b2a96a2b9 Fix LoaderTest 2016-06-28 14:08:30 +08:00
minggo 1b6fd12da3 Merge pull request #15975 from pandamicro/v3.12 
Don't warn user about ignoreAnchorPointForPosition deprecation in JSB
 2016-06-28 13:57:30 +08:00
minggo 3327d3661a Merge pull request #15974 from pandamicro/v3.12 
Fix window.close crash in JSB
 2016-06-28 13:54:36 +08:00
pandamicro d46cd96896 Don't warn user about API deprecation 2016-06-28 12:11:21 +08:00
pandamicro e7e365a00f Fix window.close crash in JSB 2016-06-28 11:59:55 +08:00
Ricardo Quesada 7442c0d732 Merge pull request #15973 from ricardoquesada/issue15958 
fix: cocos new does not crash
 2016-06-27 19:10:40 -07:00
minggo c439947faf Merge pull request #15971 from mogemimi/avoid-const-cast 
Avoid const_cast when calling Node::setAdditionalTransform
 2016-06-28 09:40:18 +08:00
Ricardo Quesada 5a8eb243e6 fix: cocos new does not crash 
Github issue #15958
 2016-06-27 18:33:38 -07:00
minggo 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
mogemimi 2a853ba73e Avoid const_cast when calling Node::setAdditionalTransform 2016-06-27 19:33:45 +09:00
minggo c782626285 Update releasenote changelog (#15967) 
* update changelog

* update changelog
 2016-06-27 13:37:38 +08:00
minggo a052dd34d0 Merge pull request #15956 from ricardoquesada/issue15934_312 
fix: FPS appears on iOS
 2016-06-27 10:15:12 +08:00
minggo d7cb7676bc Merge pull request #15966 from mogemimi/improve-refptr 
Improve RefPtr to avoid casting when possible
 2016-06-27 10:07:54 +08:00
minggo f8e77b2d9f Merge pull request #15961 from mogemimi/fix-typo-in-enum 
Fix typo in FileUtils::Status enum
 2016-06-27 09:57:16 +08:00
mogemimi a287e696c9 Improve RefPtr to avoid casting when possible 2016-06-26 21:39:43 +09:00
Alfonso Grillo b6fa894f81 Fix page view indicator opacity for inactive pages 2016-06-25 18:49:13 +02:00
mogemimi bc51528301 Fix typo in FileUtils::Status enum 2016-06-25 12:58:55 +09:00
Ricardo Quesada 35beefce7e Merge pull request #15958 from ricardoquesada/update_cocos_conosle 
updates cocos console
 2016-06-24 19:01:51 -07:00
Ricardo Quesada 71572d9015 updates cocos console 
fix github issue #15890 and partially fixes github issue #15889
 2016-06-24 18:31:32 -07:00
Ricardo Quesada 04d3550693 Merge pull request #15957 from ricardoquesada/issue15934 
fix: FPS appears on iOS
 2016-06-24 14:46:08 -07:00
Ricardo Quesada 04a01b65f4 fix: FPS appears on iOS 
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits

Github issue #15934
 2016-06-24 11:44:55 -07:00
Ricardo Quesada 4f973044ac fix: FPS appears on iOS 
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits

github issue #15934
 2016-06-24 11:40:13 -07:00
minggo 0977fc87f2 Merge pull request #15952 from mogemimi/fix-implicit-conversion 
Avoid implicit conversion from size_t to int
 2016-06-24 17:22:56 +08:00
minggo 26fb64395a Merge pull request #15954 from pandamicro/v3.12 
Fix easing action crash because the js object is not rooted
 2016-06-24 17:21:41 +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
pandamicro 8cb2e93644 Fix easing action crash because the js object is not rooted 2016-06-24 14:38:59 +08:00
mogemimi 0dce4961ee Avoid implicit conversion from size_t to int 2016-06-24 15:15:45 +09:00
minggo c4efd066f3 Merge pull request #15951 from pandamicro/v3.12 
Remove cocos studio tests in JS-tests
 2016-06-24 14:00:55 +08:00
pandamicro d643b306ef Remove cocos studio tests in JS-tests 2016-06-24 13:50:24 +08:00
pandamicro b8b362df92 Merge branch 'v3.12' of github.com:cocos2d/cocos2d-x into v3.12 2016-06-24 10:51:46 +08:00
minggo 2931b310cf Merge pull request #15942 from zilongshanren/improveEditBox 
Improve edit box
 2016-06-24 10:27:22 +08:00
minggo b29fbf0fc8 Merge pull request #15885 from Sumxx/v3 
fix restart game crash in FT_Get_Char_Index
 2016-06-24 10:08:32 +08:00
pandamicro 21a78dce09 Update web engine ref 2016-06-24 10:03:56 +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
minggo 86af4cdab8 Merge pull request #15897 from halx99/patch-4 
luabindings: Add script with utf-8 bom support.
 2016-06-24 09:58:41 +08:00
minggo dbc083b924 Merge pull request #15939 from halx99/patch-2 
Optimize, remove unnecessory truncate.
 2016-06-24 09:54:57 +08:00
minggo 1042b18999 Merge pull request #15936 from mogemimi/use-nullptr-instead 
Use nullptr instead of 0 or NULL whenever possible
 2016-06-24 09:54:15 +08:00
minggo 756caf215f Merge pull request #15941 from natural-law/v3 
Change the implementation of checking NDK path on windows.
 2016-06-24 09:49:55 +08:00