Stephen Birarda
899595183e
add reload of mappings on component complete
2016-03-10 09:02:45 -08:00
Stephen Birarda
f1919031de
error message boxes for mapping errors
2016-03-10 08:57:37 -08:00
Brad Hefta-Gaub
82ca78b37b
Merge pull request #7300 from sethalves/fix-detach-crash
...
fix removing attachments
2016-03-10 08:23:52 -08:00
Ryan Huffman
3e5e2eef17
Add mapping sorting, copying, and isKnownMapping
2016-03-10 08:18:32 -08:00
David Rowe
4c3f374f02
Update HiFi glyphs font file
...
Has some new, soon to be used characters, but no other changes.
2016-03-10 15:10:44 +13:00
Anthony J. Thibault
5f1b8805cf
Removed unnecessary include
2016-03-09 17:37:51 -08:00
Atlante45
f6e01bbd36
Fix messed up LogDialog multi-lines
2016-03-09 17:31:04 -08:00
Brad Davis
9645ed9120
Update the watchdog heartbeat manually during startup
2016-03-09 17:00:45 -08:00
Ryan Huffman
dd52dd69d9
Fix rename mapping
2016-03-09 16:50:37 -08:00
Anthony J. Thibault
886457939d
Merge branch 'master' into tony/wrong-way-overlay
2016-03-09 16:50:18 -08:00
Ryan Huffman
232bfc9061
Cleanup AssetServer qml
2016-03-09 16:44:31 -08:00
Howard Stearns
2b576e86f0
Merge pull request #7259 from jherico/crashes
...
Crash fixes
2016-03-09 16:42:36 -08:00
Chris Collins
ddb09ec222
Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements
...
Hand controller mouse improvements
2016-03-09 16:34:35 -08:00
Ryan Huffman
0d2ae4f3a4
Merge branch 'atp' of github.com:birarda/hifi into atp-model
2016-03-09 16:33:53 -08:00
Ryan Huffman
f23057b1c0
Add renaming to Asset qml
2016-03-09 16:29:17 -08:00
Anthony Thibault
5df616be37
OpenVR: More usable UI Sphere overlay location
...
Also, added a debug option to display SensorToWorld matrix in Developer > Avatar menu.
2016-03-09 16:24:08 -08:00
Ryan Huffman
f5497aa1e7
Add new AssetMappingsScriptingInterface and add mappings model
2016-03-09 14:53:04 -08:00
Brad Davis
23a89a63d8
Set deadlock thread name
2016-03-09 14:51:19 -08:00
Seth Alves
d95d0f59cb
keep removed attachment models around for one extra call to fixupModelsInScene
2016-03-09 14:36:50 -08:00
Anthony J. Thibault
4af3766804
Don't reset sensors when initializing or changing display plugins.
...
This should fix the issue with the Oculus starting up with the UI aligned
to the HMD on your desk, rather then the configured default sitting pose.
2016-03-09 14:28:26 -08:00
Stephen Birarda
57ea51d244
Merge pull request #84 from Atlante45/feat/atp
...
Replace old drag&drop with new UI
2016-03-09 14:26:49 -08:00
Atlante45
6bd7afc7b3
Confirm overrides
2016-03-09 14:19:28 -08:00
Zach Pomerantz
21719b3980
Wait 10m for DEBUG deadlocks
2016-03-09 14:07:36 -08:00
Ryan Huffman
4da4fd889a
Add AssetMappingModel
2016-03-09 14:03:56 -08:00
Ryan Huffman
fd5a5dd8f4
Add QJSEngine compatible AssetMappingScriptInterface
2016-03-09 14:03:25 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Brad Davis
cac31761c0
Safer shutdown code in deadlock thread
2016-03-09 13:45:01 -08:00
Stephen Birarda
2e9ee4f8a7
Merge branch 'atp' of github.com:birarda/hifi into atp
2016-03-09 12:16:59 -08:00
Stephen Birarda
9a2b2b4c16
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-09 12:16:46 -08:00
Brad Hefta-Gaub
e038c8a43c
Merge branch 'master' of https://github.com/highfidelity/hifi into bugfixes
2016-03-09 11:47:55 -08:00
Atlante45
5a0beec1f5
Replace old drag&drop with new UI
2016-03-09 11:47:31 -08:00
Brad Davis
80fdef4348
Ensure the heartbeat has a valid value before the thread starts
2016-03-09 10:53:01 -08:00
Ryan Huffman
eb402eab75
Fix bugsplat username setting
2016-03-09 10:21:59 -08:00
Ryan Huffman
d20cf12941
Add HF username as default username for bugsplat
2016-03-09 10:21:59 -08:00
Anthony J. Thibault
4691ca1716
Merge branch 'master' into tony/hand-controller-move-improvements
2016-03-09 10:06:28 -08:00
Brad Hefta-Gaub
1c07276501
fix a couple bugs
2016-03-09 09:45:55 -08:00
Brad Hefta-Gaub
5862181e70
Merge pull request #7288 from jherico/watchdog
...
Add a watchdog thread to trigger a crash on detecting a deadlock
2016-03-09 09:18:48 -08:00
Seth Alves
efdef52081
Merge pull request #7269 from ctrlaltdavid/20822
...
Restyle bookmark dialogs
2016-03-09 07:31:15 -08:00
Brad Davis
95f5d82d37
Add a watchdog thread to trigger a crash on detecting a deadlock
2016-03-09 00:32:46 -08:00
Chris Collins
d1401796d8
Merge pull request #7284 from ctrlaltdavid/fix-raleway-semibold
...
Fix case of RalewaySemiBold font name
2016-03-08 21:24:15 -08:00
Atlante45
380480d4ee
Add a couple more dialogs
2016-03-08 18:19:26 -08:00
Brad Hefta-Gaub
cb70c398cd
Merge pull request #7233 from jherico/vive_menu
...
Fix the Vive controllers to support menus
2016-03-08 18:03:32 -08:00
samcake
bfed0304c3
Merge pull request #7218 from zzmp/fix/resort-in-octree
...
Fix item key lookup on updated items in scene
2016-03-08 17:48:51 -08:00
Anthony J. Thibault
deb17e1f93
Merge branch 'master' into tony/hand-controller-move-improvements
2016-03-08 17:45:50 -08:00
Atlante45
169af80bc0
Add a couple dialogs
2016-03-08 17:11:54 -08:00
Atlante45
028c7ab6ba
Add text box
2016-03-08 17:11:54 -08:00
Atlante45
254e04c4b7
UI change
2016-03-08 17:11:54 -08:00
Stephen Birarda
87d5958eb8
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-08 17:11:18 -08:00
David Rowe
973fa28d3f
Fix case of RalewaySemiBold font name
2016-03-09 13:32:37 +13:00
David Rowe
155a084eaa
Temporarily rename file a part of changing case of filename
2016-03-09 13:08:44 +13:00
David Rowe
269936f3ac
Fix typo
2016-03-09 12:20:09 +13:00
Brad Davis
f651adbd24
Correcting vive button naming
2016-03-08 15:12:54 -08:00
Brad Davis
1312901f06
Removing thumb mappings, using start/back for camera and menu
2016-03-08 15:09:45 -08:00
Brad Davis
ac1ab4b5b7
Map the primary thumbs to menu/camera as well as the secondary thumb
2016-03-08 15:09:44 -08:00
David Rowe
edc50f102d
Fix "duplicate bookmark" dialog
2016-03-09 11:55:09 +13:00
Brad Hefta-Gaub
35d6afbe77
Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable
2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5
first cut at fixing the scene not stable bug
2016-03-08 14:52:21 -08:00
David Rowe
10e4e5e3a7
Use OffscreenUI icon enum instead of QMessageBox icon enum
2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444
Add ability to have icons in query dialogs
...
Add icon to bookmark dialogs' titles.
2016-03-09 10:45:14 +13:00
Atlante45
0bed46d43a
Fix typos and file browser directory
2016-03-08 13:24:36 -08:00
Atlante45
74fb1aab55
Add file dialog
2016-03-08 13:15:04 -08:00
Atlante45
e32fd4524c
Start wiring UI
2016-03-08 13:13:45 -08:00
Atlante45
ded449072f
Rename window
2016-03-08 13:13:45 -08:00
Atlante45
e0371929a2
Remove unused variables
2016-03-08 13:13:45 -08:00
Atlante45
51be88d4c3
Reset Window changes
2016-03-08 13:13:45 -08:00
Atlante45
320bd2b4d4
Reset ContentSection scheme
2016-03-08 13:13:45 -08:00
Atlante45
d0e29846f4
Add GlyphButton
2016-03-08 13:13:45 -08:00
Atlante45
6fecb4e1d1
Window fixup
2016-03-08 13:13:45 -08:00
Atlante45
30a6dd8629
Update StaticSection
2016-03-08 13:13:45 -08:00
Atlante45
82d6d3ff01
Small fix to buttons color
2016-03-08 13:13:45 -08:00
Atlante45
784f669998
First draft Assets Manager
2016-03-08 13:13:45 -08:00
Stephen Birarda
969244927b
use extension for entity add for drag and drop upload
2016-03-08 13:09:20 -08:00
Stephen Birarda
28af9c51e6
add a missing parenthesis
2016-03-08 12:22:13 -08:00
Stephen Birarda
8fa32e75b2
client side fixes for upload with no extension
2016-03-08 12:19:15 -08:00
Stephen Birarda
bfb9801b22
Merge branch 'atp' of github.com:birarda/hifi into atp-mappings
2016-03-08 11:37:27 -08:00
Anthony J. Thibault
e046ba64dd
Properly marshal fakeMouseEvent data from script thread to main thread
2016-03-08 10:58:54 -08:00
Seth Alves
b780fad83f
Merge pull request #7270 from birarda/local-socket-check
...
add a secondary method for local socket check
2016-03-08 10:48:08 -08:00
Brad Hefta-Gaub
19ad4314ca
Merge pull request #7276 from jherico/bookmarks
...
Don't trigger modal dialog from menu handler
2016-03-08 10:29:29 -08:00
Zach Pomerantz
d1324b2e7a
Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree
2016-03-08 10:22:25 -08:00
Brad Hefta-Gaub
50eb07d465
Merge pull request #7221 from jherico/threaded_compositing2
...
Migrate composition of the overlay and pointer to the present thread
2016-03-08 10:22:02 -08:00
Brad Hefta-Gaub
ed67ef8f14
Merge pull request #7247 from jherico/qml_script_messaging
...
Allow message passing from a script to a QML window
2016-03-08 10:21:09 -08:00
Brad Davis
f08f54fd22
Don't trigger modal dialog from menu handler
2016-03-07 21:48:07 -08:00
James B. Pollack
2e9ebfb178
remove avatar head and body from pacakage model selections
2016-03-07 21:03:11 -08:00
David Rowe
2aaf9ff0d0
Update message dialogs to use HiFi-Glyphs icons
2016-03-08 17:13:05 +13:00
Anthony J. Thibault
3d71226f72
Crash fix for moving reticle via script.
...
sendMessage is not thread-safe, use invokeMethod to call into application thread instead.
2016-03-07 18:33:09 -08:00
David Rowe
e5188108a1
Fix width of delete bookmark drop-down
2016-03-08 15:21:15 +13:00
Stephen Birarda
ed9faf4189
add a secondary check for local IP address
2016-03-07 18:00:09 -08:00
Brad Davis
8988dd9771
Fix mouse drag turning
2016-03-07 17:14:44 -08:00
Brad Davis
634f8fbc83
Fix texture leak
2016-03-07 17:14:43 -08:00
Brad Davis
28103cf5ef
Migrate composition of the overlay and pointer to the present thread
2016-03-07 17:14:41 -08:00
David Rowe
2f91b29c06
Set default focus
2016-03-08 14:03:54 +13:00
David Rowe
09390ffffd
Remove colon from dialog label
2016-03-08 14:00:49 +13:00
David Rowe
b71a512a6f
Reorder OK and Cancel buttons
2016-03-08 13:58:20 +13:00
David Rowe
7f2938c53f
Tidy message dialog code
2016-03-08 13:56:25 +13:00
David Rowe
b7fd5467ba
Restyle query dialogs
2016-03-08 13:53:05 +13:00
David Rowe
d893b2e3b1
Handle no icon in modal dialogs
2016-03-08 13:52:24 +13:00
Anthony J. Thibault
0d62b10a8f
Added Mat4 support to script
...
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
2016-03-07 16:16:14 -08:00
Philip Rosedale
7c765f3d5a
Merge pull request #7258 from hyperlogic/tony/better-lean-detection
...
MyAvatar: use a box instead of a sphere for horizontal re-centering
2016-03-07 15:05:10 -08:00
Seth Alves
34a76f1962
Merge pull request #7265 from ctrlaltdavid/fix-treeview
...
Fix Running Script's tree view
2016-03-07 14:03:50 -08:00
Stephen Birarda
267ed3af82
remove client side handling of extension for ATP hash URLs
2016-03-07 13:57:02 -08:00
David Rowe
e6b81b31d8
Fix Running Script's tree view
2016-03-08 09:59:00 +13:00
Chris Collins
7850ca3576
Merge pull request #7227 from hyperlogic/tony/eye-look-at-fixes
...
Avatar eye look at fixes for HMD and desktop
2016-03-07 11:50:16 -08:00
Anthony Thibault
2cbb41fd38
MyAvatar: bug fix for forward/backward lean detection
2016-03-07 10:11:22 -08:00
Anthony J. Thibault
aefeff2493
MyAvatar: Use a box instead of a sphere for horizontal re-centering
2016-03-07 09:50:38 -08:00
Philip Rosedale
ee3e0fcc38
Merge pull request #7238 from hyperlogic/tony/hmd-follow-work
...
MyAvatar: Improved body recentering for room scale
2016-03-04 15:51:07 -08:00
Anthony Thibault
0de19d13c4
MyAvatar: open up horizontal leaning threshold
2016-03-04 15:28:38 -08:00
Brad Hefta-Gaub
30bcb04a2f
Merge pull request #7149 from jherico/overlays_qml
...
Make Overlay API usable from QML
2016-03-04 15:00:45 -08:00
Brad Davis
468cb05571
Merge pull request #7231 from ctrlaltdavid/20812
...
Restyle settings dialogs
2016-03-04 14:33:21 -08:00
David Rowe
b4c489d4c6
Fix not reliably being able to select "None" in Graphics settings
2016-03-05 10:17:39 +13:00
Brad Davis
4e1f78b585
Allow message passing from a script to a QML window
2016-03-04 13:11:08 -08:00
Anthony Thibault
37ba0ecd9f
MyAvatar: prevent face from being visible when crouching
...
Overall, this should fix many of the issues with the head being visible when it shouldn't.
2016-03-04 11:48:55 -08:00
Brad Davis
2f89253dc1
Make Overlays usable from QML
2016-03-04 11:35:54 -08:00
Anthony J. Thibault
dc456cbdbe
MyAvatar: dropped vertical recenter limit.
2016-03-04 11:15:11 -08:00
Ryan Huffman
f21815e332
Merge pull request #7245 from birarda/domain-security
...
manually install OpenSSL DLLs for Qt
2016-03-04 09:23:21 -08:00
Brad Hefta-Gaub
5b2c3b4b26
Merge pull request #7243 from thoys/20821
...
CR for Job #20821 - Remove stray tray icon
2016-03-03 18:10:56 -08:00
Stephen Birarda
3750d5d780
manually install OpenSSL DLLs for Qt
2016-03-03 17:57:34 -08:00
Brad Hefta-Gaub
7bb87305d4
Merge pull request #7234 from zzmp/fix/line3d-back-cull
...
Render line3d without backface culling
2016-03-03 17:16:54 -08:00
Thijs Wenker
17f0688db5
removed stray traybar icon
2016-03-03 19:18:47 +01:00
David Rowe
1eb6fa425c
Fix up Running Scripts dialog
2016-03-03 20:09:50 +13:00
David Rowe
f88eef7549
Update section headers
2016-03-03 19:17:48 +13:00
David Rowe
fb675dbaf5
Add vertical spacing above other settings fields
2016-03-03 18:49:13 +13:00
David Rowe
2d250e2f64
Only the first checkbox in a group has vertical space before it
2016-03-03 17:51:14 +13:00
David Rowe
a41f409e33
Defer dialog vertical spacing decisions to content items
2016-03-03 17:49:18 +13:00
Anthony J. Thibault
2a75084579
Merge branch 'master' into tony/hmd-follow-work
2016-03-02 17:44:13 -08:00
David Rowe
4729020df1
Change section expand/collapse icons
2016-03-03 14:32:08 +13:00
David Rowe
46bb3c05a5
Right justify leading control labels
2016-03-03 14:17:02 +13:00
David Rowe
81f13afb4e
Tweak look of combo box control
2016-03-03 10:24:42 +13:00
David Rowe
c83ed578db
Merge branch 'master' into 20812
2016-03-03 02:01:20 +13:00
David Rowe
c3b47088c9
Fix slider vertical alignment
2016-03-03 01:59:21 +13:00
David Rowe
a51dd43dff
Wrap labels
2016-03-03 01:56:02 +13:00
David Rowe
c1f5bac86a
Style the ComboBox
2016-03-03 01:14:00 +13:00
David Rowe
98ad785267
Get ComboBox working
2016-03-03 00:04:15 +13:00
David Rowe
829c858b04
Start on ComboBox again using Austin's HMD-compatible code
2016-03-02 22:18:12 +13:00
David Rowe
4d53dee29c
Rename section control
2016-03-02 19:46:26 +13:00
David Rowe
e79427bb3b
Make some settings dialogs have collapsible sections
2016-03-02 19:41:50 +13:00
Brad Hefta-Gaub
cfce5af8d4
Merge pull request #7191 from samcake/orange
...
Better Shading Model and support fr Stingray material
2016-03-01 18:24:09 -08:00
Anthony J. Thibault
6e80665107
MyAvatar: reduced rotation re-center threshold to 30 degrees
...
Also, warning fix for Linux.
2016-03-01 17:45:16 -08:00
Anthony J. Thibault
2dfc517d14
MyAvatar: re-center vertically, on x & z drive keys
2016-03-01 16:45:36 -08:00
samcake
16ac69315f
Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture
2016-03-01 16:38:02 -08:00
David Rowe
20bf07550a
Update to new HiFi-Glyphs font file
2016-03-02 13:10:52 +13:00
Anthony J. Thibault
be446f4e96
MyAvatar: separate rotation, horizontal and vertical HMD follow
2016-03-01 15:38:02 -08:00
David Rowe
d1f4369a5f
Fix width of divider above buttons at bottom of settings dialogs
2016-03-02 12:00:29 +13:00
Zach Pomerantz
48aaac2971
Render line3d without backface culling
2016-03-01 14:57:02 -08:00
David Rowe
16fbf60bae
Update preferences dialog titles to match menu items
2016-03-02 11:52:58 +13:00
Zach Pomerantz
5c64115b26
Use keyLight in DLE instead of _skyboxTexture
2016-03-01 14:44:34 -08:00
Stephen Birarda
248aa58d23
force statically linked OpenSSL on windows
2016-03-01 13:04:37 -08:00
Stephen Birarda
f44cf3903c
re-instate verified domain ownership for full automatic networking
...
This reverts commit 34408c8144
2016-03-01 13:04:37 -08:00
Stephen Birarda
b0c11e6562
Merge pull request #7217 from huffman/udt-random-seq
...
Randomize initial send sequence number in UDT
2016-03-01 12:59:10 -08:00
David Rowe
881302df02
Merge branch 'master' into 20812
2016-03-02 09:55:17 +13:00
David Rowe
5a3f74d51b
Style drop-down combo box for Developer > Graphics...
2016-03-02 09:53:10 +13:00
David Rowe
a309a2e08f
Style slider controls
2016-03-02 09:24:57 +13:00
Atlante45
14ae35e741
CR
2016-03-01 12:00:43 -08:00
Atlante45
4944d0a8d0
Handle threading inside AssetServer
2016-03-01 12:00:43 -08:00
Atlante45
f0ccada945
Fix for Ubuntu
2016-03-01 12:00:43 -08:00
Atlante45
6a4b93a4e7
Proper fix for DiskCacheInfo
2016-03-01 12:00:43 -08:00
Atlante45
40d307a37b
Temporary fix to disk cache editor crash
2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d
Move all resource requests to the same thread
2016-03-01 12:00:43 -08:00
Andrew Meadows
c1b3858193
Merge pull request #7228 from ZappoMan/hmdHacking
...
HMD and Away improvements
2016-03-01 11:48:09 -08:00
Ryan Huffman
cc9c87d281
Fix packet version mismatch not showing for domain packets
2016-03-01 11:36:49 -08:00
Anthony J. Thibault
506e46faee
MyAvatar: fix for missing include
2016-03-01 11:21:14 -08:00
Anthony J. Thibault
babf48ac57
MyAvatar: take IPD scale into account when computing corrected eye lookAt
2016-03-01 11:17:03 -08:00
Anthony J. Thibault
3cde972174
Rig: issue warnings for missing joints
...
Also, Removed Rig::computeEyesInRigFrame, it was causing warnings because it was looking up
Eye and Head joints for all models, not just avatars.
2016-03-01 11:07:22 -08:00
samcake
7120b64a33
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-01 10:53:40 -08:00
Chris Collins
926b93b4db
Merge pull request #7224 from ctrlaltdavid/20816
...
Change Running Scripts reload, close, and tree buttons when pressed
2016-03-01 10:26:58 -08:00
Brad Hefta-Gaub
a3f4dbddcf
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
2016-02-29 20:23:14 -08:00
Brad Hefta-Gaub
2c3fdc995f
Away improvements
2016-02-29 20:23:06 -08:00
samcake
e72035ee3d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-29 18:55:30 -08:00
Anthony J. Thibault
460582239a
Avatar eye look at fixes for HMDs
...
There were three things that were causing issues with eye look at vectors while wearing an HMD.
1) The matrix returned by AvatarUpdate->getHeadPose() was in the wrong space, it should be in avatar space.
it was actually returning a matrix in sensor/room space.
2) The lookAtPosition was incorrect while wearing an HMD and with no avatars to look at.
3) The eye rotation limits in Rig::updateEyeJoint were relative to the model's zero orientation, NOT relative to the head.
this was causing the eyes to hit limits when the avatar head turned.
2016-02-29 18:02:50 -08:00
Anthony J. Thibault
99bd0f3d13
MyAvatar: fixes for eye look at
...
Users in desktop mode should now see the eyes change focus between the left eye, right eye and the mouth.
Users in mirror mode, or third person camera, should more accurately determine which avatar to look at.
2016-02-29 16:49:35 -08:00
David Rowe
ddc5e952f1
Merge branch 'master' into 20812
2016-03-01 11:16:14 +13:00
David Rowe
a32452db8b
Change Running Scripts reload, close, and tree buttons when pressed
...
Provides visual feedback to user.
2016-03-01 10:43:46 +13:00
Brad Hefta-Gaub
bd80ecd4dc
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-29 13:17:24 -08:00
Seth Alves
95f9793999
Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-more
2016-02-29 11:35:58 -08:00
samcake
4bec6ddf52
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-29 09:20:37 -08:00
Brad Hefta-Gaub
8de4a59078
add support for auto-hide reticle and seek lookat on auto-show of reticle
2016-02-28 13:06:49 -08:00
Brad Davis
d932cb7578
Merge pull request #7212 from ZappoMan/depthReticleWork
...
add fade between depths in depth reticle
2016-02-28 12:49:47 -08:00
Brad Hefta-Gaub
188cf3694b
fix rotation of depth reticle
2016-02-27 17:31:35 -08:00
David Rowe
50ebbe362d
Style avatar browser field
2016-02-27 14:06:33 +13:00
David Rowe
1a331fcdac
Style basic text field
2016-02-27 13:52:21 +13:00
David Rowe
98eb94ecef
Fix up capitalization of other settings dialogs
2016-02-27 13:30:49 +13:00
samcake
99ba011996
Post merge with Zach work for environment map
2016-02-26 16:04:50 -08:00
David Rowe
2b03e16bec
Increase the title's focus shadow offset
2016-02-27 12:48:09 +13:00
Zach Pomerantz
5995c3717f
Continue updating overlay key on edit
2016-02-26 14:46:42 -08:00
Anthony J. Thibault
9a01c93322
Avatar: fix for rendering avatar attachments
2016-02-26 14:28:27 -08:00
David Rowe
839303168e
Fix missed capital
2016-02-27 11:20:31 +13:00
David Rowe
247ba7d3dd
Merge branch 'master' into 20812
2016-02-27 11:05:47 +13:00
David Rowe
b62bd682ed
Tidying
2016-02-27 11:03:57 +13:00
David Rowe
e8f349ec31
Fix up capitalization of labels and use of colons
2016-02-27 11:02:39 +13:00
David Rowe
bf0bcbe2ec
Style spinbox control
2016-02-27 10:48:53 +13:00
Zach Pomerantz
3c53078178
Merge pull request #7194 from ZappoMan/toggleOverlay
...
add toggleOverlays menu item and action
2016-02-26 10:17:24 -08:00
Philip Rosedale
783892ac2e
Merge pull request #7206 from hyperlogic/tony/simrate-fix
...
Application: don't simulate until we are ready to render
2016-02-26 07:27:35 -08:00
samcake
3ee6f9d6f2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 23:48:53 -08:00
Brad Hefta-Gaub
bf0fb7258a
CR feedback
2016-02-25 22:01:10 -08:00
David Rowe
3cac94ed35
Refactor label style
2016-02-26 17:32:25 +13:00
David Rowe
3dc9d01aab
Style checkbox control
2016-02-26 15:56:19 +13:00
David Rowe
b620427ae8
Fix text field label color
2016-02-26 15:54:50 +13:00
Anthony J. Thibault
e5c81f66a5
Application: removed threadID and milliseconds from logging.
2016-02-25 18:20:43 -08:00
Anthony J. Thibault
08c16beff2
Application: re-worded presentCount comments
2016-02-25 18:17:42 -08:00
Andrew Meadows
f964df6c97
final names for ViewFrustum intersection tests
2016-02-25 18:09:35 -08:00
Andrew Meadows
5d1e283508
namechange TouchesKeyhole to IntersectsKeyhole
2016-02-25 18:09:35 -08:00
Andrew Meadows
2591c5ee3e
cleanup names that use "keyhole"
2016-02-25 18:09:35 -08:00
Andrew Meadows
9558258f64
use cubeInKeyhole() where appropriate
2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853
use shapeInFrustum() names again
...
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
2016-02-25 18:09:35 -08:00
Anthony J. Thibault
11cd8e03b9
Merge branch 'master' into tony/simrate-fix
2016-02-25 17:50:23 -08:00
Anthony J. Thibault
1fdae13de1
Application: don't simulate until we are ready to render.
2016-02-25 17:48:55 -08:00
David Rowe
513bc5d4ef
Style scripts section
2016-02-26 14:10:37 +13:00
Stephen Birarda
34408c8144
Revert "verified domain ownership for full automatic networking"
2016-02-25 17:02:08 -08:00
David Rowe
a25702535b
Style snapshots section
2016-02-26 14:01:57 +13:00
Zach Pomerantz
113596636d
Merge pull request #7189 from ZappoMan/depthReticleWork
...
fix desktop detection when not pointing at overlay area
2016-02-25 16:24:06 -08:00
Brad Hefta-Gaub
e58081ca9c
remove extra debug code
2016-02-25 16:23:12 -08:00
Brad Hefta-Gaub
b0c286bc3b
Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay
...
Conflicts:
interface/src/Application.cpp
2016-02-25 16:21:38 -08:00
Brad Hefta-Gaub
202a456e1a
Merge pull request #7126 from AndrewMeadows/cleanup
...
cleanup ViewFrustum method names
2016-02-25 16:12:25 -08:00
Brad Hefta-Gaub
82cbf19bca
Merge pull request #7078 from zzmp/fix/light-intensity
...
Reimplement light attenuation for spot and point lights
2016-02-25 16:08:28 -08:00
Brad Hefta-Gaub
519a90f2bd
fix the overlays visible on startup case
2016-02-25 16:02:05 -08:00
Seth Alves
4873a1e26b
Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-more
2016-02-25 15:40:21 -08:00
Seth Alves
74452bc890
put back some code that shouldn't have been removed
2016-02-25 15:34:50 -08:00
Seth Alves
8f304d95b3
rather than computing a velocity for entities held by others as a way to keep it active in local bullet, just call activateBody over and over
2016-02-25 15:26:42 -08:00
Clément Brisset
2e7c7eace5
Merge pull request #7179 from birarda/domain-security
...
verified domain ownership for full automatic networking
2016-02-25 15:24:09 -08:00
Brad Hefta-Gaub
366aa39be8
handle startup overlay visibility correctly
2016-02-25 14:46:08 -08:00
Brad Hefta-Gaub
8422d4f36a
Merge pull request #7198 from howard-stearns/snapTurnDefault
...
snap turn default
2016-02-25 14:25:00 -08:00
samcake
610189ded3
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 14:14:04 -08:00
samcake
96fb9c4466
cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures
2016-02-25 14:13:35 -08:00
Seth Alves
489fad4141
Merge pull request #7188 from ZappoMan/menuGroups
...
remove some unimplemented menu items
2016-02-25 14:00:38 -08:00
David Rowe
d255ad3805
Improve property naming
2016-02-26 10:17:36 +13:00
howard-stearns
d8fe55ddc5
Proper default for snapTurn preference (and new name so as to update old
...
users).
2016-02-25 13:06:34 -08:00
David Rowe
5d931523ad
Style settings section headings
2016-02-26 10:03:00 +13:00
Zach Pomerantz
32ce7c6eab
Rename light surfaceRadius->falloffRadius
2016-02-25 10:02:33 -08:00
Andrew Meadows
9c927ea36b
ViewFrustum method renames and whitespace cleanup
...
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
2016-02-25 09:11:28 -08:00
Brad Hefta-Gaub
91f6b7e80d
Merge pull request #7186 from zzmp/feat/scene-ambient-tex
...
Wire up zone ambientURL
2016-02-25 09:05:25 -08:00
Brad Hefta-Gaub
526f9dc248
check/uncheck the overlays menu when you toggle the overlays via some other mechanism
2016-02-25 08:41:38 -08:00
Brad Hefta-Gaub
5828c32041
add toggleOverlays menu item and action
2016-02-25 08:31:11 -08:00
David Rowe
09029e4edd
Change name of dialog to match menu item
2016-02-25 20:37:54 +13:00
David Rowe
f04654fb56
Style and swap order of save and cancel buttons
2016-02-25 20:35:27 +13:00
David Rowe
10efbd996f
Update General Settings dialog to use new window frame style
2016-02-25 20:26:36 +13:00
David Rowe
023c04d2fe
Add optional footer to "form editor" dialogs
2016-02-25 20:25:20 +13:00
samcake
ae6e625894
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-24 17:30:40 -08:00
Brad Hefta-Gaub
8b6a445b9e
fix desktop detection when not pointing at overlay area
2016-02-24 16:42:08 -08:00
Seth Alves
cfdaf643a1
Merge pull request #7181 from sethalves/fix-grab-action
...
fix avatarActionHold
2016-02-24 16:28:17 -08:00
Brad Hefta-Gaub
ecb03562d3
fix build buster
2016-02-24 16:24:48 -08:00
Zach Pomerantz
c2ed5e5474
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-24 16:24:09 -08:00
Brad Hefta-Gaub
f9b55c4b87
Merge pull request #7185 from ctrlaltdavid/20809
...
Fixes for new modal message dialog
2016-02-24 16:20:40 -08:00
Brad Hefta-Gaub
ca5de8d6a9
remove some unimplemented menu items
2016-02-24 16:17:11 -08:00
Zach Pomerantz
1817b8ef2f
Use only skyboxTexture in DeferredLightingEffect
2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7
Wire up zone ambientURL
2016-02-24 16:07:04 -08:00
Anthony J. Thibault
62ed5333e0
AvatarActionHold: compute velocities for other avatars
2016-02-24 15:14:56 -08:00
Anthony J. Thibault
b3b4c6473d
Merge branch 'master' into fix-grab-action
2016-02-24 14:34:23 -08:00
David Rowe
b9a1c2051b
Fix modal dialog not being opaque to mouse clicks
2016-02-25 10:52:16 +13:00
Brad Hefta-Gaub
568fd3e77f
Merge pull request #7164 from ctrlaltdavid/20809
...
Restyle message box modal dialogs
2016-02-24 13:47:00 -08:00
Brad Hefta-Gaub
1699e4a396
Merge pull request #7131 from ctrlaltdavid/20805
...
Restyle the Running Scripts dialog
2016-02-24 13:45:40 -08:00
Zach Pomerantz
3c4ab077be
Init validOrientation for myAvatar calc
2016-02-24 13:16:45 -08:00
Zach Pomerantz
e78905a6d1
Rm previousDeltaTimeStep unused field from AvatarActionHold
2016-02-24 13:15:49 -08:00
David Rowe
51b41da488
Horizontally center short messages in the dialog
2016-02-25 09:15:07 +13:00
Seth Alves
e1b10e79df
don't crash when watching someone else near-grab something
2016-02-24 12:09:51 -08:00
Brad Hefta-Gaub
2a18127a01
Merge pull request #7171 from jherico/avatar_qml_location
...
Allow avatar positioning from QML
2016-02-24 11:37:12 -08:00
Brad Hefta-Gaub
3df5d0abad
Merge pull request #7161 from zzmp/fix/overlay-model-scale
...
Use proper getter for model overlay scaling
2016-02-24 09:31:47 -08:00
Chris Collins
64a07440cc
Merge pull request #7180 from jherico/qml
...
Several QML fixes
2016-02-24 08:20:03 -08:00
Chris Collins
7f679af186
Merge pull request #7176 from zzmp/menu/graphics
...
Update graphics menus
2016-02-24 08:18:58 -08:00
Brad Davis
fa23e2023e
Fix bad tool window placement
2016-02-23 21:05:57 -08:00
Clément Brisset
8e8e23452f
Merge pull request #7156 from ZappoMan/depthReticleWork
...
Depth reticle work
2016-02-23 17:54:35 -08:00
Andrew Meadows
8d91912d4b
Merge pull request #7162 from hyperlogic/tony/controller-velocity
...
Improve hand controller move and throw velocity
2016-02-23 17:13:13 -08:00
David Rowe
a816d835d3
Finesse modal message box dialog layout
2016-02-24 13:59:43 +13:00
Zach Pomerantz
ea8edb3744
Remove antialiasing from menus, default to on
2016-02-23 16:24:44 -08:00
Zach Pomerantz
7ae9752272
Remove Render > Ambient Light menu
2016-02-23 16:24:43 -08:00
Chris Collins
94d018be3e
Merge pull request #7172 from zzmp/fix/stats
...
Consolidate stats for opaque/transparent/other
2016-02-23 16:23:11 -08:00
Zach Pomerantz
1f9324c78f
Move Graphics... to Developer menu
2016-02-23 16:14:41 -08:00
David Rowe
7ee1edac3a
Merge branch '20805' into 20809
2016-02-24 13:08:28 +13:00
David Rowe
beef3f59eb
Fix QML warning
2016-02-24 12:59:21 +13:00
David Rowe
76ec5e4600
Merge branch 'master' into 20805
2016-02-24 12:38:44 +13:00
David Rowe
ad4d697f38
Use names for HiFi glyph characters
2016-02-24 12:37:23 +13:00
David Rowe
bac703b29e
Adjust height of Running Scripts now that fonts are consistently sized
2016-02-24 12:36:46 +13:00
David Rowe
128583660b
Specify font sizes in pixels instead of points
...
Makes the dialog layout and look consistent across different devices.
2016-02-24 12:10:19 +13:00
Stephen Birarda
42582e5d0f
remove old voxel cost model from application
2016-02-23 14:53:35 -08:00
Stephen Birarda
6cab831ea0
re-gen the interface keypair while being denied from domain
2016-02-23 14:52:12 -08:00
Anthony J. Thibault
8f27424de7
MyAvatar: bug fix for avatar leaning
2016-02-23 14:30:51 -08:00
David Rowe
9dd1bfad2d
Fix tree view branch indicator colors
...
Using interim HiFi glyphs until branch triangles are added to the font.
2016-02-24 10:54:36 +13:00
Brad Davis
2258a9cad9
Allow avatar positioning from QML
2016-02-23 12:16:41 -08:00
Zach Pomerantz
7804ee22d4
Consolidate stats for opaque/transparent/other
2016-02-23 12:14:00 -08:00
Brad Hefta-Gaub
71262c3e64
cleaner QML rejection of mouse messages
2016-02-23 11:14:16 -08:00
samcake
d3cdc5117f
clean up one more render::Item::isValid(ID)
2016-02-23 11:01:57 -08:00
samcake
7e39cc7753
clean up a bit the 2 globals RenderItem in APplication.cpp
2016-02-23 10:53:33 -08:00
samcake
1c53f9bc87
Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly
2016-02-23 10:40:50 -08:00
Zach Pomerantz
7c9022fb3e
Fix model overlay scaling
2016-02-23 10:40:47 -08:00
Brad Hefta-Gaub
8117d51324
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-23 10:21:10 -08:00
Brad Hefta-Gaub
2db25690f1
detect when mouse is over QML overlays or 2D JS Overlays
2016-02-23 10:14:44 -08:00
samcake
9d0803e6b8
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-23 09:33:54 -08:00
David Rowe
fdb7a9cf75
Merge branch '20805' into 20809
2016-02-23 20:29:18 +13:00
David Rowe
fec82e3125
Merge branch 'master' into 20805
2016-02-23 20:16:31 +13:00
David Rowe
e30135a89d
Increase height of dialog to avoid scrollbars
2016-02-23 20:05:45 +13:00
David Rowe
67b6cafc92
Use placeholder text for Filter field instead of separate label
...
Also fixes color of separate label if that is reinstated at some time.
2016-02-23 20:05:16 +13:00
David Rowe
9583b801f6
Increase size of resize handle
2016-02-23 19:57:13 +13:00
David Rowe
6bf377aac8
Move FontAwesome.qml to be with other font files
2016-02-23 18:16:32 +13:00
David Rowe
0e3cbd2930
Tidying
2016-02-23 18:05:49 +13:00
David Rowe
b09a20187a
Reverse order buttons appear in to make more consistent with Windows
2016-02-23 17:57:21 +13:00
David Rowe
49c229897f
Give the "change avatar?" confirmation dialog a default action
2016-02-23 17:55:36 +13:00
David Rowe
aa32c1f1af
Restyle modal message dialog content
2016-02-23 17:54:02 +13:00
David Rowe
86bb1b1ed8
Make copy of TextEdit control for restyling
2016-02-23 17:44:11 +13:00
Anthony J. Thibault
0fd260076b
SixenseManager: fix velocity and angularVelocity computation
...
Copied the delta based computation of velocity and angularVelocity that was in
Application::setPalmData() and moved it into SixenseManager. This will guarantee
that the velocity computation is the same as it was previously. The goal here is
to NOT change the behavior of the hydra.
The moving average style calculation of velocities has been removed.
Removed dead code.
2016-02-22 20:05:41 -08:00
Brad Davis
160a107bbd
Auto-unhide the desktop when showing or raising a window
2016-02-22 19:36:00 -08:00
Anthony Thibault
3b87cd0ea8
Improve hold action by using controller velocity
...
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose. Rather then trying to derive it based on previous positions. This results in more acurate motion of the held object when the hold is released.
OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
2016-02-22 19:15:22 -08:00
David Rowe
84e352a1de
Move icon to be in title
2016-02-23 14:54:49 +13:00
