David Rowe
|
e3b9d588ec
|
Merge branch 'master' into 21235
# Conflicts:
# interface/src/Menu.cpp
# interface/src/ui/DialogsManager.h
|
2017-03-18 09:42:36 +13: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 |
|
Andrew Meadows
|
60e0eb0cf9
|
Merge pull request #9917 from Atlante45/fix/sit
Cancel Avatar velocity when sitting down.
|
2017-03-17 10:04:25 -07:00 |
|
Atlante45
|
698791295a
|
Expose DriveKeys enum to JS
|
2017-03-16 20:03:27 -07:00 |
|
David Rowe
|
939b4f1612
|
Remove Developer > Network > Disk Cache Editor menu item and dialog
|
2017-03-17 13:49:09 +13:00 |
|
Atlante45
|
5a1ce4bb05
|
CR
|
2017-03-16 17:46:47 -07:00 |
|
Atlante45
|
9155cc6334
|
Fix windows warnings
|
2017-03-16 17:44:56 -07:00 |
|
David Rowe
|
e21d7d9edf
|
Add Developer > Network > Clear Disk Cache menu action
|
2017-03-17 13:34:11 +13:00 |
|
David Rowe
|
dc71f502f0
|
Delete Developer > Network > RAM Caches Size menu item and dialog
|
2017-03-17 13:09:06 +13:00 |
|
Atlante45
|
42316e713d
|
CR drive keys
|
2017-03-16 16:24:52 -07:00 |
|
Atlante45
|
3e9474e878
|
CR
|
2017-03-16 16:24:36 -07:00 |
|
Atlante45
|
7517f224a8
|
Add MyAvatar drive keys capture capability
|
2017-03-16 15:44:17 -07:00 |
|
Zach Fox
|
fc2a501474
|
Cleanup JS<->QML messaging
|
2017-03-16 15:38:39 -07:00 |
|
Andrew Meadows
|
6f4d9bfba3
|
Merge pull request #9858 from kunalgosar/logBolding
Change to Log Font and Formatting
|
2017-03-16 13:09:37 -07:00 |
|
Zach Fox
|
b3821bb02d
|
fix location vs AddressManager woes
|
2017-03-16 12:57:21 -07:00 |
|
kunalgosar
|
0cee9ee172
|
font change
|
2017-03-16 11:57:46 -07:00 |
|
Seth Alves
|
eba2417f41
|
Merge pull request #9912 from AndrewMeadows/model-cleanup-4
minor cleanup of render pipeline for models and avatars
|
2017-03-16 10:39:43 -08:00 |
|
kunalgosar
|
e7a16d4294
|
code standard fixes
|
2017-03-16 10:53:35 -07:00 |
|
Zach Fox
|
05fec328c0
|
Make tablet popups work like they should
|
2017-03-16 10:38:46 -07:00 |
|
Seth Alves
|
31e0cfe296
|
Merge pull request #9825 from thoys/record-fixes
Avatar Recorder and Playback Fixes
|
2017-03-16 07:27:42 -08:00 |
|
Andrew Meadows
|
361e03fc78
|
remove unused variable
|
2017-03-15 16:57:31 -07:00 |
|
Seth Alves
|
693aee0628
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
|
2017-03-15 16:54:40 -07:00 |
|
howard-stearns
|
84fd17bd88
|
use location.metaverseServerUrl instead of hardcoded value.
|
2017-03-15 16:33:23 -07:00 |
|
Andrew Meadows
|
d3fa28d4bc
|
remove cruft and fix indentation
|
2017-03-15 16:17:59 -07:00 |
|
howard-stearns
|
155e1b8e85
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-15 15:45:36 -07:00 |
|
howard-stearns
|
c0c92fd8d1
|
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-15 15:20:28 -07:00 |
|
Andrew Meadows
|
f250c0d298
|
simpler bindTransform() for ModelMeshPartPayload
|
2017-03-15 14:41:13 -07:00 |
|
Zach Fox
|
786180291b
|
Bugfixes and improvements
|
2017-03-15 11:46:33 -07: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 |
|
Zach Pomerantz
|
789bb7c855
|
rename audio(Mic)OutboundPPS
|
2017-03-15 13:30:39 -04:00 |
|
howard-stearns
|
6c88bc98b4
|
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-15 09:24:30 -07:00 |
|
Zach Fox
|
0a6bcd7fca
|
Massive performance boost
|
2017-03-14 16:24:06 -07: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
|
490cb83489
|
move advanced movement control changes to MyAvatar
|
2017-03-14 15:03:01 -07:00 |
|
Stephen Birarda
|
1fe02477b0
|
fix LX behaviour in snap/advanced/basic
|
2017-03-14 14:21:21 -07:00 |
|
Zach Fox
|
5da0dfc4ac
|
Merging from Pal_v2_Zach
|
2017-03-14 14:05:50 -07:00 |
|
Zach Fox
|
e3d0842ddc
|
Implement browser in PAL
|
2017-03-13 18:39:47 -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 |
|
Stephen Birarda
|
0926b2df2a
|
add LX snap turn to standard mapping
|
2017-03-13 15:14:20 -07:00 |
|
Ryan Huffman
|
8a1bd781f0
|
Fix overlay findRayIntersection not properly handing multiple drawInFront overlays
|
2017-03-13 14:44:14 -07:00 |
|
Brad Davis
|
3bef5ad528
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
|
2017-03-13 14:30:25 -07:00 |
|
Zach Pomerantz
|
808973d7d2
|
use QStandardPaths instead of hardcoded paths
|
2017-03-13 17:26:42 -04:00 |
|
Zach Fox
|
d04b1da1c2
|
Merging from PAL_v2_Zach
|
2017-03-13 12:54:01 -07:00 |
|
howard-stearns
|
db06c2650f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-13 11:53:48 -07: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 |
|
howard-stearns
|
ee3ca736fd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-13 11:51:39 -07:00 |
|
Andrew Meadows
|
6e7f4b0418
|
Merge pull request #9829 from ZappoMan/addDoubleClick
Add double click message support to entities and overlays
|
2017-03-13 10:44:54 -07:00 |
|
Zach Fox
|
beb848373b
|
Update from zfox23/PALv2 branch
|
2017-03-13 10:15:06 -07:00 |
|
Brad Hefta-Gaub
|
a38965d628
|
add more audio stats
|
2017-03-11 09:50:30 -08:00 |
|
Brad Hefta-Gaub
|
6ce50269ac
|
add audio mixer in/out stats to the client stats
|
2017-03-10 18:42:18 -08:00 |
|
Brad Hefta-Gaub
|
aa65f03509
|
fix mac warning and remove accidentally added whitespace
|
2017-03-10 18:14:00 -08:00 |
|
Brad Hefta-Gaub
|
23e47f2fdc
|
added icons to the audioScope app
|
2017-03-10 18:13:35 -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 |
|
kunalgosar
|
a974282bdf
|
bolding timestamps on log
|
2017-03-10 11:55:36 -08: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 |
|
Dante Ruiz
|
c6c0c6d382
|
toolbar becomes visible after taking a snapshot
|
2017-03-09 22:54:22 +00:00 |
|
Brad Davis
|
e94f803b84
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2017-03-08 09:03:21 -08:00 |
|
Seth Alves
|
adc3581d63
|
remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay
|
2017-03-07 19:32:34 -08:00 |
|
Brad Hefta-Gaub
|
8ae6f2727d
|
add support for double click messages to overlays and entities
|
2017-03-07 17:52:55 -08:00 |
|
Thijs Wenker
|
b54d6cb0e1
|
stop avatar controller while playing back a recording, which makes it not collide anymore
|
2017-03-08 00:07:49 +01:00 |
|
howard-stearns
|
cb41b9135b
|
fix broken merge
|
2017-03-07 12:10:52 -08:00 |
|
howard-stearns
|
8a489f36f4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal
|
2017-03-07 10:49:53 -08:00 |
|
Howard Stearns
|
f0fd29abd3
|
Merge pull request #9815 from davidkelly/dk/3377
Retain selection in PAL when sorting or reloading
|
2017-03-07 09:38:07 -08:00 |
|
David Kelly
|
b760e86226
|
rest of cr feedback
|
2017-03-07 10:17:32 -07:00 |
|
David Kelly
|
c6dbfc85f0
|
cr feedback
|
2017-03-07 09:54:00 -07:00 |
|
Vladyslav Stelmakhovskyi
|
2d2b2094fd
|
Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination
|
2017-03-07 10:11:09 +01:00 |
|
Brad Hefta-Gaub
|
b111bcb826
|
Merge pull request #9818 from ctrlaltdavid/21205
Remove Developer > Network > Bandwith Details dialog
|
2017-03-06 22:02:33 -08:00 |
|
David Rowe
|
51739f2f99
|
Remove Developer > Network > Bandwith Details dialog
|
2017-03-07 15:02:26 +13:00 |
|
Brad Davis
|
8782fe1d93
|
Merge branch 'master' into smarter_textures
Conflicts:
libraries/model-networking/src/model-networking/TextureCache.cpp
|
2017-03-06 15:29:41 -08:00 |
|
David Kelly
|
3d39aae35b
|
minor tweak - just in case
|
2017-03-06 15:52:33 -07:00 |
|
David Kelly
|
f23f882595
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377
|
2017-03-06 15:26:21 -07:00 |
|
David Kelly
|
e14a1ad1af
|
minor cleanup
|
2017-03-06 15:26:03 -07:00 |
|
David Kelly
|
db036d997c
|
first pass
|
2017-03-06 15:18:35 -07:00 |
|
Zach Fox
|
5223f872c1
|
Merge pull request #9753 from zfox23/FB_3234_TakeTwo
Optimize AvatarMixer with respect to Identity and Avatar Data
|
2017-03-06 13:37:29 -08:00 |
|
Andrew Meadows
|
1b8f6b9835
|
Merge pull request #9784 from samcake/blue
Fixing Emissive on overlay for models (opaque and transparent)
|
2017-03-06 13:24:00 -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 |
|
howard-stearns
|
632cdc1b38
|
semicolons and whitespace per coding standard
|
2017-03-06 11:04:12 -08:00 |
|
Zach Fox
|
c9c07c4269
|
Basically rebase and squash
|
2017-03-06 10:03:41 -08:00 |
|
sam
|
cffd838d1d
|
merging with master
|
2017-03-05 12:57:13 -08:00 |
|
Ken Cooke
|
50f92cb934
|
redo unsafe optimization
|
2017-03-04 15:29:23 -08:00 |
|
Ken Cooke
|
46c5f96113
|
redo unsafe optimization
|
2017-03-04 15:24:03 -08:00 |
|
Ken Cooke
|
117bba8b6a
|
redo unsafe optimization
|
2017-03-04 15:17:09 -08:00 |
|
howard-stearns
|
a715a694f0
|
fix 'banned user doesn't disappear from pal until refresh'
|
2017-03-03 16:27:38 -08: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 |
|
Bradley Austin Davis
|
efad7da508
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2017-03-03 08:59:24 -08:00 |
|
Seth Alves
|
807e15ade9
|
Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2
avoid animation blending for other avatars
|
2017-03-02 18:37:18 -08:00 |
|
Brad Hefta-Gaub
|
e655e442a0
|
Merge pull request #9799 from sethalves/steady-hand-lasers
Steady hand lasers
|
2017-03-02 18:27:39 -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 |
|
Seth Alves
|
88d6fe6a04
|
fix offset relative to endParent
|
2017-03-02 16:26:56 -08:00 |
|
Seth Alves
|
5f570c1ba8
|
fix up bounds handling in Line3DOverlay
|
2017-03-02 16:16:48 -08:00 |
|
Seth Alves
|
8893c4770e
|
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
|
2017-03-02 10:02:33 -08:00 |
|
Howard Stearns
|
50cf7b00fd
|
Merge pull request #9797 from davidkelly/dk/3348
fix unmute when ignoring in PAL (you can't)
|
2017-03-02 09:32:38 -08:00 |
|
Andrew Meadows
|
a55ab94cd9
|
other avatars use jointData no Rig animation
|
2017-03-02 07:52:02 -08:00 |
|
David Kelly
|
79e440be81
|
fix unmute when ignoring in PAL (you can't)
|
2017-03-02 08:36:58 -07:00 |
|