Howard Stearns
|
0a67fea6fe
|
Merge pull request #8488 from howard-stearns/snapshot-review-size
decrease snapshot review dialog height
|
2016-08-19 21:31:04 -07:00 |
|
Howard Stearns
|
527fb0941f
|
decrease snapshot review dialog height
|
2016-08-19 21:28:12 -07:00 |
|
Howard Stearns
|
423083d244
|
Merge pull request #8487 from ctrlaltdavid/discovery
Style snapshot dialog
|
2016-08-19 21:15:21 -07:00 |
|
David Rowe
|
8d88726dba
|
Fix spacing above image when single column
|
2016-08-20 13:57:00 +12:00 |
|
David Rowe
|
a94c24e6df
|
Text and controls
|
2016-08-20 13:44:47 +12:00 |
|
Howard Stearns
|
c262b0a497
|
Merge pull request #8484 from howard-stearns/switch-to-html-cards
switch over to metaverse server user story cards
|
2016-08-19 17:55:32 -07:00 |
|
howard-stearns
|
993340811f
|
switch over to metaverse server user story cards
|
2016-08-19 16:40:53 -07:00 |
|
David Rowe
|
6a9f221a9e
|
Snapshot image border
|
2016-08-20 11:36:53 +12:00 |
|
David Rowe
|
3d2afaac77
|
Size and position snapshot dialog content blocks
|
2016-08-20 11:19:30 +12:00 |
|
Howard Stearns
|
e45f390fd2
|
Merge pull request #8481 from howard-stearns/discovery-code-cleanup
discovery code cleanup
|
2016-08-19 15:32:04 -07:00 |
|
howard-stearns
|
1e08914f8d
|
simplify
|
2016-08-19 14:32:15 -07:00 |
|
howard-stearns
|
a3d64dbd9c
|
code cleanup
|
2016-08-19 14:14:31 -07:00 |
|
Howard Stearns
|
e40b33e618
|
Merge pull request #8478 from howard-stearns/update-discovery-from-master2
Update discovery from master2
|
2016-08-19 13:28:34 -07:00 |
|
howard-stearns
|
b8b345fb43
|
Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2
|
2016-08-19 13:04:39 -07:00 |
|
James B. Pollack
|
98f0290565
|
Merge pull request #8436 from huffman/feat/more-user-activity-data
Add more user activity data
|
2016-08-19 10:48:28 -07:00 |
|
Howard Stearns
|
1eebf00d95
|
Merge pull request #8475 from howard-stearns/fixed-aspect-snapshots
option for fixed aspect-ratio snapshots, and used in snapshot button
|
2016-08-19 09:53:32 -07:00 |
|
howard-stearns
|
4d7d483c0e
|
use ceil
|
2016-08-19 09:51:58 -07:00 |
|
Chris Collins
|
a9fbc4ec2c
|
Merge pull request #8448 from huffman/feat/domain-specify-backup-location
Add backup directory setting to domain server
|
2016-08-18 16:45:50 -07:00 |
|
howard-stearns
|
f6670a6374
|
new optional aspect-ratio argument to snapshot chain (javascript through
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio. Snapshot button uses 1.91.
|
2016-08-18 16:29:42 -07:00 |
|
Howard Stearns
|
01fcaa024d
|
Merge pull request #8463 from howard-stearns/html-user-story
html drill-down user story
|
2016-08-18 16:15:47 -07:00 |
|
howard-stearns
|
aab3b83ad9
|
open login if user tries to share and is not logged in, rather than
messaging user that they cannot share
|
2016-08-18 14:20:53 -07:00 |
|
howard-stearns
|
4492c4e64e
|
Allow javascript to safely open the correct login window (or answer that
it is unneded).
|
2016-08-18 14:19:36 -07:00 |
|
howard-stearns
|
5e8722ccf5
|
persist "open feed after" checkbox setting
|
2016-08-18 12:58:00 -07:00 |
|
Brad Hefta-Gaub
|
1cec7b2db0
|
Merge pull request #8429 from SamGondelman/loadingFade2
Don't do fade effect once physics kick in
|
2016-08-18 12:46:24 -07:00 |
|
Brad Davis
|
37192e8251
|
Merge pull request #8472 from zzmp/fix/buffer-debug-flood
fix log flood in debug mode from Buffer::Iterator (c)end access
|
2016-08-18 12:06:45 -07:00 |
|
Chris Collins
|
140b0c4d02
|
Merge pull request #8462 from jherico/openvr_random_position_fix
Address issues with random camera locations
|
2016-08-18 11:51:47 -07:00 |
|
Zach Pomerantz
|
813fefd599
|
reimplement buffer get for (c)end
|
2016-08-18 11:26:25 -07:00 |
|
Clément Brisset
|
d1fb723b01
|
Merge pull request #8444 from zzmp/fix/skybox
fix flashing in default skybox, and allow skybox lighting without textures
|
2016-08-18 11:07:09 -07:00 |
|
James B. Pollack
|
54a5bf3b23
|
Merge pull request #8465 from sethalves/fix-3d-overlay-lines
fix -- make 3d-line overlays work again
|
2016-08-18 09:06:26 -07:00 |
|
Seth Alves
|
8487f825a0
|
don't return reference to local variables
|
2016-08-18 08:01:42 -07:00 |
|
Seth Alves
|
2ff35768aa
|
make 3d-line overlays work again
|
2016-08-17 18:45:09 -07:00 |
|
Ryan Huffman
|
d46af500c1
|
Fix wrong property name in entity activity tracking
|
2016-08-17 17:00:56 -07:00 |
|
howard-stearns
|
0f415abd6b
|
dual purpose address bar - switchable between html and qml
|
2016-08-17 16:56:52 -07:00 |
|
Ryan Huffman
|
25b9d756ca
|
Update entity edit tracking to track count rather than bool
|
2016-08-17 16:54:04 -07:00 |
|
Brad Davis
|
89df5768f3
|
Merge pull request #8435 from imgntn/touch_grip
Map oculus touch grip to trigger
|
2016-08-17 16:38:58 -07:00 |
|
howard-stearns
|
d58cc8ddd9
|
use html card from user_story id, and close things when
receiveHifiSchemeUrl
|
2016-08-17 16:35:29 -07:00 |
|
howard-stearns
|
e75f950ac7
|
Signal receivedHifiSchemeURL
|
2016-08-17 16:34:59 -07:00 |
|
Clément Brisset
|
8b54c92494
|
Merge pull request #8459 from ctrlaltdavid/21032
QA READY: Fix Asset Browser dialog
|
2016-08-17 15:37:43 -07:00 |
|
Brad Davis
|
a32ab77b7d
|
Address issues with random camera locations caused by bad HMD sensor poses
|
2016-08-17 15:22:30 -07:00 |
|
David Rowe
|
9fa4a20e55
|
Fix Asset Browser dialog
|
2016-08-18 09:37:26 +12:00 |
|
David Kelly
|
37dc324cec
|
Merge pull request #8454 from howard-stearns/ux-improvements
snapshot ux improvements
|
2016-08-17 12:23:12 -08:00 |
|
Brad Hefta-Gaub
|
87964c89da
|
Merge pull request #8453 from huffman/feat/sandbox-logs-button
Add a button to the sandbox log window to open the log directory
|
2016-08-17 10:47:04 -07:00 |
|
howard-stearns
|
8823f48666
|
new snapshot review behavior
|
2016-08-17 10:00:20 -07:00 |
|
howard-stearns
|
17d9db487d
|
adjust .qml for useFeed being a c++ property instead of qml.
|
2016-08-17 09:57:46 -07:00 |
|
howard-stearns
|
347b20e506
|
expose to scripts the ability to show dedicated qml windows such as
preferences
|
2016-08-17 09:54:15 -07:00 |
|
howard-stearns
|
2a099d5577
|
expose to scripts the ability to open the feed
|
2016-08-17 09:53:26 -07:00 |
|
howard-stearns
|
48ff26eeb7
|
provide a way to programmatically show the feed (showing address bar in
feed mode).
|
2016-08-17 09:50:38 -07:00 |
|
Ryan Huffman
|
8ba105d1e4
|
Fix open-log-dir button handler
|
2016-08-17 09:36:42 -07:00 |
|
Ryan Huffman
|
0e259dcd29
|
Add open log dir button to server-console
|
2016-08-17 09:29:45 -07:00 |
|
Brad Hefta-Gaub
|
f66b36ff07
|
Merge pull request #8441 from imgntn/marketplace_spawn_location
Better create locations for Entities
|
2016-08-17 09:09:00 -07:00 |
|