samcake
|
6122155880
|
Renaming the PendingCHanges class to Transaction
|
2017-04-05 13:10:31 -07:00 |
|
kunalgosar
|
8749428ede
|
dont assume no query tags
|
2017-04-04 13:51:34 -07:00 |
|
Kunal Gosar
|
e5c075f107
|
fix typo and namespace
|
2017-04-04 11:54:58 -07:00 |
|
kunalgosar
|
8e4229b211
|
dont redirect people from webentity
|
2017-04-04 11:54:58 -07:00 |
|
kunalgosar
|
9d0667cb31
|
add url tag to web entities
|
2017-04-04 11:54:58 -07:00 |
|
kunalgosar
|
a0f0879087
|
added file type filter and interceptor
|
2017-04-04 11:54:21 -07:00 |
|
Stephen Birarda
|
c7a28a527a
|
cleanup Agent recording handling, make loadRecording async
|
2017-04-04 10:56:25 -07:00 |
|
Lexx
|
af95741a7e
|
Merge branch 'master' into 21224
|
2017-04-04 18:24:49 +01:00 |
|
Triplelexx
|
b4b5d4fe9b
|
resolve merge conflict
|
2017-04-04 18:15:12 +01:00 |
|
Triplelexx
|
01b13d7032
|
fix crash when pressing "Bookmark Avatar" button
also modified LocationBookmarks for consistency
|
2017-04-04 18:05:00 +01:00 |
|
Seth Alves
|
fbf2014f04
|
Merge pull request #10102 from vladest/tablet-ui-goto
Put current address to location instead of inputfield
|
2017-04-03 16:09:58 -07:00 |
|
Andrew Meadows
|
66ff551a7c
|
Merge pull request #10080 from ZappoMan/footActions
add foot IK targets as actions, map Kinect feet to foot targets
|
2017-04-03 12:06:14 -07:00 |
|
Seth Alves
|
43e1cec8a3
|
merge from upstream
|
2017-04-03 06:28:59 -07:00 |
|
Dante Ruiz
|
b10f491c6e
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0
|
2017-04-01 00:58:37 +01:00 |
|
Dante Ruiz
|
d1bf3e4bf2
|
fixed webview mobile view
|
2017-04-01 00:58:09 +01:00 |
|
Chris Collins
|
b36f688a5a
|
Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default
use tablet-ui stylus as default, rather than avatar finger
|
2017-03-31 15:34:37 -07:00 |
|
Seth Alves
|
54c66aff07
|
use tablet-ui stylus as default, rather than avatar finger
|
2017-03-31 13:18:40 -07:00 |
|
Vladyslav Stelmakhovskyi
|
7558765042
|
Script log now back to HUD
|
2017-03-31 14:20:15 +02:00 |
|
ZappoMan
|
53c439ffba
|
add foot IK targets as actions
|
2017-03-30 19:11:16 -07:00 |
|
Ryan Huffman
|
150dcd7dec
|
Merge remote-tracking branch 'upstream/master' into stable-merge
|
2017-03-30 14:22:27 -07:00 |
|
Triplelexx
|
aa9a2532a9
|
fix for displaying "Bookmark Avatar" dialog in tablet ui
|
2017-03-30 13:54:33 +01:00 |
|
Triplelexx
|
50e35a220b
|
Merge remote-tracking branch 'upstream/master' into 21224
|
2017-03-30 01:25:27 +01:00 |
|
Seth Alves
|
371df35013
|
remove code related to tablet being a model rather than an overlay. start on landscape mode
|
2017-03-29 14:16:14 -07:00 |
|
Delamare2112
|
2f6add3398
|
Expose LimitlessSpeechRecognition to scripts
|
2017-03-29 12:56:08 -07:00 |
|
Dante Ruiz
|
65be71fa69
|
min diff
|
2017-03-28 00:05:02 +01:00 |
|
Dante Ruiz
|
7434cc5644
|
force vto to false on start up
|
2017-03-28 00:02:02 +01:00 |
|
Triplelexx
|
dc64065668
|
Merge remote-tracking branch 'upstream/master' into 21224
update
|
2017-03-26 22:20:24 +01:00 |
|
Triplelexx
|
bda1d54209
|
create AvatarBookmarks
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
|
2017-03-24 22:58:36 +00:00 |
|
Dante Ruiz
|
6178a86a46
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
|
2017-03-24 23:56:33 +01:00 |
|
Seth Alves
|
902e3d41d6
|
merge from upstream
|
2017-03-24 08:20:35 -07:00 |
|
Brad Hefta-Gaub
|
9a38b36f59
|
Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
|
2017-03-24 08:12:11 -07:00 |
|
Seth Alves
|
ff3fc244d1
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-23 09:50:53 -07:00 |
|
Dante Ruiz
|
e708c6478e
|
Merge branch 'tablet-popup' into tablet-help
|
2017-03-23 17:35:45 +01:00 |
|
Dante Ruiz
|
af97c7275e
|
Use loadQMlSource if no stack is aviable
|
2017-03-23 17:03:24 +01:00 |
|
Brad Davis
|
85c80f3be8
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
|
2017-03-22 14:25:23 -07:00 |
|
Dante Ruiz
|
3a89654111
|
saving work
|
2017-03-22 19:14:53 +01:00 |
|
Triplelexx
|
b7980569cc
|
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
|
2017-03-21 22:13:33 +00:00 |
|
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 |
|