howard-stearns
ae9af88db2
Spacing and better size for HMD pictures.
2016-08-12 11:28:35 -07:00
howard-stearns
df0ceb17e8
send (hi res image) details as a json string
2016-08-12 11:09:22 -07:00
David Kelly
da7f086715
Merge pull request #8419 from howard-stearns/basic-user-story-card
...
basic user story card
2016-08-12 10:47:10 -07:00
Howard Stearns
d4121a7224
Merge pull request #8411 from davidkelly/dk/gateSnapshotShares
...
Hide sharing if not logged in, or in an accessible place
2016-08-12 10:35:39 -07:00
David Kelly
3408ad6f54
Wording change
2016-08-12 10:23:33 -07:00
David Kelly
e23e9014c6
Merge remote-tracking branch 'upstream/discovery' into dk/gateSnapshotShares
2016-08-12 10:16:27 -07:00
Howard Stearns
8708e2ac2b
image url, in anticipation of having it in details
2016-08-12 07:00:07 -07:00
howard-stearns
b4a43db025
include user name in search text for user stories
2016-08-11 17:04:48 -07:00
howard-stearns
cd9bd8dddf
we don't need the dummy data any more
2016-08-11 16:58:06 -07:00
Howard Stearns
d5a05933a1
Merge pull request #8418 from howard-stearns/discovery
...
merge from master to discovery
2016-08-11 16:49:23 -07:00
howard-stearns
747c43d065
basic user story card
2016-08-11 16:43:29 -07:00
howard-stearns
e3aae0e93f
Fix up layout, and adapt to recent changes in file structure
2016-08-11 16:23:01 -07:00
howard-stearns
e6746acf4c
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-11 15:40:26 -07:00
Stephen Birarda
3ec1681a4e
Merge pull request #8412 from birarda/default-permissions
...
default DS to allow connect for standard groups
2016-08-11 15:14:52 -07:00
Brad Hefta-Gaub
ea1e090053
Merge pull request #8383 from AndrewMeadows/faster-is-better
...
faster image processing on load
2016-08-11 13:10:44 -07:00
James B. Pollack
6da2ea1932
Merge pull request #8409 from SamGondelman/loadingFade
...
Fix procedural entity transparency
2016-08-11 12:02:57 -07:00
David Kelly
c1edd008a4
PR feedback
2016-08-11 11:47:55 -07:00
Stephen Birarda
5bac88c004
default domain-server permissions to connect for standard
2016-08-11 10:52:36 -07:00
David Kelly
47dea0ea2b
Hide sharing if not logged in, or in an accessible place
...
The grand future will have option to login, and so on...
2016-08-10 17:09:43 -07:00
Howard Stearns
4273056c86
Merge pull request #8410 from davidkelly/dk/snapshotDetails
...
Minor update to add details
2016-08-10 15:17:22 -07:00
David Kelly
5c15b52040
expose getPlaceName() as placename
...
Nice for scripts to get the placename. Nice for us, anyways.
2016-08-10 14:54:29 -07:00
David Kelly
f8f99721c3
Minor update to add details
...
And, now reflects data-web's slightly updated json structure
for returning info on an uploaded snapshot.
2016-08-10 14:25:00 -07:00
SamGondelman
d8545bc7a3
fix procedural transparency
2016-08-10 13:49:35 -07:00
Brad Hefta-Gaub
5bd5fc43d3
Merge pull request #8408 from SamGondelman/miniMirrorFade
...
Mini mirror fades with overlays
2016-08-10 11:07:47 -07:00
Brad Hefta-Gaub
a714f325fe
Merge pull request #8333 from SamGondelman/miscFixes
...
Miscellaneous cmake and render engine improvements
2016-08-10 11:06:50 -07:00
SamGondelman
e35d453b37
...missing space
2016-08-10 10:36:37 -07:00
SamGondelman
9e20d92241
CR changes
2016-08-10 10:35:18 -07:00
Brad Hefta-Gaub
7503a495fd
Merge pull request #8401 from ctrlaltdavid/21026
...
Fix crash when adding new attachment
2016-08-10 09:18:17 -07:00
Brad Hefta-Gaub
9874c63b25
Merge pull request #8398 from zzmp/refactor/system-html
...
refactor system html to split js/css
2016-08-10 09:17:52 -07:00
Brad Hefta-Gaub
d736857ecb
Merge pull request #8391 from AlexanderOtavka/qml-atp
...
Add support for ATP protocol to QML
2016-08-10 09:16:20 -07:00
SamGondelman
50a4c8b496
mini mirror fades with overlays
2016-08-09 18:02:56 -07:00
David Kelly
c487843f10
Merge pull request #8404 from howard-stearns/share-dialog
...
proper share dialog
2016-08-09 17:17:24 -07:00
Brad Hefta-Gaub
412052c285
Merge pull request #8380 from highfidelity/fade
...
Add fade in loading effect
2016-08-09 16:50:05 -07:00
Brad Hefta-Gaub
8abbe27c07
Merge pull request #8387 from SamGondelman/mappingFixes
...
Fix Standard.A/B/X/Y primary thumb JSON mappings
2016-08-09 16:43:45 -07:00
howard-stearns
5715fd00f3
proper share dialog
2016-08-09 16:42:41 -07:00
Brad Hefta-Gaub
657dc530b4
Merge pull request #8399 from SamGondelman/xboxFixes
...
Teleport works with xbox controllers
2016-08-09 16:41:37 -07:00
SamGondelman
2360e90d39
simplify valid check for rotation
2016-08-09 15:48:31 -07:00
Howard Stearns
2cdca6211f
Merge pull request #8389 from davidkelly/dk/uploadSnapshot
...
First cut of a snapshot uploader
2016-08-09 15:47:04 -07:00
David Rowe
8e56e0bf18
Fix QML warning
2016-08-10 10:41:37 +12:00
David Rowe
afe76c69d2
Fix crash when adding new attachment
2016-08-10 10:41:16 +12:00
Zach Pomerantz
d5b822ddbe
remove missing camera selectors
2016-08-09 15:23:36 -07:00
Zach Pomerantz
6965fb0520
refactor system html to split js/css
2016-08-09 15:23:31 -07:00
SamGondelman
956078bc91
teleport works with xbox controller
2016-08-09 15:17:36 -07:00
David Kelly
d4f376879d
PR feedback
2016-08-09 15:05:23 -07:00
SamGondelman
9b27f8bc0f
Merge remote-tracking branch 'upstream/master' into loadingFade
2016-08-09 14:55:14 -07:00
David Kelly
0d1df2627d
Merge pull request #8356 from howard-stearns/feed-display
...
feed display
2016-08-09 14:52:53 -07:00
Ryan Huffman
093d80e102
Merge pull request #8397 from SamGondelman/ucharWarning
...
Fix warning on OSX/Linux
2016-08-09 14:31:16 -07:00
David Kelly
18990821df
Added 'path' to user stories, works now.
...
yay
2016-08-09 14:15:49 -07:00
SamGondelman
5a4d15dd5b
fix warning
2016-08-09 14:02:42 -07:00
David Kelly
8457acd234
First guess on how to deal with place
...
Fall back to host when there is no place. Probably better ideas, like
specify the name and the type (a place, a domain if no place, etc...)
will come soon.
2016-08-09 13:42:48 -07:00
