Brad Hefta-Gaub
f4e4f217e8
Merge pull request #7642 from ctrlaltdavid/20872
...
Further restyling of edit.js
2016-04-22 13:46:26 -07:00
Brad Hefta-Gaub
79a1e6264e
Merge pull request #7714 from hyperlogic/tony/default-anims-are-local
...
Avatar animations are now stored locally
2016-04-22 13:44:30 -07:00
David Rowe
7b9e6b52fb
Merge branch 'master' into 20872
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-04-22 13:19:47 +12:00
David Rowe
a7b82e8cae
Decouple ui and shared libraries
2016-04-22 12:58:47 +12:00
David Rowe
266e4c998b
Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD
2016-04-22 12:29:22 +12:00
David Rowe
6c5335cfa7
Replace button with icon and text
2016-04-21 15:17:06 +12:00
David Rowe
9c9bca546c
Add button that opens scripts directory window
2016-04-21 11:52:03 +12:00
Anthony J. Thibault
506033a5d8
Remove old avatar-animation.json
2016-04-19 16:14:26 -07:00
Anthony J. Thibault
8e5785cdf8
Avatar animations are now stored locally
...
Improves FTUE, by no longer going over the network to download default avatar animations.
This also includes support for relative animation urls within the animation.json
2016-04-19 16:11:14 -07:00
David Rowe
54b032f612
Merge branch 'master' into 20872
2016-04-20 08:51:53 +12:00
David Rowe
47b4c36546
Merge branch 'master' into 20872
2016-04-19 12:56:55 +12:00
Brad Hefta-Gaub
f5cddc9962
fix the bug that Omega found
2016-04-18 17:26:12 -07:00
Brad Hefta-Gaub
01907f181f
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-18 16:01:42 -07:00
Brad Hefta-Gaub
b62f1a135d
fix qml to work with rect instead of vec4
2016-04-16 17:29:03 -07:00
Brad Hefta-Gaub
8f3d48190a
switch to QRect instead of vec4
2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807
code review feedback
2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
54777c9cd5
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-16 15:19:35 -07:00
David Rowe
8f6cfb72ea
Fix QML warnings at shutdown
2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
d5a46d3390
handle repositioning of qml windows
2016-04-15 20:01:14 -07:00
Brad Hefta-Gaub
04df84974c
handle repositioning of qml windows
2016-04-15 19:50:12 -07:00
Howard Stearns
e4f8a67e60
Merge pull request #7649 from hyperlogic/tony/simplify-away-mode
...
away.js: fix for permanent disabling avatar IK
2016-04-15 13:35:14 -07:00
David Rowe
19fd8cda14
Merge branch 'master' into 20872
2016-04-15 17:36:42 +12:00
David Rowe
bda2f455e5
Add buttons to entities list that toggle locked and visible
2016-04-15 16:26:34 +12:00
David Rowe
9e2c844dc0
Updated the HiFi glyphs font file
...
Used the new "model" icon in entity properties tab.
2016-04-13 16:48:13 +12:00
David Rowe
43f843f731
Retrofit updated margins and spacing to QML dialogs
2016-04-13 16:39:52 +12:00
David Rowe
b33d28852b
Merge branch 'master' into 20872
2016-04-13 13:11:26 +12:00
Brad Davis
1a02220886
Fixing wobble
2016-04-12 17:50:59 -07:00
Anthony J. Thibault
87cba810a7
remove away states from avatar-animation.json
...
away.js: prefetch the kneel animation, so it is available when we need it.
2016-04-12 15:37:31 -07:00
Brad Hefta-Gaub
3f05ded932
Merge pull request #7611 from zzmp/guard/amd
...
Disable gradient QML items on AMD
2016-04-12 08:32:57 -07:00
David Rowe
f7f5443a44
Merge branch 'master' into 20872
...
Conflicts:
examples/html/entityProperties.html
2016-04-12 15:40:35 +12:00
David Rowe
d6fcbd2dac
Revisit margins and spacing
2016-04-12 15:07:30 +12:00
Zach Pomerantz
1df2fc7809
Disable qml gradient for AMD for ContentSection
2016-04-11 13:59:08 -07:00
Zach Pomerantz
d719b3692e
Consolidate qml alpha gradient workaround to desktop
2016-04-11 11:36:42 -07:00
Brad Davis
df8ad57185
Fix FPS counter
2016-04-11 00:25:16 -07:00
Brad Davis
2353daa254
Merge pull request #7614 from ctrlaltdavid/20876
...
Disable arrow keys being able to move between HTML form fields
2016-04-08 13:28:30 -07:00
David Rowe
77e16f62c9
Merge branch 'master' into 20872
...
Conflicts:
examples/html/edit-style.css
2016-04-08 15:08:34 +12:00
Zach Pomerantz
e54cfce392
Disable qml alpha gradients for AMD
2016-04-07 18:27:36 -07:00
Brad Hefta-Gaub
d79d66c34e
Merge pull request #7601 from ctrlaltdavid/20871
...
Entities editor fixes
2016-04-07 17:14:00 -07:00
Brad Hefta-Gaub
5287c174b4
Merge pull request #7605 from jherico/route_log_errors
...
Fixing logging errors on initial load of controller routes
2016-04-07 17:13:13 -07:00
David Rowe
e37e46d34a
Disable arrow keys being able to move between HTML form fields
...
Moving between form fields with arrow keys makes it to easy to make
unintended changes to adjacent fields.
2016-04-08 10:30:00 +12:00
Brad Davis
2f28c64edb
Fixing menu navigation in oculus remote
2016-04-07 13:21:00 -07:00
Brad Davis
a58a627fdf
Support oculus remote input
2016-04-07 13:20:59 -07:00
Brad Davis
85019b2b5e
Fixing logging errors on initial load of controller routes
2016-04-07 10:41:54 -07:00
David Rowe
3f62702ff0
Add search icon to entity list filter
2016-04-07 13:38:00 +12:00
David Rowe
4e3cdf6569
Update Running Scripts' search to have rounded ends and a search icon
2016-04-07 12:32:27 +12:00
David Rowe
c9c414d5a8
Fix entities editor display of large negative coordinates and angles
2016-04-06 07:45:04 +12:00
Brad Hefta-Gaub
e5f3ec4600
Merge pull request #7545 from birarda/marketplace-to-examples
...
renaming of marketplace icon/window to examples
2016-04-03 14:25:00 -07:00
Seth Alves
5fa9f662fc
Merge pull request #7542 from birarda/refresh-on-asset-connect
...
refresh/close the asset browser dialog on domain switch
2016-04-01 18:08:59 -07:00
Seth Alves
4788bb453b
Merge pull request #7540 from murillodigital/master
...
Updating defaultAvatar_full.fbx to fixed version
2016-04-01 15:53:19 -07:00
Stephen Birarda
6e83ed5ccc
use a more generic custom user agent
2016-04-01 15:49:24 -07:00