Seth Alves
|
91cac892d2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 14:04:58 -07:00 |
|
Chris Collins
|
4c789c44aa
|
Merge pull request #9922 from birarda/bug/stuck-ess
fix a couple of ESS issues during ES/ESS restart
|
2017-03-21 12:44:53 -07:00 |
|
Seth Alves
|
cc4ddd1387
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 08:43:35 -08:00 |
|
Chris Collins
|
ea13151d55
|
Merge pull request #9945 from mnafees/21233
21233: Remove Scripts Editor option from Edit menu and all related files
|
2017-03-21 08:01:36 -07:00 |
|
Vladyslav Stelmakhovskyi
|
fb0adae0b1
|
Scripts debug window in Tablet UI
|
2017-03-21 15:04:38 +01:00 |
|
Brad Davis
|
e482eac437
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
|
2017-03-20 16:22:13 -07:00 |
|
Vladyslav Stelmakhovskyi
|
cedc3cf8b6
|
Fix naming. Move variable instantiation within scope
|
2017-03-20 23:43:01 +01:00 |
|
Stephen Birarda
|
a4d72c4e67
|
make AudioScriptingInterface a Dependency
|
2017-03-20 13:40:15 -07:00 |
|
Vladyslav Stelmakhovskyi
|
13cd500c2e
|
Make runningscripts able to open even if there is no scripts running
|
2017-03-20 20:46:37 +01:00 |
|
Brad Hefta-Gaub
|
bc5d7d8698
|
Merge pull request #9851 from AndrewMeadows/simulation-ownership-2
zero velocity of deactivated dynamic entities
|
2017-03-20 10:20:11 -07:00 |
|
Brad Hefta-Gaub
|
af790d8474
|
Merge pull request #9875 from birarda/bug/spin-strafe
fix double snap turn strafing
|
2017-03-20 10:08:05 -07:00 |
|
Chris Collins
|
af2748410d
|
Merge pull request #9932 from Triplelexx/21231
21231 - Remove About Interface from File menu
|
2017-03-20 09:55:57 -07:00 |
|
Chris Collins
|
509057c6d8
|
Merge pull request #9941 from Triplelexx/21232
21232 - Remove Mini Mirror from View menu
|
2017-03-20 09:55:37 -07:00 |
|
Seth Alves
|
424af2255b
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-19 21:17:30 -08:00 |
|
Mohammed Nafees
|
3612b9fccc
|
Remove Edit > Scripts Editor and all related source files
|
2017-03-20 00:25:50 -04:00 |
|
Triplelexx
|
8e086a8fc8
|
fix build error
|
2017-03-18 03:51:55 +00:00 |
|
Triplelexx
|
a9b1a38665
|
remove Mini Mirror from View menu
Avatar inputs only contains the audio meter now.
|
2017-03-18 00:53:13 +00:00 |
|
Brad Hefta-Gaub
|
a75acd139b
|
Merge pull request #9885 from sethalves/model-scripting
Model scripting
|
2017-03-17 13:13:17 -07:00 |
|
Triplelexx
|
eba6c8de5e
|
remove About Interface from File menu
|
2017-03-17 17:37:19 +00:00 |
|
Atlante45
|
698791295a
|
Expose DriveKeys enum to JS
|
2017-03-16 20:03:27 -07:00 |
|
Atlante45
|
7517f224a8
|
Add MyAvatar drive keys capture capability
|
2017-03-16 15:44:17 -07:00 |
|
Seth Alves
|
693aee0628
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
|
2017-03-15 16:54:40 -07:00 |
|
Vladyslav Stelmakhovskyi
|
856e15060d
|
Implemented Domain Connection statistics for Tablet UI
|
2017-03-15 21:05:13 +01:00 |
|
Seth Alves
|
b66ff19595
|
prefer-avatar-finger-over-stylus setting now defaults to true
|
2017-03-15 09:51:30 -08:00 |
|
Anthony Thibault
|
495deba771
|
Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races
Fixes for race conditions in DebugDraw
|
2017-03-15 10:38:26 -07:00 |
|
Seth Alves
|
c53b0dff93
|
Merge pull request #9891 from druiz17/tablet-xbox-fix
Allow the user to bring up the tablet when a message is open
|
2017-03-15 08:43:28 -08:00 |
|
Seth Alves
|
563d59bda9
|
Merge pull request #9886 from vladest/tablet-ui-entity-statistics
Tablet ui entity statistics
|
2017-03-15 08:40:52 -08:00 |
|
Seth Alves
|
b5919d89a5
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-15 08:26:10 -08:00 |
|
Dante Ruiz
|
45829574c2
|
Allow the user to bring up the tablet when a message is open in the tablet
|
2017-03-15 00:02:42 +01:00 |
|
samcake
|
e0f0cc2102
|
Fix the unsupported ktx format, it was coming from the BUmp map case
|
2017-03-14 15:49:44 -07:00 |
|
Stephen Birarda
|
1fe02477b0
|
fix LX behaviour in snap/advanced/basic
|
2017-03-14 14:21:21 -07:00 |
|
Seth Alves
|
e8a9ff867d
|
merge from upstream
|
2017-03-13 17:57:01 -07:00 |
|
Brad Davis
|
eab91d061d
|
Merge pull request #9868 from zzmp/ktx/local-not-roaming
Use Local for WIN32 FileCache
|
2017-03-13 15:52:11 -07:00 |
|
Anthony J. Thibault
|
efc7fbacb1
|
Bug fix for potential crash when getting DebugDraw::instance
(cherry picked from commit b0ad9a8110)
|
2017-03-13 15:23:10 -07:00 |
|
Zach Pomerantz
|
808973d7d2
|
use QStandardPaths instead of hardcoded paths
|
2017-03-13 17:26:42 -04:00 |
|
Vladyslav Stelmakhovskyi
|
9e9c64021c
|
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
|
2017-03-13 19:54:40 +01:00 |
|
Andrew Meadows
|
546f32431d
|
Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
Various noise gate, scope, and audio stats improvements
|
2017-03-13 11:52:16 -07:00 |
|
Seth Alves
|
ffd4d1488c
|
Merge pull request #9866 from vladest/tablet-ui-lodtools
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
|
2017-03-13 08:59:06 -08:00 |
|
Vladyslav Stelmakhovskyi
|
49055cfa5c
|
Some statistics showed
|
2017-03-13 16:31:29 +01:00 |
|
Seth Alves
|
b3003acb97
|
Merge pull request #9856 from druiz17/tablet-imporove-dialogs
Bring of menu window if tablet is closed on desktop
|
2017-03-12 12:20:29 -08:00 |
|
Vladyslav Stelmakhovskyi
|
81bc56f124
|
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
|
2017-03-11 14:44:33 +01:00 |
|
Brad Hefta-Gaub
|
aa65f03509
|
fix mac warning and remove accidentally added whitespace
|
2017-03-10 18:14:00 -08:00 |
|
Brad Hefta-Gaub
|
7eb4b8f5f7
|
expose AudioScope to QML
|
2017-03-10 17:38:13 -08:00 |
|
Brad Hefta-Gaub
|
eaea718de1
|
add various scriping interfaces for managing the audio scope and detecting noise gate transitions
|
2017-03-10 17:08:19 -08:00 |
|
Anthony J. Thibault
|
07e10ae862
|
Merge branch 'tablet-ui' into feature/can-touch-this
|
2017-03-10 17:05:26 -08:00 |
|
Dante Ruiz
|
8a973dae3c
|
fixed bring menu dialogs in tablet
|
2017-03-10 23:21:29 +00:00 |
|
Dante Ruiz
|
9b3810814e
|
fiexed putting menu items on the hud when tablet not open when on desktop screen
|
2017-03-10 18:40:18 +00:00 |
|
Andrew Meadows
|
8ddcae2a15
|
restore transform of deactivated entities
|
2017-03-09 17:26:53 -08:00 |
|
Andrew Meadows
|
d4abdcb6c8
|
comments, namechange, and temporary debug code
|
2017-03-09 17:26:53 -08:00 |
|
Anthony J. Thibault
|
d8f04d90a7
|
Merge branch 'master' into feature/can-touch-this
|
2017-03-09 14:24:10 -08:00 |
|
druiz17
|
0069569e96
|
Merge branch 'tablet-ui' into 21197
|
2017-03-09 09:31:15 -08:00 |
|
druiz17
|
8750982567
|
Merge pull request #9785 from druiz17/menuFix
More dialog porting to tablet
|
2017-03-09 09:29:31 -08:00 |
|
Seth Alves
|
ae48dae96f
|
get rid of toggleTabletUI lockout period
|
2017-03-08 15:29:46 -08:00 |
|
David Rowe
|
950f91965d
|
Merge branch 'tablet-ui-edit-js' into 21197
|
2017-03-08 17:35:58 +13:00 |
|
Brad Hefta-Gaub
|
8ae6f2727d
|
add support for double click messages to overlays and entities
|
2017-03-07 17:52:55 -08:00 |
|
Vladyslav Stelmakhovskyi
|
a02807fb26
|
Merge branch 'menuFix' into menuFix_AssetServer
|
2017-03-07 21:07:53 +01:00 |
|
Anthony J. Thibault
|
b0ad9a8110
|
Bug fix for potential crash when getting DebugDraw::instance
|
2017-03-07 10:03:38 -08:00 |
|
Seth Alves
|
f594689fa8
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 09:24:50 -08:00 |
|
Dante Ruiz
|
10ce732e91
|
Merge branch 'master' into menuFix
|
2017-03-07 16:15:54 +00:00 |
|
David Rowe
|
51739f2f99
|
Remove Developer > Network > Bandwith Details dialog
|
2017-03-07 15:02:26 +13:00 |
|
Vladyslav Stelmakhovskyi
|
6d9e7de6dc
|
Implemented AssetBrowser in Tablet view
|
2017-03-06 21:45:55 +01:00 |
|
David Rowe
|
09ecb12510
|
Merge branch 'tablet-ui-edit-js' into 21197
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
|
2017-03-07 08:59:40 +13:00 |
|
Seth Alves
|
08e2e421e4
|
Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js
|
2017-03-06 11:08:27 -08:00 |
|
Seth Alves
|
4b02e550db
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-06 11:07:12 -08:00 |
|
Andrew Meadows
|
6ea6477c73
|
Merge pull request #9683 from jherico/cache_flush
Clear caches on domain switch
|
2017-03-06 11:05:44 -08:00 |
|
Seth Alves
|
93246b24b0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-06 08:54:49 -08:00 |
|
Dante Ruiz
|
d5948079c7
|
Merge branch 'master' of github.com:highfidelity/hifi into menuFix
|
2017-03-06 16:29:37 +00:00 |
|
Anthony J. Thibault
|
e56f02d94f
|
Changed default for preferFingerOverStylus to false.
|
2017-03-03 14:12:04 -08:00 |
|
Anthony J. Thibault
|
45febe8565
|
Merge branch 'master' into feature/fingers-on-tablet
|
2017-03-03 09:04:43 -08:00 |
|
Dante Ruiz
|
f867f4e739
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
|
2017-03-03 15:40:41 +00:00 |
|
David Rowe
|
9384dfd89c
|
Merge branch 'tablet-ui-edit-js' into 21197
|
2017-03-03 18:05:18 +13:00 |
|
David Rowe
|
854292b193
|
Merge branch 'tablet-ui-edit-js' into 21199
|
2017-03-03 17:51:12 +13:00 |
|
Seth Alves
|
3b581a8dfe
|
merge from upstream
|
2017-03-02 16:35:44 -08:00 |
|
Seth Alves
|
10cb7aab06
|
Merge pull request #9684 from Menithal/parent-hotkey
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
|
2017-03-02 16:30:43 -08:00 |
|
David Rowe
|
b592205f7e
|
Fix OSX warning
|
2017-03-02 18:45:42 +13:00 |
|
Anthony J. Thibault
|
4f03c06a94
|
Added General Preference to control stylus vs finger usage
By default the finger is preferred over the stylus.
|
2017-03-01 18:07:53 -08:00 |
|
David Rowe
|
e445fe551f
|
Fix showing wrong version of dialog in desktop mode
|
2017-03-02 15:00:38 +13:00 |
|
David Rowe
|
b9869264ba
|
Display avatar settings dialog in tablet
|
2017-03-02 13:16:23 +13:00 |
|
Seth Alves
|
c2085ebb6e
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-02-28 13:33:51 -08:00 |
|
Dante Ruiz
|
d5714bfa6e
|
Merge branch 'master' into menuFix
|
2017-02-28 16:55:44 +00:00 |
|
Seth Alves
|
117be16c31
|
pull from upstream
|
2017-02-27 16:48:23 -08:00 |
|
Seth Alves
|
8110921abf
|
git rid of _mouseToOverlays until I remember why I thought I needed it
|
2017-02-27 11:11:04 -08:00 |
|
Ryan Huffman
|
5b59939195
|
Merge pull request #9602 from huffman/feat/shortbow-entity-server
Add shortbow to marketplace scripts
|
2017-02-27 11:09:52 -08:00 |
|
Dante Ruiz
|
19110ecfee
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
|
2017-02-27 16:00:08 +00:00 |
|
Seth Alves
|
34c5d480c4
|
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
|
2017-02-27 06:35:50 -08:00 |
|
Seth Alves
|
1864975c51
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-27 06:35:22 -08:00 |
|
Seth Alves
|
a2f527b28a
|
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
|
2017-02-25 08:44:03 -08:00 |
|
Seth Alves
|
36bcaa8d0f
|
delete tablet overlays when switching domains
|
2017-02-25 08:43:06 -08:00 |
|
kunalgosar
|
d6c1f1c99a
|
Fixed Wed Entity not leaving Focus
|
2017-02-24 18:18:48 -08:00 |
|
Dante Ruiz
|
73c337efd0
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
|
2017-02-25 00:42:22 +00:00 |
|
Dante Ruiz
|
835b23832f
|
some modal clean up
|
2017-02-25 00:40:38 +00:00 |
|
Seth Alves
|
70060eb464
|
in 2d mode, clicks on tablet don't get used for other things
Conflicts:
scripts/system/libraries/entitySelectionTool.js
|
2017-02-24 11:37:04 -08:00 |
|
Seth Alves
|
e43c4c17f5
|
in 2d mode, clicks on tablet don't get used for other things
|
2017-02-23 21:27:25 -08:00 |
|
Seth Alves
|
ce717d04e9
|
merge in tablet-as-overlay code
|
2017-02-23 18:40:20 -08:00 |
|
Seth Alves
|
37004e4347
|
steps toward making mouse work on tablet
|
2017-02-23 08:11:31 -08:00 |
|
Dante Ruiz
|
93ae93a45a
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
|
2017-02-23 15:43:24 +00:00 |
|
Seth Alves
|
41ef7b8dbb
|
add setting to control if tablet is an entity or overlay
|
2017-02-22 21:13:42 -08:00 |
|
Dante Ruiz
|
3ba605bf23
|
saving work
|
2017-02-23 00:28:30 +00:00 |
|
Seth Alves
|
84b93826d0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-02-22 09:30:16 -08:00 |
|
Seth Alves
|
1d446064be
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-02-22 08:23:36 -08:00 |
|