Anthony J. Thibault
ae98974d79
improve 14-dop generation for avatar joint collision
...
Also added debug rendering functionality.
2017-08-10 15:52:51 -07:00
SamGondelman
4c55849290
merge from master
2017-08-10 15:43:23 -07:00
SamGondelman
d0d5ac8dd1
switch to stl wherever possible, use bitset instead of unsigned ints
2017-08-10 15:33:55 -07:00
Brad Davis
eb143c42d0
Merge pull request #11168 from sethalves/avatar-url-command-line-flag
...
cancel effects of --replaceAvatarURL when avatar is changed with preference dialog
2017-08-10 15:18:21 -07:00
Seth Alves
1d07bc3b4e
try, try again
2017-08-10 14:32:52 -07:00
Elisa Lupin-Jimenez
b0c91547b4
Fixed WebGL rendering
2017-08-10 14:14:09 -07:00
Seth Alves
ff83a8158b
cancel effects of --replaceAvatarURL when avatar is changed with preference dialog
2017-08-10 13:49:48 -07:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07:00
Anshuman Dewangan
f79bf4e009
High Fidelity Interface rename
2017-08-10 13:40:00 -07:00
Zach Fox
334f71e4fb
Merge pull request #11166 from howard-stearns/commerce-blance-inventory
...
balance and inventory stubs
2017-08-10 13:33:56 -07:00
howard-stearns
8f0fd10e2b
fix
2017-08-10 12:51:05 -07:00
howard-stearns
ca13d58b0b
blance and inventory stubs
2017-08-10 12:44:50 -07:00
Seth Alves
d812c293e8
Merge pull request #11120 from mukulHF/bug-lock-default-scripts
...
Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values
2017-08-10 12:29:23 -07:00
Elisa Lupin-Jimenez
af95d7f892
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-10 10:13:27 -07:00
vladest
b780d4bce3
Merge branch 'master' into modal_dialogs_async
2017-08-10 10:52:35 +02:00
vladest
68e9d335cd
Added async information and critical dialogs
2017-08-10 10:46:06 +02:00
Liv
6bde4db0d7
wrap in marketplace check and change landing point
2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez
a2e407f786
fixed merge conflicts in marketplacesInject.js
2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez
1ac9536f95
Downloading blocks from marketplace in own asset folder
2017-08-09 15:56:07 -07:00
Anthony J. Thibault
4d845bd208
Bug fix for HMD roll causing avatar yaw when standing still
...
HMD roll should only cause the avatar to yaw when actively driving.
2017-08-09 15:52:27 -07:00
Sam Gondelman
85c3f94976
Merge branch 'master' into sharks
2017-08-09 13:36:18 -07:00
howard-stearns
f1ab91edd1
PR feedback
2017-08-09 12:41:16 -07:00
howard-stearns
7414bf0d9a
oops. didn't test what I thought I did
2017-08-09 12:09:03 -07:00
howard-stearns
1cf81495ab
basic commerce infrastructure
2017-08-09 11:50:52 -07:00
Elisa Lupin-Jimenez
17acf0520d
Download from blocks in marketplace working
2017-08-09 11:08:14 -07:00
Liv
0784686450
small typo fix
2017-08-09 10:17:31 -07:00
howard-stearns
9349e72eeb
Merge branch 'master' of https://github.com/highfidelity/hifi into buy
2017-08-09 10:00:36 -07:00
Liv
bd1619b1b2
update error message wording
2017-08-09 09:14:46 -07:00
vladest
616f15864a
Ported an some currently not used code
2017-08-09 14:49:15 +02:00
vladest
556569819d
1st stage of moving to async dialogs
2017-08-09 14:00:19 +02:00
Elisa Lupin-Jimenez
d599753771
Started blocks download catch, fixed a debug typo
2017-08-08 18:43:35 -07:00
SamGondelman
3645bf04b6
possibly fix most annoying crash
2017-08-08 18:10:53 -07:00
Zach Fox
03729bf165
Actually fix context menu
2017-08-08 16:38:12 -07:00
Zach Fox
871a5ff1ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation
2017-08-08 15:53:22 -07:00
Zach Fox
69fc69cffb
Comment fix and overlay click fix
2017-08-08 15:52:59 -07:00
Zach Fox
7d26d2d88b
Switch and fix overlay clicks
2017-08-08 14:29:44 -07:00
Liv
ab8f5c1288
add user logging detail message
2017-08-08 13:55:07 -07:00
SamGondelman
684001a756
workaround deadlock in editRenderState
2017-08-08 11:11:19 -07:00
Liv
3f30162215
Make spawning point not 0,0,0 and change error message
2017-08-08 09:44:36 -07:00
SamGondelman
6d253fcc5f
cleaning up
2017-08-07 18:37:55 -07:00
SamGondelman
42147640e2
remove LaserPointerManager as a dependency
2017-08-07 14:18:56 -07:00
SamGondelman
489e08aef0
Merge branch 'master' of https://github.com/highfidelity/hifi into sharks
2017-08-07 13:29:00 -07:00
Seth Alves
af1e27dc36
Merge pull request #11053 from hyperlogic/feature/secondary-pose-support
...
Improved support for Vive Trackers on biceps
2017-08-07 13:11:48 -07:00
howard-stearns
9bad26c2db
stub files
2017-08-07 12:51:30 -07:00
Zach Fox
07a4beac73
Fix the crash
2017-08-07 10:28:36 -07:00
Liv Erickson
da70071b5a
Merge branch 'master' into feat/domain-setup
2017-08-07 10:04:54 -07:00
Ken Cooke
1fc050fdef
Fix _devices access via shared_ptr
2017-08-07 08:11:43 -07:00
Seth Alves
c570d483d8
Merge pull request #11113 from elisa-lj11/zip_drag
...
Zip drag (needs review)
2017-08-07 03:17:31 -07:00
Seth Alves
8798e47f99
Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes
...
Crash fixes for avatars without Hips, and web overlays
2017-08-06 18:48:07 -07:00
Brad Davis
1ecca9fd29
Merge branch 'master' into zzmp-audio/peak-values
2017-08-06 17:21:00 -07:00
vladest
134bad9534
fixed typo leads to lost touch or mouse release events
2017-08-06 19:09:40 +02:00
SamGondelman
8b1c24e636
added setLockEndUUID, update handControllerGrab and grab
2017-08-04 18:26:11 -07:00
Elisa Lupin-Jimenez
a246c59277
changed debug print for unsupported entity files
2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez
8c9ce82986
Fixed Mac and Ubuntu platform build issue (hopefully)
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557
Renamed isBlocks to isZip, added debug print for non-entity files
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952
Drag zip cleaned up, marketplaces stylized, back button fixed
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
692aa4c4b9
Clara download working again, still can drag in Blocks zip
2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6
Removed extraneous print statements
2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c3d943ff72
Drag zip folder works
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0
Blocks drag does not work yet
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54
Can drag blocks zip folder into hifi and upload the .obj
2017-08-04 16:57:48 -07:00
Anthony J. Thibault
98bbe887b9
Merge branch 'master' into feature/secondary-pose-support
2017-08-04 16:11:13 -07:00
Brad Davis
86e3489167
Updates from Threaded Rendering project
2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub
57f62f59fb
Merge pull request #11110 from Armads/WL21423
...
Camera mode on startup is determined by user settings and HMD status
2017-08-04 13:16:34 -07:00
SamGondelman
bd942ec406
merge from master
2017-08-04 12:17:54 -07:00
Brad Hefta-Gaub
0d0a1af166
Merge pull request #11085 from jherico/script_console_crash
...
Fix for potential crash in JS console
2017-08-04 11:44:20 -07:00
Anthony J. Thibault
9fdc044ae1
Crash fix for web3d overlays that are not the tablet.
2017-08-04 11:19:59 -07:00
Anthony J. Thibault
85500841fb
Crash fix for avatars that are missing "Hips", "Head" and other required joints.
2017-08-04 11:19:09 -07:00
Dante Ruiz
b72ac63662
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-04 17:19:06 +01:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
Armads
dff4e6e32c
WL21423 Changing order of camera setup steps
2017-08-03 15:40:38 -04:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07:00
Armads
24718e2424
WL21423 Camera mode on startup is determined by user settings and HMD status
2017-08-03 09:03:23 -04:00
Dante Ruiz
90db4aa9c0
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-02 18:18:17 +01:00
David Kelly
588afaaa85
unused variable...
2017-08-01 16:59:42 -07:00
Anthony Thibault
8a87ebd2a8
Merge pull request #11036 from AndrewMeadows/walkabout
...
fix bugs preventing avatar from walking on spherical planet
2017-08-01 16:36:35 -07:00
David Kelly
762b409814
unused variable
2017-08-01 16:20:33 -07:00
David Kelly
479d6abc58
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
2017-08-01 16:18:20 -07:00
David Kelly
6ae516c46a
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
2017-08-01 15:45:34 -07:00
anshuman64
9bf4977e09
Merge pull request #11096 from humbletim/21487
...
WL 21487: Fix Camera behavior in Mirror mode
2017-08-01 14:59:06 -07:00
Dante Ruiz
51652482a4
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-01 20:51:56 +01:00
anshuman64
97b4fd4032
Merge pull request #11071 from vladest/fix_menu_landscape
...
Fix Landscape mode, when menu pushed in Create mode
2017-08-01 11:29:15 -07:00
humbletim
3a9b8c02a6
* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror"
...
* restore access to "View > Mirror" from HMD mode
2017-08-01 13:41:28 -04:00
Brad Davis
bea91be521
Fix for potential crash in JS console
2017-07-31 17:50:30 -07:00
David Kelly
43c8079f03
temporary inspectionMode setting to turn ContextOverlays completely off/on
2017-07-31 13:55:43 -07:00
David Kelly
bd7c4b3b26
Merge remote-tracking branch 'upstream/master' into context-overlays
2017-07-31 13:14:53 -07:00
Anthony J. Thibault
2383933252
Merge branch 'master' into feature/secondary-pose-support
2017-07-31 10:55:40 -07:00
Olivier Prat
490aad2a06
Merged from master
2017-07-31 12:00:35 +02:00
humbletim
3bcbec87e0
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-30 16:15:34 -04:00
Brad Davis
7d18d2e017
Restore corrected touch event simulation
2017-07-29 08:51:51 -07:00
vladest
3c9ab36416
Remove already already implemented fix
2017-07-29 12:00:41 +02:00
vladest
0333849aa8
Merge branch 'master' into fix_menu_landscape
2017-07-29 11:44:58 +02:00
Brad Davis
5946a965da
Disable touch event emulation for tablet until we fix crash
2017-07-28 18:54:16 -07:00
Chris Collins
cfd9f8b64e
Merge pull request #11077 from jherico/overlay_event_crashes
...
Fix overlay event handling thread issues
2017-07-28 15:56:09 -07:00
anshuman64
e11388f7f7
Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal
...
Add a "dominant hand changed" signal
2017-07-28 15:17:50 -07:00
Brad Davis
d42052a299
Fix overlay event handling thread issues
2017-07-28 14:56:21 -07:00
Stephen Birarda
17dd028ec7
make Paths available to desktop and tablet QML context
2017-07-28 14:23:18 -07:00
Andrew Meadows
d4e72df928
Merge pull request #10711 from burtsloane/midi
...
Midi support for Entities
2017-07-28 10:51:43 -07:00
Andrew Meadows
3ec9640ea1
fix calculation of walk motor for HMD
2017-07-28 09:22:47 -07:00
vladest
45934cb53e
Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode
2017-07-28 18:04:29 +02:00
Brad Davis
bb57504498
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
2017-07-27 19:39:22 -07:00
David Rowe
c1d179eba1
Add "dominant hand changed" signal
2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub
d572510770
Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
...
update EntityItem bounding cube when on changed dimensions
2017-07-27 18:21:06 -07:00
Brad Hefta-Gaub
9b3be6d164
Merge pull request #10808 from humbletim/21400
...
WL 21400 -- Setting that lets you switch from cursor to reticle
2017-07-27 13:16:58 -07:00
SamGondelman
e3288a9004
fix flicker, scissor warning, and handControllerGrab sphere size
2017-07-27 11:17:30 -07:00
Anthony J. Thibault
bcb4cc32d2
another clang error fix
2017-07-27 10:26:10 -07:00
Anthony J. Thibault
778c8bf9a7
clang build error fix
2017-07-27 10:08:35 -07:00
Anthony J. Thibault
8f5c41af2d
changed _controllerPoseMap from unordered_map to map
2017-07-27 09:44:37 -07:00
Anthony J. Thibault
78c6564174
Merge branch 'master' into feature/secondary-pose-support
2017-07-27 09:09:32 -07:00
Sam Gondelman
fcaa39b245
Merge branch 'master' into sharks
2017-07-26 18:18:09 -07:00
SamGondelman
5e4a83dad9
defaultRenderStates, handControllerGrab.js, fix teleport.js a little
2017-07-26 17:58:39 -07:00
Zach Fox
8a7561d61b
IT'S WORKING SOB SOB SOB
2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357
WHYYYY DOESN'T THIS WORK
2017-07-26 16:14:35 -07:00
Seth Alves
9c9cfad4c4
use ctrl rather than alt to activate camera-mode shortcuts
2017-07-26 15:56:08 -07:00
Seth Alves
71023bcb1b
Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods
2017-07-26 15:54:57 -07:00
Zach Fox
3a05219c59
Closer still
2017-07-26 14:10:41 -07:00
burtsloane
d4ae298a8d
Merge branch 'master' into midi
2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444
Merge branch 'master' of https://github.com/burtsloane/hifi into midi
2017-07-26 13:30:57 -07:00
Zach Fox
65c28ca821
Bugfixes
2017-07-26 13:17:51 -07:00
Zach Fox
62f6c10b2b
Renaming things; bugfixes; improvements
2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22
Silly bug preventing the whole thing from working
2017-07-26 12:08:55 -07:00
Zach Fox
9147bc21d0
Getting there.
2017-07-26 11:41:27 -07:00
Liv
be860d6c87
small string fix
2017-07-26 10:20:29 -07:00
Liv
63d637c4db
Add line to move user back to origin to be near new content
2017-07-26 10:02:21 -07:00
Liv
57b27a7bb7
change packet type to be sourced, change from packet list to single packet
2017-07-25 20:17:20 -07:00
Zach Fox
9020607ccf
First pass
2017-07-25 17:54:46 -07:00
Zach Fox
7702bfceaa
Big cleanup and preparation; Actually fix desktop tablet
2017-07-25 16:12:32 -07:00
SamGondelman
3a8ad8b631
switch to QUuids
2017-07-25 15:11:44 -07:00
SamGondelman
658acd91f2
experimenting with drawHUDLayer depth testing
2017-07-25 14:17:39 -07:00
SamGondelman
0117950546
can edit drawHUDLayer property
2017-07-25 12:57:52 -07:00
Liv
9458e4a1eb
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-07-25 11:32:13 -07:00
Liv
2377e4a5db
fix message formatting
2017-07-25 11:32:02 -07:00
Liv
89a1c7a697
code cleanup
2017-07-25 11:24:57 -07:00
Zach Fox
c71dca5b4b
Missed a magic number
2017-07-25 11:15:44 -07:00
Zach Fox
256b7efdd2
Handle the case when the camera is inside the bounding box of an entity
2017-07-25 11:06:54 -07:00
SamGondelman
3149c3e16c
warnings
2017-07-25 10:16:50 -07:00
Zach Fox
40038ce54b
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
2017-07-25 09:33:07 -07:00
Andrew Meadows
9d1fba3a3b
Merge pull request #10821 from ctrlaltdavid/21418
...
Don't execute body of controllers' plugin update methods if not enabled
2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6
Merge pull request #11029 from cain-kilgore/dominant-hands
...
WL 21453 - Add a "Dominant Hand" setting
2017-07-25 08:01:31 -07:00
SamGondelman
3c8b964cc9
replace setHandLasers with drawHUDLayer overlay property
2017-07-24 18:16:40 -07:00
Liv
32ddffd9c8
Move logic for confirmation into Application.cpp for handling files directly
2017-07-24 18:09:32 -07:00
Cain Kilgore
280a7a7e42
Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning
2017-07-25 01:48:55 +01:00
Seth Alves
766c6f48c3
third person camera is alt+G rather than alt+O
2017-07-24 17:43:01 -07:00
Anthony J. Thibault
33a1d6e225
Merge branch 'master' into feature/secondary-pose-support
2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10
Shoulder puck calibration work in progress
...
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
2017-07-24 17:22:48 -07:00
Zach Fox
c22798a8e6
Offset tablet position to left of screen per feedback
2017-07-24 17:16:07 -07:00
Seth Alves
97756e6140
accidently deleted a break
2017-07-24 16:12:03 -07:00
Seth Alves
82a787a753
use alt+h for mirror-mode
2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65
fix motor direction when walking upside down
...
also maintain worldUp and remove unnecessary cruft
2017-07-24 16:00:13 -07:00
Andrew Meadows
f598b1f1f5
fix spelling typo in comment
2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65
move nextAttitude() from AvatarData to MyAvatar
2017-07-24 16:00:13 -07:00
Andrew Meadows
f0871c6878
avoid unnecessary and expensive gets
2017-07-24 16:00:13 -07:00
Seth Alves
e53badf88b
use alt+f for 1st person camera and alt+o for 3rd
2017-07-24 15:56:37 -07:00
Seth Alves
afc7eaff8d
Merge branch 'bug-camera-mode-mods' of github.com:druiz17/hifi into bug-camera-mode-mods
2017-07-24 15:21:37 -07:00
Zach Fox
223ed5b59a
Hack to mod tablet orientation when clicking context overlay
2017-07-24 14:29:06 -07:00
Andrew Meadows
a44b33ab11
Merge pull request #11023 from jherico/audio_deadlock
...
Fix for audio deadlock & audio device selection
2017-07-24 14:03:29 -07:00
SamGondelman
ee02a0bff4
fix build error
2017-07-24 12:44:54 -07:00
Cain Kilgore
9ff7891c88
Fixed reference error, Gustavo should build now.
2017-07-24 19:56:02 +01:00
Cain Kilgore
64ba159adf
Updating Small Reference
2017-07-24 19:12:14 +01:00
Cain Kilgore
fd2264f7c9
removed duplicate
2017-07-24 19:05:49 +01:00
Cain Kilgore
e6fd85f45a
Some code cleanup
2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9
Changed the Return to a String "left/right" instead.
2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub
0ba8d43522
Merge pull request #10994 from vladest/avatar_default_speeds
...
Change default mouse speeds for avatar
2017-07-24 10:13:27 -07:00
Chris Collins
ceb218f4cc
Merge pull request #10798 from humbletim/add-persistent-console-history
...
Save JS "Console..." history across sessions
2017-07-24 09:24:04 -07:00
Cain Kilgore
a4cf27402d
Tabs and Cleanup of Code
2017-07-24 06:27:14 +01:00
Cain Kilgore
630922dd95
Dominant Hands Branch Initial Commit
...
Adds a new option in the Avatar Basics section of the Avatar Settings.
API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()
Defaults to false (Right Hand). Will return True if set to Left Hand.
2017-07-24 06:18:24 +01:00
humbletim
300b926464
only call QList::constFirst when history list isn't empty
2017-07-23 14:12:52 -04:00
Liv
76cc833747
move domain management into a separate API
2017-07-21 17:44:53 -07:00
Dante Ruiz
06b4c53d28
only desktop mode
2017-07-22 00:15:26 +01:00
Dante Ruiz
7bf3f45e39
finished the locked default scripts
2017-07-21 23:32:25 +01:00
David Kelly
e7c6ba9ae2
unused var
2017-07-21 14:44:45 -07:00
Zach Fox
811be15bbc
Another attmept to fix the tablet
2017-07-21 14:02:19 -07:00
David Kelly
8de09affad
Merge pull request #11025 from davidkelly/dk/contextOverlayPositioning
...
reposition context overlay when far away
2017-07-21 13:35:57 -07:00
Zach Fox
796292dd4c
Fix the tablet
2017-07-21 13:21:13 -07:00
David Kelly
9e31024a0e
merged with new stuff too
2017-07-21 13:16:41 -07:00
Zach Fox
a346e5ccf6
New inspect icon
2017-07-21 11:56:06 -07:00
Zach Fox
a800f6c05a
No magic numbers; Move (i) based on laser hand; Tablet to Tab key
2017-07-21 11:48:19 -07:00
Brad Davis
5b5e94700e
Additional audio fixes
2017-07-21 09:52:44 -07:00
Brad Davis
d1c2218a31
Temporary patch for deadlock
2017-07-21 09:52:36 -07:00
Zach Fox
7d125f44e4
Set parentID even when overlay already exists
2017-07-21 09:35:49 -07:00
vladest
33a8ab2d58
Adjusted according discussion in PR
2017-07-21 18:18:23 +02:00
Dante Ruiz
e2359f6bb9
changes api call
2017-07-21 17:15:31 +01:00
vladest
b13cbd5bde
Merge branch 'master' into avatar_default_speeds
2017-07-21 17:45:11 +02:00
Olivier Prat
7bc7b1eabc
Merge branch 'master' of git://github.com/highfidelity/hifi into fade2
2017-07-21 09:27:30 +02:00
anshuman64
5f3b68d544
Use ctrl+H instead of alt+H
2017-07-20 17:36:02 -07:00
Dante Ruiz
649b974927
mods for changes camera views
2017-07-21 01:01:23 +01:00
Zach Fox
e68f9499fa
Add hover/unhover handlers to context overlays
2017-07-20 16:51:00 -07:00
Andrew Meadows
a8dac0cb79
don't send constant updates for grabbed objects
2017-07-20 15:45:50 -07:00
Zach Fox
3698fe9b6b
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
2017-07-20 15:10:06 -07:00
David Kelly
c8015e4eb6
cleanup, fixed build issue
2017-07-20 14:52:58 -07:00
David Kelly
c1de09c7f6
whitespace issue
2017-07-20 14:24:16 -07:00
David Kelly
10503c3a16
registration point
2017-07-20 14:18:07 -07:00
SamGondelman
c7f0f03fce
expanded RayPick JS API
2017-07-20 13:53:39 -07:00
Dante Ruiz
3c862c34b2
disable reload default scripts by default
2017-07-20 21:15:00 +01:00
Zach Fox
e18fec140a
Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2
2017-07-20 13:03:34 -07:00
Zach Fox
a1a7ab945a
Make dimensions better
2017-07-20 12:58:15 -07:00
SamGondelman
d156680bc8
ignore/include by ID, simplified caching logic
2017-07-20 12:15:06 -07:00
Zach Fox
f515a24568
UX improvements
2017-07-20 12:00:13 -07:00
David Kelly
b7be727b4c
turn off ContextOverlay for pal, edit. Improve clicks too
2017-07-20 11:30:55 -07:00
David Kelly
0544c1e561
build issue
2017-07-20 08:18:37 -07:00
David Kelly
110efd63c8
enabled property so we can turn it off during edit, etc...
2017-07-20 08:08:49 -07:00
David Kelly
b236a21adc
no clicks on 'highlight' overlay
2017-07-20 07:28:45 -07:00
SamGondelman
bf243d6025
lockEnd, editRenderState, and updated grab.js
2017-07-19 17:45:21 -07:00
David Kelly
0023832938
simple fixes
2017-07-19 17:38:19 -07:00
David Kelly
ebce1ce9de
Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting
2017-07-19 17:13:11 -07:00
Zach Fox
2dce254928
Actually increase target size
2017-07-19 17:11:45 -07:00
David Rowe
091b666d7e
Fix noise reduction checkbox not always working
2017-07-20 12:06:19 +12:00
David Kelly
40ec770bc1
Highlight using simple yellow bounding box
2017-07-19 17:06:17 -07:00
David Kelly
920ac17caf
minor renaming
2017-07-19 15:46:28 -07:00
David Kelly
5f82a76cc9
Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/marketplaceItemsOnly
2017-07-19 15:41:36 -07:00
David Kelly
ecd419e0d3
cr feedback
2017-07-19 15:32:03 -07:00
Zach Fox
4374d4d1e5
Small improvements to overlay
2017-07-19 15:27:48 -07:00
David Kelly
44c9f0e65e
Overlay appears only on marketplace items
2017-07-19 15:13:26 -07:00
David Kelly
f0091f16a1
cr feedback
2017-07-19 14:46:10 -07:00
David Kelly
a8ab115b12
Open marketplace when we know the marketplaceID of an entity
2017-07-19 14:11:14 -07:00
SamGondelman
912b417dd4
mouse ray pick
2017-07-19 13:56:18 -07:00
Zach Fox
c866bd814d
Make clicks work right
2017-07-19 12:24:20 -07:00
SamGondelman
c6b3f69db0
teleport third eye laser on invalid hand pose
2017-07-19 11:51:31 -07:00
Zach Fox
f06ec715f2
Quick bugfix
2017-07-19 09:59:44 -07:00
Zach Fox
1d26a268c1
Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay
2017-07-19 09:53:51 -07:00
Zach Fox
761d35d633
Getting there!
2017-07-18 17:10:23 -07:00
Zach Fox
8f6af3a1ab
ContextOverlay
2017-07-18 16:28:24 -07:00
Zach Fox
265f978a06
It's working!
2017-07-18 15:57:26 -07:00
vladest
4b94d24c29
Change default mouse speeds for avatar
2017-07-18 23:51:19 +02:00
Zach Fox
084f4d2ab0
Why were Web3DOverlays done this way?
2017-07-18 14:42:59 -07:00
humbletim
f9e0e616f7
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-18 17:34:39 -04:00
humbletim
190e1ac7d9
move/scope viewOrientation into the related code block
2017-07-18 17:22:16 -04:00
Zach Fox
2b1a0921da
Initial work on clickable overlays
2017-07-18 14:01:16 -07:00
Brad Davis
1aee8f1f4d
Ensure we continue calling idle when minimized
2017-07-18 13:44:58 -07:00
SamGondelman
55a025b827
initial code review
2017-07-18 12:43:34 -07:00
Chris Collins
e99683fdcf
Merge pull request #10985 from jherico/audio_deadlock
...
Trying to resolve QML / Audio deadlocks
2017-07-18 12:40:03 -07:00
SamGondelman
298faa9f0f
threading pass
2017-07-18 12:13:16 -07:00
Dante Ruiz
976fec66f8
fixed loading script whitespace
2017-07-18 17:59:42 +01:00
Brad Hefta-Gaub
2dfaf7b02a
Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
...
Case 5783: Restarting Interface allows you to have Avatar Scale Too Big
2017-07-18 08:51:13 -07:00
Brad Hefta-Gaub
d94365cc44
Merge pull request #10979 from zfox23/hoverOverlay_lasers
...
Create/Destroy Hover Overlays using hand controller lasers
2017-07-18 08:44:48 -07:00
Olivier Prat
d055b1aa8e
Merge branch 'fade' into fadeshape
2017-07-18 14:48:28 +02:00
Olivier Prat
9130c51319
Fixed incorrect removal of ALL avatar fade events. Fade out should now work again when avatar leaves domain
2017-07-18 14:46:49 +02:00
Olivier Prat
2bba6aa816
Revert "Removed all bubble fade event code on avatar side"
...
This reverts commit 4b8545e8b5
2017-07-18 14:07:07 +02:00
Olivier Prat
236270d798
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape
2017-07-18 10:47:21 +02:00
Olivier Prat
4b8545e8b5
Removed all bubble fade event code on avatar side
2017-07-18 10:04:08 +02:00
NeetBhagat
ff51fa7199
Resolved review comments.
2017-07-18 10:42:01 +05:30
Brad Davis
d43432bd71
Cleanup dead code, fix startup behavior
2017-07-17 18:54:52 -07:00
Zach Fox
67c8ddfd57
Merge in changes from laser PR
2017-07-17 17:09:40 -07:00
Zach Fox
96f52a9812
First pass at getting overlays to show up on hover
2017-07-17 17:05:16 -07:00
Brad Davis
aab56cf2a9
Trying to resolve QML / Audio deadlocks
2017-07-17 16:21:28 -07:00
SamGondelman
0c8c6ff5d6
silly me
2017-07-17 15:05:31 -07:00
SamGondelman
7084a0607a
fix warnings
2017-07-17 14:26:22 -07:00
utkarshgautamnyu
758ae9825d
Merge pull request #10939 from highfidelity/bug/6118
...
Record total number of ATP/HTTP/File bytes downloaded during session
2017-07-17 13:53:21 -07:00
Zach Fox
974dff36b0
Make hover overlays work for hand controller lasers
2017-07-17 13:16:53 -07:00
Zach Fox
aadf407842
Merge pull request #10978 from zfox23/hoverOverlayInterface
...
New HoverOverlayInterface skeleton
2017-07-17 13:16:32 -07:00
SamGondelman
ae99be0350
added faceAvatar and centerEndY, working on updating teleport.js, style fixes
2017-07-17 13:07:42 -07:00
humbletim
9c610f52ec
switch history file format to JSON
2017-07-17 15:34:41 -04:00
Olivier Prat
0123e2936b
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-17 11:44:10 +02:00
SamGondelman
af12b5a4bf
can create static laser pointers, fixed a bug with multiple render states
2017-07-14 18:35:27 -07:00
Zach Fox
e602d3610e
Initial commit for HoverOverlayInterface
2017-07-14 17:26:53 -07:00
SamGondelman
8f533636f5
c++ side laserpointer rendering with renderstates
2017-07-14 11:13:40 -07:00
Zach Fox
a9197509d8
Merge pull request #10965 from CainFoool/avatar-scaler
...
WL 21422 - Add a scale slider for avatar size
2017-07-14 10:30:33 -07:00
Andrew Meadows
9584035aa4
Merge pull request #10886 from 1P-Cusack/21420
...
[Worklist #21420 ] Implement Create button disabled state (details below).
2017-07-14 10:06:45 -07:00
Seth Alves
741feb7e54
Merge pull request #10951 from druiz17/tablet-modal-fixes
...
Allow the tablet to be closed when a modal dialog is open.
2017-07-14 09:40:58 -07:00
SamGondelman
6f970fd7a0
Merge remote-tracking branch 'upstream/master' into sharks
2017-07-14 09:37:11 -07:00
Cain Kilgore
b7ed3ce659
Prettified the Comment
2017-07-14 17:33:17 +01:00
Cain Kilgore
ee1f371902
Fixed step counted not resetting to 1 properly
2017-07-14 16:29:19 +01:00
Olivier Prat
82da9fb537
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-14 17:28:35 +02:00
Anthony J. Thibault
c85e187c61
first stab at secondary target pose support
2017-07-13 18:12:33 -07:00
SamGondelman
3c719b26b1
working on renderstates
2017-07-13 17:43:44 -07:00
Cain Kilgore
4f8d958831
Some code cleaning, added comment for reasoning of specifying min and max in the qml
2017-07-14 00:56:42 +01:00
SamGondelman
3a35cd128f
fix dirOffset, expose intersection type to JS
2017-07-13 16:09:21 -07:00
Cain Kilgore
72c3e789e9
More Spaces!
2017-07-13 23:42:20 +01:00
Anthony J. Thibault
fe711ccbe9
Refactored how controller poses are stored in MyAvatar.
2017-07-13 15:01:14 -07:00
SamGondelman
783750a0bc
update jointraypicks from joints, dirOffset needs work
2017-07-13 14:47:24 -07:00
Olivier Prat
b125fba2e1
Removed untested avatar bubble fade code. Made changes as requested by Andrew
2017-07-13 23:04:55 +02:00
Howard Stearns
17fcfad957
Merge pull request #10875 from highfidelity/spectator-camera
...
Spectator Camera
2017-07-13 13:57:18 -07:00
Olivier Prat
b68ec4f933
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-13 22:36:52 +02:00
Cain Kilgore
f91a8c0f53
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler
2017-07-13 21:25:39 +01:00
Cain Kilgore
677b177dce
Build error fix
2017-07-13 20:29:52 +01:00
Cain Kilgore
5329c1ce42
Fixed Indentation, removed old debug code
2017-07-13 19:23:28 +01:00
Cain Kilgore
521babb6bd
Avatar Scaler - should be PR Ready.
2017-07-13 19:18:51 +01:00
Dante Ruiz
03fbd2a1e6
fixed another warning
2017-07-13 19:12:34 +01:00
Seth Alves
59d88cb564
Merge pull request #10941 from sethalves/audio-injector-smart-pointers
...
Audio injector smart pointers
2017-07-13 11:00:02 -07:00
Dante Ruiz
b46dc7d389
removed space
2017-07-13 18:42:26 +01:00
Dante Ruiz
3cbfd4c917
Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes
2017-07-13 18:40:54 +01:00
Dante Ruiz
070db2922d
fixed warning compile error
2017-07-13 18:40:38 +01:00
Brad Hefta-Gaub
b063c2f45d
Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission
...
Cleanup OctreeSendThread::packetDistributor()
2017-07-13 09:58:28 -07:00
NeetBhagat
11f8f5cffc
Solve : implicit conversion from ‘float’ to ‘double’ issue
2017-07-13 18:26:52 +05:30
Olivier Prat
edcfecd5d4
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-13 11:05:14 +02:00
Olivier Prat
2d2722bfc5
Added async transition query on scene
2017-07-13 11:05:04 +02:00
SamGondelman
916a99c670
added JS/C++ RayPickResult, working on RayPickManager::update
2017-07-12 17:12:25 -07:00
David Kelly
4b3cf5ee2e
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreviewFix
2017-07-12 16:50:51 -07:00
David Kelly
88a449c1af
Fixes hmd preview when resizing
2017-07-12 16:49:26 -07:00
SamGondelman
ea65a04f28
expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing)
2017-07-12 14:20:39 -07:00
SamGondelman
3ac369d782
framework for LaserPointers and abstracted RayPicking on C++ side, including JS API
2017-07-12 14:20:39 -07:00
Zach Fox
8553277c56
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-12 14:18:50 -07:00
Cain Kilgore
43782a29c7
Avatar Scaler - WIP
2017-07-12 22:04:58 +01:00
Seth Alves
59ad3d50ec
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
2017-07-12 12:45:58 -07:00
Seth Alves
ddf2312dc6
code review
2017-07-12 12:45:52 -07:00
Ken Cooke
50deee1d38
Replace tabs with spaces
2017-07-12 12:29:25 -07:00
Zach Fox
bd4fe416b4
Cleanup; no magic numbers for default cam params
2017-07-12 12:08:36 -07:00
Zach Fox
9fe6fbd811
View frustums are strange.
2017-07-12 11:37:18 -07:00
utkarshgautamnyu
6b969bc39d
added code to record total number of ATP/HTTP/File bytes downloaded during session
...
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update Application.cpp
Update Application.cpp
2017-07-12 11:13:13 -07:00
Andrew Meadows
364600c447
fix rendering of simulation ownership debug icons
2017-07-12 11:12:47 -07:00
Zach Fox
79cf242fc9
Make far clip plane distance equal to main camera's
2017-07-12 10:51:14 -07:00
Stephen Birarda
f6d9a79fb5
Revert "Revert "fix for invisible avatars after radius ignore""
2017-07-12 10:36:53 -07:00
Olivier Prat
0f60cca617
Merged cleaned up fader branch from Sam
2017-07-12 18:09:17 +02:00
Dante Ruiz
12206cf711
Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes
2017-07-12 16:56:25 +01:00
Sam Gateau
5394ac8672
Cleaning up changes, removing comments and dead code etc...
2017-07-12 17:33:05 +02:00
Olivier Prat
2f9885870b
First merge with Sam's fader branch with custom pipeline support in shape plumber
2017-07-12 17:29:21 +02:00
Sam Gateau
258f1654f2
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2017-07-12 14:14:27 +02:00
Tingjin
80916b62bb
Remove unnecessary code
...
Remove two lines of unnecessary code.
2017-07-11 20:52:28 -07:00
Seth Alves
c52e7e180a
use const AudioInjectorPointer& in some places
2017-07-11 19:42:03 -07:00
Seth Alves
dbd46fc4b8
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
2017-07-11 17:48:29 -07:00
Dante Ruiz
bedd0628b9
allowed tablet to toggle when a dialog is open
2017-07-12 00:51:07 +01:00
Zach Fox
d786820670
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-11 16:16:37 -07:00
Andrew Meadows
782155e9ea
Merge pull request #10876 from Atlante45/fix/ac-crash
...
Fix AC crash (buffer overflow)
2017-07-11 14:26:08 -07:00
Seth Alves
ead461dca7
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
2017-07-11 14:25:12 -07:00
Seth Alves
3670a04d8e
switch bare pointers to AudioInjector objects to be QSharedPointers
2017-07-11 14:24:58 -07:00
Dante Ruiz
2f192fd48a
added scroll fix for qt 5.6
2017-07-11 21:19:06 +01:00
Dante Ruiz
01ca192613
fixed tablet scrolling
2017-07-11 21:16:13 +01:00
Olivier Prat
7552cca316
First alpha version of bubble collision fade events. Missing a lot of information.
2017-07-11 19:26:15 +02:00
NeetBhagat
e08e9d6821
The current scale of avatar should not be more than domain's max_avatar_scale and not less than domain's min_avatar_scale.
2017-07-11 20:42:00 +05:30
Olivier Prat
381e0c64a8
Working avatar fade in / fade out except that it is also triggered on bubble collisions
2017-07-11 16:43:27 +02:00
NeetBhagat
1a47383d4f
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-11 19:23:46 +05:30
Sam Gateau
1f2f539507
Merge branch 'orange' of https://github.com/samcake/hifi into hobbes
2017-07-11 10:26:26 +02:00
Ken Cooke
d6eb731f3a
Merge branch 'master' into audio/peak-values
2017-07-10 21:55:11 -07:00
David Kelly
fcf4bfd59a
spacing issue
2017-07-10 13:25:33 -07:00
David Kelly
b87d69b15d
Insure spectator camera preview is up when reopening tablet
2017-07-10 13:16:08 -07:00
Seth Alves
d957b970dd
Merge pull request #10918 from misslivirose/feat-add-skeleton-changed-signal
...
Add signal for avatar skeleton changing
2017-07-10 11:35:24 -07:00
David Kelly
4843b91f47
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-10 09:50:17 -07:00
Andrew Meadows
96b88dccd7
Merge pull request #10913 from samcake/orange
...
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
2017-07-10 09:46:09 -07:00
Sam Gateau
746812ff78
Merging with origin orange
2017-07-10 17:25:13 +02:00
NeetBhagat
378e85e9b2
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-10 18:29:04 +05:30
NeetBhagat
dd2dbd9b39
Initial Commit to resolve problem :> When Max Avatar scale is set in Sandbox -> setting, take that value as default max value
2017-07-10 18:26:33 +05:30
Sam Gateau
4edea433ce
Rename the _pipeline into _shapePipeline in the render::Args
2017-07-10 12:16:53 +02:00
Brad Davis
8043caa9e9
Merge pull request #10925 from jherico/overlay_performance
...
Fix terrible script performance when rendering load is too high
2017-07-08 14:19:14 -07:00
Brad Davis
cd11f5cfa6
More tweaks for improved script performance
2017-07-07 22:02:56 -07:00
Brad Davis
148eece065
Tweak frame timing to avoid overloading the main thread
2017-07-07 21:00:33 -07:00
Brad Davis
7e9ea596a0
Add more efficient overlay getters, don't use blocking calls
2017-07-07 21:00:31 -07:00
Zach Fox
d0c521d7b4
Add clarifying comment.
2017-07-07 19:19:48 -07:00
Stephen Birarda
420e9233b6
Revert "fix for invisible avatars after radius ignore"
2017-07-07 16:50:28 -07:00
Stephen Birarda
f07ce6d294
Merge pull request #10835 from birarda/bug/invisible-avatars
...
fix for invisible avatars after radius ignore
2017-07-07 16:06:44 -07:00
Zach Fox
e537c494e5
Prevent Image3DOverlays from drifting
2017-07-07 16:04:08 -07:00
Zach Fox
dbb48cd1aa
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-07 16:03:04 -07:00
Zach Fox
3d14d3755e
Merge pull request #10898 from 1P-Cusack/21425
...
Add View->Enter First Person Mode in HMD checkbox.
2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5
Merge pull request #10878 from mnafees/21355
...
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab
Default 'Enter First Person Mode in HMD' to true.
2017-07-07 15:35:32 -04:00
Liv
060e3a9c5a
Add signal for avatar skeleton changing
2017-07-07 11:48:12 -07:00
Olivier Prat
06d69d04c3
TransitionStage + FadeJob compiling but not linked to entity events
2017-07-07 18:22:11 +02:00
Seth Alves
81cc46beb4
Merge pull request #10909 from jherico/overlay_crashes
...
Fixing overlay crashes, for real
2017-07-07 07:11:52 -07:00
Sam Gateau
d15c4ea2d3
Merging with the stage branch
2017-07-07 15:12:40 +02:00
Sam Gateau
156c20d01e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-07-07 10:58:05 +02:00
NeetBhagat
685b1c2445
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-07 11:30:54 +05:30
Brad Davis
f8b76d65ab
Fixing overlay crashes, for real
2017-07-06 18:01:26 -07:00
druiz17
b4182fe7ac
Merge pull request #10899 from druiz17/calibration-update-2.0
...
Updates to the Calibration UI
2017-07-06 14:24:45 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
LaShonda Hopper
85111131da
[Worklist #21420 ] Resolves issue where domain changes didn't refresh the icon (details below).
...
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
modified: interface/src/Application.cpp
modified: scripts/system/edit.js
2017-07-06 15:27:15 -04:00
Dante Ruiz
9e4b5693c7
fixed merge conflicts
2017-07-06 18:49:46 +01:00
anshuman64
e384f6d1b7
Merge pull request #10866 from druiz17/vive-in-desktop
...
Allowing Vive controllers and trackers to be used in desktop mode
2017-07-06 10:40:56 -07:00
Stephen Birarda
916f57772b
default the UAL off for all targets, enable manually for Interface
2017-07-06 10:21:07 -07:00
Zach Fox
ee86638c4e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-06 09:58:00 -07:00
David Kelly
1ccf0da7d8
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
...
redo cache switch
2017-07-06 09:53:01 -07:00
Andrew Meadows
4fad9d9b1a
Merge pull request #10858 from jherico/trace_cores
...
Additional threaded tracing of CPU cores
2017-07-06 08:23:21 -07:00
Olivier Prat
018c0489f4
Merged with 21378
2017-07-06 16:53:47 +02:00
Sam Gateau
53ffca796f
Drafting a better SHape plumber to render the items
2017-07-06 16:35:40 +02:00
David Kelly
936c21e849
remove unnecessary cacheDir member
2017-07-06 07:24:58 -07:00
David Rowe
cfd155c198
Merge branch 'master' into 21418
2017-07-06 16:56:10 +12:00
Atlante45
95abbd0ad4
Prevent Interface from trying to send packets bigger than an MTU
2017-07-05 17:08:04 -07:00
David Kelly
4a22fbca1b
redo cache switch
2017-07-05 17:01:31 -07:00
Brad Davis
7f1bc07d04
Trying to fix overlay crashes again
2017-07-05 14:30:01 -07:00
David Kelly
89c05244bf
remove unnecessary extra update() calls
2017-07-05 13:24:31 -07:00
David Kelly
85813ac908
render issue fixes
2017-07-05 11:29:34 -07:00
Dante Ruiz
b86a8b8338
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
2017-07-05 18:27:33 +01:00
Zach Fox
44cb48b17d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-05 09:59:57 -07:00
NeetBhagat
440b941730
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-05 18:47:13 +05:30
Mohammed Nafees
eb354a4333
Cleanup menu shortcut keys
2017-07-05 14:50:48 +05:30
Olivier Prat
5cee2cff9f
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-07-04 17:48:07 +02:00
Seth Alves
fad686571a
Merge pull request #10874 from jherico/overlay_mutex
...
Restore mutex in overlay interface
2017-07-03 17:25:42 -07:00
Zach Fox
fcc131187d
Merge pull request #10856 from zfox23/spectatorCamera_positionSpeedup
...
Spectator Camera position/orientation update speedup
2017-07-03 16:44:12 -07:00
David Kelly
36467983d8
cr stuff
2017-07-03 16:29:26 -07:00
David Kelly
2a3b4b3bfb
minor cleanup, and adjusted includes per austin's suggestion
2017-07-03 15:54:54 -07:00
David Kelly
99bf100ff8
fix for jitter and not rendering in tablet
2017-07-03 15:19:04 -07:00
Brad Davis
97edbb7f37
Restore mutex in overlay interface
2017-07-03 14:49:57 -07:00
David Kelly
5f015ec77f
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-07-03 13:57:25 -07:00
David Kelly
045b009b00
Merge branch 'dk/spectatorCameraPreview' of https://github.com/davidkelly/hifi into dk/spectatorCameraPreview
2017-07-03 13:57:05 -07:00
Brad Davis
6c86c297cb
Don't use a blocking connection for a high-frequency function like editOvleray
2017-07-03 12:40:52 -07:00
1P-Cusack
38baeabbe5
Add View->Enter First Person Mode in HMD checkbox.
...
When checked, changing to an HMD display will switch the user to first
person mode. WL 21425.
2017-07-03 15:21:40 -04:00
Zach Fox
9c96cf811e
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_positionSpeedup
2017-07-03 10:33:55 -07:00
Zach Fox
9411c2e732
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-03 10:24:02 -07:00
Seth Alves
70a7b302fc
Merge pull request #10860 from jherico/deadlock_guards
...
Don't use blocking connections on the main thread
2017-07-03 09:05:56 -07:00
humbletim
9053531bda
fix missing viewPosition + offset
2017-07-03 12:03:46 -04:00
humbletim
026e05f80c
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-03 11:55:59 -04:00
Olivier Prat
d9a83539b2
Merged with master
2017-07-03 15:32:30 +02:00
David Kelly
073eae39b2
timer now resumes when visible again
2017-06-30 18:44:32 -07:00
Dante Ruiz
6f30cb1825
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
2017-07-01 00:48:49 +01:00
David Rowe
07697c5083
Merge branch 'master' into 21418
...
# Conflicts:
# interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
# interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
Removed stray "Vive Controller Picks" configuration item which no longer exists.
2017-07-01 11:19:00 +12:00
David Kelly
455233dc16
black background when camera is off
2017-06-30 16:08:40 -07:00
Dante Ruiz
577969481d
head puck working
2017-06-30 23:43:12 +01:00
Zach Fox
7851c8002f
Remove unnecessary guard
2017-06-30 15:25:33 -07:00
Zach Fox
36dfff78e2
Emit qDebug() error when trying to change position or orientation while attachedEntityId is defined
2017-06-30 15:13:31 -07:00
Ryan Downe Karpf
ddce264dd9
Merge pull request #10819 from Menithal/21387
...
WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2
2017-06-30 14:57:04 -07:00
Brad Davis
31d2c9980e
Merge pull request #10797 from ctrlaltdavid/21396
...
Make Leap Motion a plugin
2017-06-30 14:37:23 -07:00
David Kelly
09d959bdeb
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-30 14:16:01 -07:00
Zach Fox
9bd80ec2bf
Improve naming and API
2017-06-30 14:07:00 -07:00
David Kelly
133af0b522
jittery, still not working in tablet
2017-06-30 12:55:11 -07:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Zach Fox
f765b4136d
Cleanup
2017-06-30 10:12:47 -07:00
Zach Fox
5ceb80b3e7
It's working!
2017-06-30 10:12:46 -07:00
Zach Fox
8d89ea75f5
Initial commit
2017-06-30 10:12:46 -07:00
Brad Davis
8372d73fec
Additional thread safety
2017-06-30 09:15:06 -07:00
NeetBhagat
5ff0bc409b
solve the bug : Avatar scale value should be 3.0 ,if user has set scale value > 3.0 previously .
2017-06-30 15:40:38 +05:30
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Zach Pomerantz
631e5a7b04
add override to AudioInputDeviceList::newDevice
2017-06-29 17:34:01 -04:00
Menithal
bf0a8e0f91
Updated Comment
2017-06-29 23:18:52 +03:00
Brad Davis
8ec20ef042
Additional tracing of CPU cores
2017-06-29 13:16:15 -07:00
David Kelly
02b712716b
testing some rendering issues...
2017-06-29 11:12:10 -07:00
Zach Fox
00966966df
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-29 10:13:11 -07:00
Zach Fox
3170bdd08c
Merge pull request #10837 from samcake/flash
...
Fix projection & lighting issues identified with 2nd rendering pipeline
2017-06-29 10:12:03 -07:00
Sam Gateau
ca7e782566
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-29 10:54:27 +02:00
Sam Gateau
b766c256db
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-29 10:29:05 +02:00
Thijs Wenker
e781f97ddc
Merge pull request #10846 from sethalves/fix-server-scripts-more
...
make ResourceManager be owned by DependencyManager
2017-06-28 17:05:30 -07:00
Howard Stearns
3606418a22
Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug
...
minor fix for --scripts switch
2017-06-28 16:11:18 -07:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
David Kelly
48de8011b2
cr feedback
2017-06-28 14:15:29 -07:00
howard-stearns
3293b4c898
Merge branch 'master' of https://github.com/highfidelity/hifi into merge-from-master-6-28-2pm
2017-06-28 13:53:32 -07:00
Patrick Manalich
cb52122726
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera_clean-up
2017-06-28 12:40:36 -07:00
David Kelly
b73102d063
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-28 08:57:04 -07:00
Sam Gateau
93963b3257
Apply the projection and deferred transform fixes found while working on spectator camera
2017-06-28 15:44:17 +02:00
Sam Gateau
37e5454421
Fix lighting issues identified with 2nd rendering pipeline
2017-06-28 15:12:20 +02:00
Olivier Prat
b76a8a6f9b
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-06-28 14:37:03 +02:00
Sam Gateau
1e2b0ca91c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-28 10:21:05 +02:00
Menithal
ffd9ee2908
More appeasement of GNU C Compiler warnings
2017-06-28 07:09:15 +03:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
David Kelly
9417a176a1
make scripts tree show scripts in directory passed in with --scripts
2017-06-27 18:10:54 -07:00
Stephen Birarda
9e822de196
remove local collection of radius ignored nodes
2017-06-27 17:41:07 -07:00
Zach Pomerantz
5353437f59
add peakValues to scripting API
2017-06-27 17:51:45 -04:00
Menithal
24616f150f
Appeasing the Linux gods
2017-06-28 00:37:18 +03:00
Patrick Manalich
6d0b853668
Comment structure changes for compacting
2017-06-27 14:34:01 -07:00
David Kelly
01155ba4e3
this handles redirecting ktx_cache, data8, prepared
2017-06-27 08:47:54 -07:00
Sam Gateau
63835d0863
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-27 14:24:55 +02:00
David Kelly
564d935065
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/cacheSwitch
2017-06-26 13:32:02 -07:00
Menithal
0a0e40e182
Removed Redudant qualification from heade:>r
2017-06-26 23:04:48 +03:00
Menithal
232382e6d0
21387: Fixed issue with av scaling via script
2017-06-26 19:52:11 +03:00
Seth Alves
2f2a13ec27
Merge pull request #10799 from jherico/object_parent_warnings
...
Fix warnings about creating QObjects with parents in different thread
2017-06-26 09:39:29 -07:00
Olivier Prat
1bb0d51849
Merged with master
2017-06-26 11:55:46 +02:00
Sam Gateau
75e457ce7c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-26 10:05:04 +02:00
David Rowe
31714675c3
Remove unused Sixense preference and associated methods
2017-06-26 16:14:57 +12:00
David Rowe
bed0e8ef87
Merge branch 'master' into 21396
...
# Conflicts:
# interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12:00
Menithal
359642eb0e
Refining and allowing for Avatar Scale to be saved as well
2017-06-25 23:55:47 +03:00
Menithal
d43d8ae846
Removed Old Comments
2017-06-25 22:01:14 +03:00
Menithal
f811971a42
Avatar Bookmarking
2017-06-25 21:57:07 +03:00
Seth Alves
9ae390853c
Merge pull request #10814 from jherico/linux_fix_static_plugins
...
Fix static plugin initialization on Linux
2017-06-25 08:17:16 -07:00
anshuman64
8d5bdd2d84
Merge pull request #10730 from hyperlogic/feature/pole-vector
...
Pole vector support for elbow and knee joints
2017-06-24 23:08:22 -07:00
Bradley Austin Davis
960017ddd7
Fix static plugin initialization on Linux
2017-06-24 22:22:47 -07:00
samcake
77650ac1b3
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-23 20:10:35 -07:00
humbletim
c10475186c
add support for switching cursor from arrow to reticle
2017-06-23 18:48:29 -04:00
Seth Alves
43ba5f3772
Merge pull request #10800 from hyperlogic/bug-fix/eyes-forward
...
Fix for eye direction when no look at targets are present.
2017-06-23 14:32:21 -07:00
David Rowe
6e266dfbac
Merge branch 'master' into 21396
2017-06-24 09:19:12 +12:00
humbletim
f6262ad54d
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-06-23 16:37:10 -04:00
samcake
17e2140826
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-23 13:28:58 -07:00
Brad Davis
f1fe4ed7cc
Merge pull request #10804 from jherico/fix_deps_3
...
Remove dependency between codec plugins and UI
2017-06-23 12:51:35 -07:00
Brad Hefta-Gaub
dc649e84df
Merge pull request #10792 from jherico/qml_crashes
...
Trying to fix QtQml/QtScript crashes
2017-06-23 12:41:43 -07:00
Brad Davis
fe7d4b1d23
Remove dependency between codec plugins and UI
2017-06-23 12:25:18 -07:00
David Kelly
bda50af780
this uses qt's test location for AppData/Local, but leaves Roaming alone
2017-06-23 11:06:48 -07:00
Anthony J. Thibault
8f89ef0931
Fix for eye direction when no look at targets are present.
2017-06-23 10:52:23 -07:00
Brad Davis
416852c0cd
Fix warnings about creating QObjects with parents in different thread
2017-06-23 10:19:16 -07:00
David Kelly
04160f2ca1
switch to change ktx_cache directory (only)
2017-06-23 09:19:41 -07:00
humbletim
35f27313ba
persist command history to data folder; fix warning message color
2017-06-23 12:05:44 -04:00
David Kelly
63279f4525
Merge pull request #10790 from davidkelly/dk/scriptsSwitch
...
Command line switch to override default scripts location
2017-06-23 08:53:40 -07:00
druiz17
91ce9235ea
Merge pull request #10747 from zzmp/audio/select-log
...
Log audio selections
2017-06-23 07:54:03 -07:00
Zach Pomerantz
a82cc0ec09
retab
2017-06-23 09:35:48 -04:00
David Rowe
9d0407cbdf
Merge branch 'master' into 21396
2017-06-23 16:52:04 +12:00
David Rowe
b26f5c5811
Clear finger joints when finger poses no longer being updated
2017-06-23 16:15:40 +12:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
David Rowe
8682cee17a
Refactoring
2017-06-23 11:33:29 +12:00
David Kelly
06d1ac8bf7
Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch
2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785
new --scripts switch overrides default scripts location
2017-06-22 14:09:05 -07:00
Andrew Meadows
62e862fef0
Merge pull request #10733 from Menithal/21384
...
21384: Added Support to Disabling flight from client side
2017-06-22 13:38:01 -07:00
Anthony J. Thibault
79d9bbe6c5
Merge branch 'master' into feature/pole-vector
2017-06-22 13:37:55 -07:00
samcake
96a10d2e95
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-22 09:32:49 -07:00
David Kelly
34edd95926
Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch
...
new switches to override avatarURL
2017-06-22 07:11:29 -07:00
David Kelly
5da01f0074
updated comments
2017-06-22 07:09:24 -07:00
David Rowe
6ff8aed5e3
Merge branch 'master' into 21396
2017-06-22 23:54:15 +12:00
David Rowe
c54a5d8506
Tidying
2017-06-22 23:32:16 +12:00
David Rowe
3bdf267900
Implement fingers control
2017-06-22 23:32:06 +12:00
samcake
9ae2861ee6
Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements
2017-06-21 18:29:38 -07:00
Seth Alves
c70365d04a
Merge pull request #10729 from druiz17/hand-pucks
...
Hand pucks and Calibration UI
2017-06-21 18:10:15 -07:00
samcake
2919607f86
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-21 17:20:44 -07:00
Howard Stearns
ea5b074f6e
Merge pull request #10758 from howard-stearns/event-installer-interface-options
...
Event installer interface options
2017-06-21 16:46:06 -07:00
David Kelly
92cbb86e8b
remove debugging
2017-06-21 16:09:08 -07:00
David Kelly
94a33fea94
new switches to override avatarURL
2017-06-21 16:03:05 -07:00
Anthony J. Thibault
2dcca2125b
Merge branch 'master' into feature/pole-vector
2017-06-21 15:50:03 -07:00
Chris Collins
f3ae1d8078
Merge pull request #10750 from Atlante45/master
...
Stable -> Master
2017-06-21 13:34:28 -07:00
samcake
56d5f4ec5c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-21 11:25:07 -07:00
Anthony Thibault
a12109ed26
Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes
...
Bug Fixes for Eyeless Avatars
2017-06-21 10:59:55 -07:00
David Kelly
f30b12fca6
still doesn't work, pushing just to save it
2017-06-21 10:28:18 -07:00
Brad Hefta-Gaub
f7d42c782d
Merge pull request #10764 from thoys/feat/ac-location-jsapi
...
Expose location scripting interface to Agent (AC script)
2017-06-21 10:22:48 -07:00
Thijs Wenker
47643e1efe
Expose location API to Agent scripts (side-effect, agents now can teleport)
2017-06-21 06:31:36 +02:00
Howard Stearns
fea8a95fc7
Don't leave running markers around if they weren't there before and we quit after reporting (protocol)version.
2017-06-20 18:09:27 -07:00
Howard Stearns
ac1d4d9636
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-20 17:57:12 -07:00
Dante Ruiz
5e82b13d65
removed double include
2017-06-21 01:15:17 +01:00
Dante Ruiz
b7286db523
fixed merge conflict
2017-06-21 01:10:54 +01:00
Dante Ruiz
2c3db0fb91
finished calibration-ui
2017-06-21 01:07:12 +01:00
Atlante45
6bd1946e96
Merge branch 'stable' of https://github.com/highfidelity/hifi
2017-06-20 16:36:57 -07:00
Zach Pomerantz
8e1cf763e3
Merge pull request #10756 from zzmp/audio/input-level
...
Update chrome for the audio input level meter
2017-06-20 15:33:17 -07:00
Zach Pomerantz
7e84f67391
Merge pull request #10744 from zzmp/audio/output-sample
...
Add "Play sample sound" to audio setting
2017-06-20 15:32:57 -07:00
David Kelly
06b59fe13e
still broken, but added initial cut of GLsync stuff
2017-06-20 15:02:05 -07:00
howard-stearns
41003bd307
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-20 13:25:38 -07:00
howard-stearns
480ff784b9
add a skipTutorial option, that does not change settings
2017-06-20 13:25:03 -07:00
Zach Pomerantz
f55d842fac
add SoundCache to tablet for PlaySampleSound
2017-06-20 12:16:08 -07:00
Matti Lahtinen
256484cd21
Removed Whitespace
2017-06-20 21:44:32 +03:00
Zach Pomerantz
8436d0cc6b
rm unused AvatarInputs props
2017-06-20 11:43:02 -07:00
Brad Hefta-Gaub
cbded766b1
Merge pull request #10676 from NeetBhagat/21369
...
WL 21369 - Implement parts of the JS "console" object
2017-06-20 11:06:34 -07:00
Anthony J. Thibault
29e3af820b
Fix for avatars with no eyes.
...
The calculation of the centerEyeCalibration matrix (and several others) were incorrect.
2017-06-20 10:14:34 -07:00
howard-stearns
d71666f337
Remove useless command line arg for steam, but add one for version.
2017-06-20 09:59:15 -07:00
howard-stearns
974768390c
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-20 09:47:52 -07:00
Anthony J. Thibault
21c0e45d87
recenter rotation while driving.
...
This should reduce foot sliding in HMD mode.
2017-06-20 09:43:38 -07:00
Dante Ruiz
13dff29bd5
adding calibration screen
2017-06-20 01:19:10 +01:00
Zach Pomerantz
497ee3a522
add Audio.inputLevel
2017-06-19 17:07:43 -07:00
Zach Pomerantz
4bff925506
rm unused bools
2017-06-19 17:01:39 -07:00
Anthony J. Thibault
c236afe68c
Simplify passing data from MySkeletonModel to Rig
2017-06-19 16:54:39 -07:00
Zach Pomerantz
3d80774317
clean up select_audio_device
2017-06-19 15:57:24 -07:00
samcake
653ce89e08
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 15:48:46 -07:00
Zach Pomerantz
837f37220a
log selected_audio_device
2017-06-19 15:11:02 -07:00
Zach Pomerantz
5f236bd025
simplify device settings
2017-06-19 15:11:02 -07:00
Zach Pomerantz
5c0e9e7496
improve wording for MyAvatar.qmlPosition doc
2017-06-19 14:52:32 -07:00
David Kelly
b4c75c3f87
working, except tablet issue
2017-06-19 14:41:42 -07:00
Zach Pomerantz
a7e1b75909
stopgap with MyAvatar.qmlPosition
2017-06-19 14:41:01 -07:00
howard-stearns
91656a5fe5
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-19 14:22:12 -07:00
Zach Fox
2e215e6544
Fix build problems
2017-06-19 14:04:51 -07:00
Zach Fox
cbdffce88e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619
2017-06-19 13:53:29 -07:00
Dante Ruiz
cfffb74a29
Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks
2017-06-19 21:40:26 +01:00
Brad Davis
ed6620fc51
Merge pull request #10718 from jherico/frame_thread
...
Cleanup and refactoring
2017-06-19 13:31:44 -07:00
howard-stearns
c6d66d439b
report and quit command line switches
2017-06-19 12:57:26 -07:00
Matti Lahtinen
82df64d5e7
flyingAllowed to zoneAllowsFlying
2017-06-19 21:44:43 +03:00
Olivier Prat
0211338657
Put back test if not physics enabled in entity items should fade function as it gives too many undesired refades
2017-06-19 20:38:47 +02:00
Seth Alves
39fb94d76d
fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at
2017-06-19 11:21:08 -07:00
Zach Fox
08eb07242d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-19 10:31:31 -07:00
samcake
ebc4745df0
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 09:27:35 -07:00
Olivier Prat
21276a85ad
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-06-19 18:20:03 +02:00
Olivier Prat
b6b1875dd3
Disabled check on enabled physics when deciding is fade is adequate
2017-06-19 18:19:54 +02:00
humbletim
26f651ae7c
Merge remote-tracking branch 'upstream/master' into HEAD
2017-06-19 10:01:37 -04:00
Vladyslav Stelmakhovskyi
59a77c16bd
Cleanup
2017-06-18 20:59:22 +02:00
Matti Lahtinen
600a39c9b2
Fixed Zone overriding Client.
2017-06-18 13:14:01 +03:00
Vladyslav Stelmakhovskyi
f34faa3ee7
Fix backward compatibility with Qt 5.6
2017-06-18 10:54:59 +02:00
Vladyslav Stelmakhovskyi
a1475bc65f
Forgot if statement
2017-06-17 23:02:52 +02:00
Vladyslav Stelmakhovskyi
b8bb8026ca
Merge branch 'master' into fix_tablet_buttons_qt59
2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi
5a0783c38c
Send mouse events before touch event. It seems the order is important for Qt 5.9
2017-06-17 22:24:27 +02:00
David Kelly
c7e4649ec2
add override to avoid warnings in ubuntu/mac
2017-06-17 13:15:22 -07:00
Brad Davis
a69cf31f4b
PR feedback and cmake fixes
2017-06-16 16:59:58 -07:00
Dante Ruiz
da29157a3c
fixed merge conflict'
2017-06-17 00:40:50 +01:00
David Kelly
6dd1e6e069
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-16 16:24:30 -07:00
