ZappoMan
65801cbb4d
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 18:21:17 -07:00
ZappoMan
5164aa4056
hacking
2017-04-25 18:21:09 -07:00
ZappoMan
90cdeb9582
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 16:09:59 -07:00
Atlante45
33f58f99d1
CR
2017-04-25 16:09:31 -07:00
Dante Ruiz
5a9cf554e7
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-25 23:57:48 +01:00
Atlante45
a450f52427
Start to setup image library
2017-04-25 15:56:22 -07:00
Brad Hefta-Gaub
1962a49f3b
Merge pull request #10225 from sethalves/bullet-constraints-1
...
Bullet constraints + far-grab bootstrap fix
2017-04-25 13:36:47 -07:00
Zach Pomerantz
d2bfcce3f7
Merge pull request #10242 from zzmp/fix/display-log
...
Send changed_display_mode after it changes
2017-04-25 16:36:12 -04:00
Seth Alves
0cd2863df4
start on routing HMD position and rotation through controller interface
...
(cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)
2017-04-25 11:01:52 -07:00
ZappoMan
aa955ee360
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762
new approach to the tpose fix, as well as other improvements
2017-04-24 17:36:05 -07:00
Zach Pomerantz
4a26785eda
cleanup Audio bg threads in cleanupBeforeQuit
2017-04-24 18:21:27 -04:00
Zach Pomerantz
cd2665fc55
standardize Audio bg thread joins
2017-04-24 18:10:50 -04:00
Dante Ruiz
f69691afd5
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-24 19:57:48 +01:00
Dante Ruiz
d057dfebf0
got input recording to work
2017-04-24 19:57:38 +01:00
Seth Alves
17b83dd64c
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-21 17:19:47 -07:00
Ken Cooke
a5ed3007b3
Merge pull request #10248 from vladest/notify-sound-inject
...
Notify sound inject
2017-04-21 09:26:36 -07:00
Dante Ruiz
641a7390ba
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-21 16:46:55 +01:00
Vladyslav Stelmakhovskyi
2665ede06f
Audio injector cleanup
2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi
b2533b6106
Code nitpick. Pointer cleanup on exit
2017-04-20 21:12:57 +02:00
Zach Pomerantz
b77917b8d1
Merge pull request #10241 from zzmp/fix/display-fail
...
Update Display menu on unsuccesful selection
2017-04-20 12:04:51 -04:00
Vladyslav Stelmakhovskyi
06406ef7de
Merge branch 'master' into notify-sound-inject
2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi
023d03d9f8
Implemented snap sound using sound injector
2017-04-20 17:43:16 +02:00
Seth Alves
f7378abb08
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-20 02:40:10 -07:00
Zach Fox
50456f71ed
Merge pull request #10142 from Triplelexx/21258
...
21258 - Don't render (or heavily use GPU) when window in minimized
2017-04-19 16:26:49 -07:00
Dante Ruiz
d4c8d06575
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-19 20:42:11 +01:00
Dante Ruiz
07f674eabe
exprting compressed file
2017-04-19 20:41:56 +01:00
Zach Pomerantz
e0cb809f58
add hmd:bool to changed_display_mode
2017-04-18 18:48:28 -04:00
Zach Pomerantz
858a1db38b
only log changed_display_mode on successful change
2017-04-18 18:48:23 -04:00
Zach Pomerantz
c7a7fa90ec
update Display menu on unsuccesful selection
2017-04-18 18:47:57 -04:00
Zach Pomerantz
a310acd37f
check HMD usage for tutorial teleport
2017-04-18 18:46:53 -04:00
Dante Ruiz
f8ec49eb96
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-18 21:53:37 +01:00
Dante Ruiz
5cd4007aaa
got input recording working
2017-04-18 21:53:23 +01:00
Seth Alves
0807e036e8
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-18 11:59:23 -07:00
Andrew Meadows
da55c96c4c
protect against crash on invalid scene on shutdown
2017-04-18 11:52:22 -07:00
Andrew Meadows
5a458c9923
remove last qApp usage from Avatar class
2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c
remove Camera argument from Avatar::render()
2017-04-18 11:52:21 -07:00
Andrew Meadows
9cddbbc42a
more interface-only spaghetti out of Avatar
2017-04-18 11:52:21 -07:00
Andrew Meadows
1137bd1436
pull qApp spaghetti out of Avatar class
...
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
2017-04-18 11:52:21 -07:00
Zach Fox
7505b82189
Merge pull request #10046 from Triplelexx/21224
...
21224 - Allow people to save avatar bookmarks
2017-04-18 11:10:50 -07:00
Zach Fox
9c4e367245
Merge pull request #10213 from zfox23/fixGoToFocus
...
FB 4156; Fix GoTo text field focus; other GoTo tweaks
2017-04-17 12:13:41 -07:00
Zach Fox
e6edce5352
Entirely remove addressBarToggle()
2017-04-17 12:13:01 -07:00
Seth Alves
371118a6c0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 16:26:30 -07:00
Sam Gateau
3519a72f8a
Merge pull request #10190 from samcake/ambient-bis
...
Introducing a tool to debug the current Zone Stack
2017-04-14 13:28:59 -07:00
Seth Alves
d17d12446b
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 12:49:03 -07:00
Thijs Wenker
6f58e91d76
Merge pull request #10121 from birarda/bug/recording-cache
...
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Seth Alves
0dab94fada
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:34:46 -07:00
Zach Fox
75f1168b19
Clearer function names
2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b
Checkpoint!
2017-04-12 14:45:56 -07:00
Seth Alves
74c0a70cb0
rename base action classes to dynamics, start on constraints
2017-04-11 20:39:13 -07:00
Zach Fox
6569de697d
Merge pull request #10187 from zfox23/fix/getAvatar_Fix
...
Fix FB3999; Fix crashes caused by getAvatar() design bug
2017-04-11 11:17:48 -07:00
samcake
79bcf95792
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-11 10:00:34 -07:00
Seth Alves
bf16309917
Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002
...
avoid invisible avatars redux
2017-04-11 07:07:03 -07:00
Stephen Birarda
84a5807ff1
return ScriptAvatarData raw pointer from getAvatar
2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a
add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts
2017-04-10 22:15:45 -07:00
samcake
16e6f0900d
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-10 10:12:23 -07:00
Sam Cake
b65448bcbe
Trying to improve the Job/Task classes and testing it with the ZoneRenderer
2017-04-09 11:08:35 -07:00
Chris Collins
8e12f62cbb
Merge pull request #10153 from druiz17/goto-fix
...
Ability to toggle goto with the crt-l and enter keys
2017-04-07 16:36:41 -07:00
Seth Alves
03065ee6c8
Merge pull request #9938 from kunalgosar/jsRenderBug
...
Stop WebEntities Running Files and Commands
2017-04-07 13:44:03 -07:00
Andrew Meadows
92495d9622
delete in proper order on shutdown
2017-04-07 11:10:48 -07:00
Triplelexx
27a404d0ea
remove extra lines
2017-04-07 07:09:18 +01:00
Triplelexx
279997d905
change display plugin to deactivate when window minimized
2017-04-07 06:49:28 +01:00
Dante Ruiz
52fd446d4d
toggle goto in tablet
2017-04-06 22:27:37 +01:00
Triplelexx
1b2887d5b1
change paintGL to return if window is minimized
2017-04-06 17:06:06 +01:00
samcake
1a9005ed8b
Avoid unexpected changes
2017-04-05 13:57:40 -07:00
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
