NissimHadar
|
855084b6d5
|
Updated jsdoc.
|
2018-05-29 11:29:59 -07:00 |
|
NissimHadar
|
c49bcbe4e9
|
Removed "Don't show toolbar in test mode.." as this functionality is available through JS commands.
|
2018-05-29 11:20:29 -07:00 |
|
NissimHadar
|
0af1599b53
|
Added jsdoc to TestScriptingInterface.
|
2018-05-29 09:45:03 -07:00 |
|
samcake
|
82503a9e64
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-29 08:59:37 -07:00 |
|
Sam Gateau
|
2f94c43968
|
Removing the getLayer from the meshPArtPayload and check that it s working
|
2018-05-28 23:20:04 -07:00 |
|
NissimHadar
|
658c0e329f
|
Corrected comment.
|
2018-05-28 19:57:54 -07:00 |
|
Cristian Luis Duarte
|
c0c246c934
|
Merge remote-tracking branch 'hifi/master' into android_crashes_domains
|
2018-05-28 17:14:58 -03:00 |
|
NissimHadar
|
5fd8cd71c6
|
Reverted to main repo, for the PR.
|
2018-05-28 12:05:40 -07:00 |
|
NissimHadar
|
817be6d5b6
|
Removed debug code.
|
2018-05-28 12:03:22 -07:00 |
|
Wayne Chen
|
35755369cd
|
Merge branch 'master' of https://github.com/wayne-chen/hifi
|
2018-05-28 10:26:38 -07:00 |
|
David Rowe
|
a9c4eab099
|
Fix up JSDoc for Window.takeSnapshot() and related
|
2018-05-28 12:46:51 +12:00 |
|
David Rowe
|
e20e014a5c
|
Add JSDoc stubs for new Render API functions
|
2018-05-28 12:02:08 +12:00 |
|
David Rowe
|
b31a4d0b64
|
Add JSDoc stubs for new HifiAbout API
|
2018-05-28 10:40:42 +12:00 |
|
Sam Gateau
|
678effdb48
|
Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey
|
2018-05-26 23:28:59 -07:00 |
|
NissimHadar
|
ddea1c64bc
|
Updated AutoTester.
|
2018-05-25 17:37:31 -07:00 |
|
NissimHadar
|
20d2128a10
|
Corrected timing bug.
|
2018-05-25 17:36:55 -07:00 |
|
howard-stearns
|
17be460adf
|
checkpoint
|
2018-05-25 16:37:06 -07:00 |
|
samcake
|
221b513b19
|
Oh boy
|
2018-05-25 16:33:34 -07:00 |
|
Dante Ruiz
|
68b18def22
|
fix copy delete cut paste commands and menus
|
2018-05-25 15:49:19 -07:00 |
|
Dante Ruiz
|
9a25a74834
|
fix copy delete cut paste commands and menus
|
2018-05-25 15:34:17 -07:00 |
|
howard-stearns
|
d30d84f1bd
|
checkpoint that has two ways to do filtering
|
2018-05-25 15:30:27 -07:00 |
|
NissimHadar
|
dcab7e4e81
|
Corrected misplaced semicolons.
|
2018-05-25 15:03:45 -07:00 |
|
NissimHadar
|
00300f4b2f
|
Merge branch 'master' of github.com:highfidelity/hifi into DailyTests
|
2018-05-25 15:02:43 -07:00 |
|
NissimHadar
|
87220e501a
|
Don't show tablet in test mode, so that it won't appear in snapshots. Its location is not fixed - this will cause image comparisons to fail)
|
2018-05-25 15:02:00 -07:00 |
|
John Conklin II
|
38916a3023
|
Merge pull request #12946 from AndrewMeadows/minor-physics-cleanup
minor cleanup in physics simulation
|
2018-05-25 14:56:04 -07:00 |
|
Gabriel Calero
|
8c6166d6e5
|
Change gradle configuration to sign release apk. Remove Daydream intent from AndroidManifest
|
2018-05-25 17:42:41 -03:00 |
|
Wayne Chen
|
67d24408cf
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-05-25 13:26:06 -07:00 |
|
Clement
|
caa01aa25e
|
Don't mark Asset-less DS's backups corrupted
If the DS doesn't choose to run an Asset Server, add an empty
mappings file to the archive so they do not show as corrupted
|
2018-05-25 12:31:51 -07:00 |
|
John Conklin II
|
155d6f87c4
|
Merge pull request #13238 from wayne-chen/toggleAdvancedModeHMD-case-15324
Forward and backward on HMD controllers don't work after restarting interface
|
2018-05-25 12:25:03 -07:00 |
|
John Conklin II
|
eeed3ae82d
|
Merge pull request #13211 from druiz17/login-fix
Fixing Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password"
|
2018-05-25 11:33:29 -07:00 |
|
John Conklin II
|
5dadfde637
|
Merge pull request #13239 from wayne-chen/RC68
Adding fix for enabling saved front/back advanced controls. (RC68)
|
2018-05-25 10:58:59 -07:00 |
|
John Conklin II
|
7724a73487
|
Merge pull request #13236 from druiz17/fix-crash-for-68
Remove offscreenUi desktop qml object from being a contextProperty for Web3DOverlay (RC68)
|
2018-05-25 10:49:21 -07:00 |
|
John Conklin II
|
1d9f33a637
|
Merge pull request #13220 from NissimHadar/fixCameraMode
Correct `Camera.mode` command.
|
2018-05-25 10:47:31 -07:00 |
|
John Conklin II
|
82bb664cb3
|
Merge pull request #13235 from druiz17/fix-qml-crash-v2
Remove offscreenUi desktop qml object from being a contextProperty for Web3DOverlay
|
2018-05-25 10:46:11 -07:00 |
|
samcake
|
051776ab1d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-25 10:30:45 -07:00 |
|
Wayne Chen
|
720b0a8963
|
Adding fix for enabling saved front/back advanced controls.
|
2018-05-25 09:51:16 -07:00 |
|
Wayne Chen
|
b2f3131262
|
readding the function
|
2018-05-25 09:46:52 -07:00 |
|
Wayne Chen
|
ef756f7041
|
reverting PR commit - shouldn't have commited on branch
|
2018-05-25 09:31:39 -07:00 |
|
Wayne Chen
|
8453c7baba
|
reverting commit 802cedf1bc regarding toggleSpaceMode
|
2018-05-25 09:25:05 -07:00 |
|
Wayne Chen
|
89f7eb0b30
|
Adding fix for enabling saved front/back advanced controls.
|
2018-05-25 09:21:01 -07:00 |
|
NissimHadar
|
590b4f91c5
|
Added comments.
|
2018-05-25 09:16:51 -07:00 |
|
Andrew Meadows
|
1612d90cd3
|
minor DynamicsWorld optimizations and track global steps count therein
|
2018-05-25 08:31:09 -07:00 |
|
Andrew Meadows
|
ed62a2fc37
|
_lastKinematicStep now mutable, avoids explicit const_cast
|
2018-05-25 08:31:09 -07:00 |
|
NissimHadar
|
54b64c59d7
|
Merge branch 'master' of github.com:highfidelity/hifi into DailyTests
|
2018-05-25 08:29:09 -07:00 |
|
John Conklin II
|
286d09939d
|
Merge pull request #13205 from luiscuenca/GLTFfix1
Minor fix allows import glTF from Substance Painter
|
2018-05-25 08:28:29 -07:00 |
|
NissimHadar
|
24738ebbe2
|
Added missing semi-colons.
|
2018-05-25 08:28:21 -07:00 |
|
John Conklin II
|
0d8fb90fa8
|
Merge pull request #13222 from SamGondelman/mirror
Fix image and text overlay drifting
|
2018-05-25 08:26:33 -07:00 |
|
Wayne Chen
|
534341ef62
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-05-24 20:45:06 -07:00 |
|
Sam Gateau
|
aa49595a23
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-24 18:19:55 -07:00 |
|
Dante Ruiz
|
adee5e9ef7
|
fix crash
|
2018-05-24 18:02:15 -07:00 |
|