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

35221 Commits

Author SHA1 Message Date
minggo 3bb9c75d66 Merge pull request #15994 from cocos2d/revert-10501-fix_ccglviewimpl 
Revert "Added CCGLViewImpl.h"
 2016-06-29 09:45:29 +08:00
minggo ecf97575ad Revert "Added CCGLViewImpl.h" 2016-06-29 09:45:05 +08:00
minggo feb513c7eb Merge pull request #15982 from mogemimi/fix-typo 
Fix typo: destoryMark -> destroyMark
 2016-06-29 09:41:59 +08:00
minggo 076e0b488b Merge pull request #15980 from minggo/merge-v312 
Merge v312
 2016-06-29 09:41:30 +08:00
kuzy000 8598003b55 Added CCGLViewImpl.h (#10501) 
* Added CCGLViewImpl.h for more consistency

* fixed indentation
 2016-06-29 09:36:13 +08:00
Ricardo Quesada 861cf3882d Merge pull request #15989 from CocosRobot/update_cocosfiles_1467162079 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-06-28 18:18:56 -07:00
Ricardo Quesada 7d7936bbc1 fix issue #15958 
again
 2016-06-28 18:07:30 -07:00
mogemimi 2060b333ca Fix typo: destoryMark -> destroyMark 2016-06-29 10:04:31 +09:00
CocosRobot 2fbf3c9940 [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-29 01:01:21 +00:00
Ricardo Quesada c7af8e3e74 Merge pull request #15987 from ricardoquesada/issue14017test 
fix: add test case for issue #14017
 2016-06-28 17:58:51 -07:00
Ricardo Quesada 65e32522e1 Merge pull request #15986 from ricardoquesada/issue14050test 
fix: add testcase for issue #14050 fix
 2016-06-28 17:38:18 -07:00
Ricardo Quesada a6305cc1f7 fix: add test case for issue #14017 
Add test case for issue #14017
 2016-06-28 17:32:13 -07:00
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
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
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