howard-stearns
e6746acf4c
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-11 15:40:26 -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
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
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
SamGondelman
50a4c8b496
mini mirror fades with overlays
2016-08-09 18:02:56 -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
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 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
David Kelly
18990821df
Added 'path' to user stories, works now.
...
yay
2016-08-09 14:15:49 -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
howard-stearns
f34030d276
factor out metaverseBase to make it easier to repoint to a test server
2016-08-09 12:48:01 -07:00
Brad Hefta-Gaub
1834b035d7
Merge pull request #8382 from ctrlaltdavid/21024
...
Disable Asset Browser's right-click popup menu if in HMD mode
2016-08-09 12:41:48 -07:00
Brad Hefta-Gaub
d8f1847fde
Merge pull request #8365 from huffman/feat/default-skybox
...
Default skybox change
2016-08-09 11:17:36 -07:00
Brad Hefta-Gaub
d8edf5c85a
Merge pull request #8357 from sethalves/fsm-arrows-dont-walk
...
FSM arrow keys don't make the avatar walk
2016-08-09 11:17:00 -07:00
Ryan Huffman
8ee3f680c9
Change default skybox ambient intensity from 3.5 to 2.0
2016-08-08 16:03:03 -07:00
Ryan Huffman
6854f9fda4
Remove stars shaders and renderable
2016-08-08 16:03:03 -07:00
Ryan Huffman
eaa77edc25
Replace 'Stars' menu option with 'Default Skybox'
2016-08-08 16:03:03 -07:00
Ryan Huffman
9cbfe195cd
Adjust commenting out of old stars rendering code
2016-08-08 16:03:03 -07:00
Ryan Huffman
4c662b0d60
Add static consts for default skybox values
2016-08-08 16:03:03 -07:00
Ryan Huffman
c47a5c5aad
Add default skybox images
2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0
Move default skybox out of global and make irradiance gen optional
2016-08-08 16:03:03 -07:00
Ryan Huffman
35ea9908cd
Add default skybox
2016-08-08 16:00:58 -07:00
Brad Hefta-Gaub
55c690d016
Merge pull request #8368 from huffman/feat/domain-connection-display
...
Automatically show address bar after disconnected for X seconds
2016-08-08 15:56:29 -07:00
David Kelly
c8f3a898d2
First cut of a snapshot uploader
...
Will need to test end-to-end shortly, etc...
2016-08-08 15:27:27 -07:00
SamGondelman
328d3128fa
merge from master
2016-08-08 13:30:39 -07:00
SamGondelman
a5f3089fda
fix ABXY mapping for touch
2016-08-08 13:14:14 -07:00
Ryan Huffman
fb14628a7e
Handle case in entity loading priority function where max dim size is <= 0
2016-08-08 10:39:27 -07:00
Ryan Huffman
d367583426
Clean up priority loading implementation
2016-08-08 08:53:06 -07:00
Ryan Huffman
d48bc96cf9
Add ability to set number of concurrent downloads
2016-08-08 08:53:06 -07:00
Ryan Huffman
4f9be2ae72
Fix camera position not being set for angular loading
2016-08-08 08:53:06 -07:00
Seth Alves
38314b180b
Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk
2016-08-08 06:30:18 -07:00
David Rowe
38b5314322
Disable Asset Browser's right-click popup menu if in HMD mode
2016-08-06 17:53:59 +12:00
SamGondelman
771e105fa2
Merge remote-tracking branch 'upstream/master' into loadingFade
2016-08-05 16:52:01 -07:00
Chris Collins
1e2d77a99b
Merge pull request #8346 from sethalves/default-when-av-fails
...
use default avatar when avatar-url is bogus
2016-08-05 15:13:58 -07:00
Brad Hefta-Gaub
82119f7f0b
Merge pull request #8336 from ctrlaltdavid/21018
...
close file browser dialog immediately after selecting asset to upload
2016-08-05 14:39:35 -07:00
Seth Alves
84ce29eb90
Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk
2016-08-05 10:44:46 -07:00
howard-stearns
fed775ff83
simple snapshot confirmation
2016-08-04 15:52:39 -07:00
Ryan Huffman
d775a92dab
Update implementation of ConnectionMonitor timeout
2016-08-04 14:45:10 -07:00
Ryan Huffman
26b9da7eef
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-connection-display
2016-08-04 14:41:03 -07:00
Ryan Huffman
a37bcdafda
Remove debug logging in ConnectionMonitor
2016-08-04 14:40:41 -07:00
Ryan Huffman
8044910bf2
Add show-address-bar when disconnected from domain
2016-08-04 14:39:53 -07:00
SamGondelman
b6e73e06a2
merge from master
2016-08-04 13:34:38 -07:00
howard-stearns
8a7bbbaaed
limit user stories to first 100
2016-08-04 12:37:09 -07:00
howard-stearns
04bd98b15f
new assets. remove margins between buttons (letting the graphics do the
...
work)
2016-08-04 12:33:50 -07:00
howard-stearns
1ecb01feac
center the scroll
2016-08-04 12:06:07 -07:00
