David Rowe
28d0fc677c
Update UIT QML control
2016-03-30 12:19:26 +13:00
David Rowe
1cb08952ae
Merge branch 'master' into 20855
...
Conflicts:
interface/resources/qml/ToolWindow.qml
2016-03-30 12:01:45 +13:00
Eric Levin
830d08c385
Merge pull request #7498 from Atlante45/fix/import-entities
...
Make svo loading use ResourceManager
2016-03-29 08:09:47 -07:00
Atlante45
807698f0bb
Make svo loading use ResourceManager
2016-03-28 18:07:48 -07:00
Zach Pomerantz
2de94e672b
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-28 14:08:30 -07:00
Brad Hefta-Gaub
7396fa1cc3
Merge pull request #7493 from zzmp/fix/plugin-check
...
Default to desktop when display plugins fail to load
2016-03-28 13:49:58 -07:00
Zach Pomerantz
7bcef1d319
Fallback display to last, then desktop
2016-03-28 12:54:38 -07:00
Zach Pomerantz
37a725b06d
Fallback to desktop if display plugin fails
2016-03-28 12:12:52 -07:00
Brad Davis
ae82298e1b
Working on the App JS <-> HTML JS communication
2016-03-28 10:09:22 -07:00
David Rowe
ef4d67008b
Style x, y, z fields
2016-03-28 11:45:50 +13:00
David Rowe
b9ec5f39d9
Style color RGB fields
2016-03-27 22:12:10 +13:00
Brad Hefta-Gaub
f7e6f60e87
one more crack at fixing false deadlock
2016-03-25 19:04:01 -07:00
Brad Hefta-Gaub
9a66d779ae
Merge pull request #7463 from zzmp/guard/bugsplat-2177
...
Guard against lack of GL support to avoid crash
2016-03-25 16:31:14 -07:00
Philip Rosedale
44c6f81c0f
Merge pull request #7457 from ZappoMan/reduceFalsePositiveDeadlocks
...
make the deadlock watchdog more generous
2016-03-25 16:10:37 -07:00
Zach Pomerantz
9f8848e833
Log on first login
2016-03-25 15:07:14 -07:00
Brad Hefta-Gaub
fe31be71eb
protect against unexpected rollover
2016-03-25 14:59:43 -07:00
Zach Pomerantz
b252139704
LMK when running with old GL version
2016-03-25 14:42:58 -07:00
Alan Z
cffbc2e1a4
Merge pull request #7478 from birarda/new-icons
...
replace interface/server-console icons with new set from Alan
2016-03-25 13:17:58 -07:00
Brad Hefta-Gaub
541c1e5c6f
Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks
2016-03-25 13:03:31 -07:00
Brad Hefta-Gaub
941821e2c7
add some extra debugging at deadlock detection to explain unreasonable numbers
2016-03-25 12:17:24 -07:00
Zach Pomerantz
c5e5195db1
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-25 12:07:00 -07:00
David Rowe
f85b7696b3
Merge branch 'master' into 20855
2016-03-26 07:53:55 +13:00
Stephen Birarda
bb95aec528
replace the interface icons
2016-03-25 11:42:48 -07:00
Andrew Meadows
7064b29a2d
Merge pull request #7473 from jherico/revert_webchannel
...
Revert "Build a better event bridge"
2016-03-25 11:29:06 -07:00
Zach Pomerantz
5d306a74d5
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-25 10:09:37 -07:00
Brad Davis
a47614c9b6
Revert "Build a better event bridge"
...
This reverts commit a43fde0803
2016-03-25 09:48:25 -07:00
Brad Hefta-Gaub
fb09ad51b3
CR feedback
2016-03-24 21:14:07 -07:00
David Rowe
42af3ebc4a
Style the entity editor's "grid" tab
2016-03-25 14:15:03 +13:00
Brad Hefta-Gaub
7de8a2267f
one more try
2016-03-24 18:09:14 -07:00
Anthony J. Thibault
6a5a443eff
Avatar: Eye-tracking works again
...
This replaces the calculation of the Head left and right eye positions used for eye tracking.
Which was inadvertently removed in this commit 7483b8546b
2016-03-24 18:07:46 -07:00
Brad Davis
0ac70049c7
Merge pull request #7431 from hyperlogic/tony/vive-rendering-work
...
OpenVR rendering & Nsight instrumentation improvements
2016-03-24 17:44:30 -07:00
Brad Hefta-Gaub
cfaa97d8f3
one more try
2016-03-24 17:39:23 -07:00
Brad Hefta-Gaub
6d76a5872f
Merge pull request #7461 from hyperlogic/tony/avatar-culling-fix
...
Avatar: fix for Avatar animation updates while wearing HMD
2016-03-24 17:34:20 -07:00
Brad Hefta-Gaub
d26fe77803
Merge pull request #7454 from jherico/qml_crashes
...
Fix async issues related to JS <-> App <-> QML <-> HTML communication
2016-03-24 17:32:38 -07:00
Brad Hefta-Gaub
5b13ebf72b
more mac build busters
2016-03-24 17:19:11 -07:00
Brad Hefta-Gaub
2b595fb329
break out thread safe moving average to get around unix build hell
2016-03-24 16:26:28 -07:00
Brad Hefta-Gaub
8691aa6905
fix unix build and CR feedback
2016-03-24 15:45:44 -07:00
Brad Davis
520cccb219
Make display plugin switching atomic from other threads
2016-03-24 15:19:46 -07:00
David Rowe
46df386f0b
Fix edit tab display after script reload
2016-03-25 10:18:58 +13:00
Brad Hefta-Gaub
deed643ca7
add additional tracking of max elapsed
2016-03-24 13:30:39 -07:00
Anthony J. Thibault
ba4520fe56
Avatar: fix for Avatar animation updates while wearing HMD
...
The boundingSphere vs frustum check now uses the displayViewFrustum, which
more accurately reflects the actual projection matrix used for rendering.
2016-03-24 13:23:30 -07:00
David Rowe
9280443425
Merge branch 'master' into 20855
2016-03-25 09:06:20 +13:00
Brad Hefta-Gaub
208b594ef8
make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines
2016-03-24 12:37:07 -07:00
Zach Pomerantz
3e9e083df5
Update users of NetworkGeometry
2016-03-24 11:35:41 -07:00
Brad Davis
a43fde0803
Build a better event bridge
2016-03-24 11:01:06 -07:00
Ozan
003af03b33
Merge pull request #7400 from Menithal/default-use-pre-post
...
Set UserAnimPreAndPostRotations true by Default
2016-03-24 09:57:03 -07:00
David Rowe
51728d14a7
Miscellaneous improvements to Attachments dialog
2016-03-24 21:17:36 +13:00
Brad Hefta-Gaub
2b0670718f
Merge pull request #7449 from howard-stearns/report-previous-session-data
...
Report previous session data
2016-03-23 20:58:51 -07:00
Brad Hefta-Gaub
3505c14552
Merge pull request #7444 from birarda/uncover-qml
...
Attachments Dialog QML updates (from contractor)
2016-03-23 20:45:50 -07:00
David Rowe
5541dd6732
Change edit window's title and default size
2016-03-24 15:38:26 +13:00
