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

21 Commits

Author SHA1 Message Date
minggo 8b289d2385 fix bug that virtual button is not hidden after keyboard dismissed 
* fix compiling error with --android-studio

* hide virtual button after keyboard dismiss

* remove unneeded log
 2016-07-15 18:25:48 +08:00
minggo 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +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 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 8bd4ddf081 fix: compile on linux, android and windows 2016-05-26 16:02:24 -03: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
Naruto TAKAHASHI cf38b1fbfd fix build failed of gradle 2016-03-11 19:23:26 +09:00
Mikhail Shulepov fb7044c535 Add SpriteFrameCacheTest to Android, Windows, Linux project files 2016-02-17 20:52:30 +03:00
fnz 80e8b58b53 easy jni 2015-11-07 23:57:05 +03:00
zhangbin e3161eb127 Remove performance tests from cpp-tests project. 2015-09-10 16:01:56 +08:00
fusijie bdc22516c8 fix as compile error. 2015-08-19 15:05:18 +08:00
fusijie d2181e137e fix android studio compile error. 2015-07-30 11:55:33 +08:00
andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 
# Conflicts:
#	tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
 2015-07-14 11:24:38 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Vincent Yang e65b01bdc0 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-13 17:06:01 +08:00
XiaoFeng a9dfd8012c Add new bug test to Android, Win 10, Win Universal, Linux project file 2015-07-07 11:02:00 +08:00
Neo Kim 00e360f438 Add the missing file into CMake and Windows project configurations. 2015-07-01 15:36:53 +09:00
samuele3hu 7feaa18d82 Fix the compile error for cpp-tests based on android studio 2015-06-25 16:08:48 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00