David Rowe
52137cb3c1
Put keyboard at bottom of scrolling dialogs rather than under controls
2016-09-24 11:40:38 +12:00
Howard Stearns
3f31da68fe
Merge pull request #8638 from howard-stearns/uniform-story-handling
...
Uniform story handling
2016-09-23 16:11:41 -07:00
Chris Collins
be33524990
Merge pull request #8636 from zzmp/clean/audio-config
...
strip unused audio settings, hide the rest
2016-09-23 15:08:48 -07:00
Zach Pomerantz
277eefafd7
remove the audio stats dialog
2016-09-23 14:39:07 -07:00
howard-stearns
a5fb0c9bd5
Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling
2016-09-23 13:16:36 -07:00
Zach Pomerantz
d0f4a29031
Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection
2016-09-23 13:12:39 -07:00
Zach Pomerantz
a9318d052b
Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config
2016-09-23 13:11:52 -07:00
Brad Davis
f33d3a3b36
Migrate logging functionality to shared library
2016-09-23 12:04:58 -07:00
Brad Davis
a7f0ba24ed
Dynamic texture memory management
2016-09-23 12:04:42 -07:00
howard-stearns
c4ed84f9a6
remove obsolete file
2016-09-22 16:49:38 -07:00
howard-stearns
17549348b4
less busy hotspotting, and make use of restricted feed (by protocol)
2016-09-22 16:48:16 -07:00
howard-stearns
4357bb391d
Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling
2016-09-22 14:54:15 -07:00
Howard Stearns
8e9b743515
rollover images
2016-09-21 19:15:01 -07:00
Brad Hefta-Gaub
5d3d4bdbd9
add support for redirection on domain at max capacity
2016-09-21 18:12:38 -07:00
Zach Pomerantz
e2ff738fc3
strip unused audio settings
...
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
2016-09-21 17:35:27 -07:00
Zach Pomerantz
9e2ec27b29
always play audio injectors locally
2016-09-21 17:20:51 -07:00
Ken Cooke
b14f43b11e
Merge pull request #8610 from zzmp/test/audio-jitter
...
add audio jitter simulator testing tool
2016-09-21 16:43:36 -07:00
Howard Stearns
660343f8c6
Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling
2016-09-21 16:31:50 -07:00
howard-stearns
41b20dc69d
single feed with snapshot and concurrency, no radio buttons, mini-card
...
has two hotspots that bring up different kinds of cards, and anywhere
else on the minicard takes you "there".
2016-09-21 16:00:29 -07:00
David Rowe
6f2956392e
Merge remote-tracking branch 'seth/qml-keyboard' into 21055
2016-09-22 08:45:58 +12:00
Clément Brisset
f26fbca699
Merge pull request #8623 from ZappoMan/improvedPreview
...
Improved preview
2016-09-20 19:05:26 -07:00
Seth Alves
2468b56079
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-20 13:28:20 -07:00
Brad Hefta-Gaub
8f5c5ebf0e
improved disabled preview wording
2016-09-19 18:19:35 -07:00
Brad Hefta-Gaub
fd474f6319
add basic support for master vs stable builds
2016-09-19 14:14:32 -07:00
Chris Collins
3d9f231543
Merge pull request #8609 from zzmp/fix/audio-stats
...
fix audio network stats
2016-09-19 09:08:35 -07:00
Zach Pomerantz
bbbe070af1
bring audio network latencies to standard
2016-09-15 18:19:58 -07:00
Zach Pomerantz
5b03d3e13d
render audio network stats immediately
2016-09-15 18:19:57 -07:00
Brad Hefta-Gaub
41bbfcd578
Merge pull request #8603 from sethalves/quiet-logging
...
categorize some qDebugs
2016-09-15 18:09:11 -07:00
Zach Pomerantz
177466e4c7
calculate unplayed ms on all streams/buffers as max
2016-09-15 17:54:41 -07:00
Zach Pomerantz
53f5899a69
add audio jitter simulator
2016-09-15 14:51:39 -07:00
Zach Pomerantz
9792d025fa
clean up audio stats
2016-09-15 13:09:06 -07:00
Seth Alves
d67701f7bb
new logging category for deadlock debug prints
2016-09-15 13:02:18 -07:00
Seth Alves
4470338663
catagorize some qDebugs
2016-09-14 21:39:45 -07:00
Seth Alves
d83600a22e
Merge pull request #8599 from howard-stearns/close-address-bar-after-going-home
...
close address bar after going home
2016-09-14 19:43:57 -07:00
Seth Alves
59db640cb5
add explaining comment
2016-09-14 11:33:03 -07:00
Seth Alves
8734661a0e
add explaining comment
2016-09-14 11:28:22 -07:00
Seth Alves
e5e9bb0052
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-14 11:28:10 -07:00
howard-stearns
db20a8ceef
fix 1319
2016-09-14 11:20:09 -07:00
Seth Alves
1dace86df8
Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard
2016-09-14 10:38:36 -07:00
Seth Alves
409ebe526b
qml keyboard for Browser window
2016-09-14 10:38:08 -07:00
Seth Alves
e6a1c14de6
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-14 09:43:19 -07:00
Ryan Huffman
e506491026
Remove blank lines
2016-09-13 16:35:13 -07:00
Ryan Huffman
23450e929b
Add special avatar id for attaching overlays
2016-09-13 16:33:58 -07:00
Seth Alves
447de7cd5a
qml keyboard for edit.js window
2016-09-13 16:31:59 -07:00
Seth Alves
dff567054d
qml keyboard for avatar preferences dialog
2016-09-13 11:17:00 -07:00
Seth Alves
161424afaf
qml keyboard for browsable preferences
2016-09-12 21:39:52 -07:00
Seth Alves
753e4c4c7b
keyboard for avatar attachment model url dialog
2016-09-12 16:49:10 -07:00
Seth Alves
2c0676d9b1
make qml keyboard work better in running-scripts dialog
2016-09-12 16:28:24 -07:00
Seth Alves
b841e3094d
qml keyboard for file dialog
2016-09-12 16:23:05 -07:00
Seth Alves
3e86b2f0f2
remove some unneeded objectNames
2016-09-12 15:34:29 -07:00
Seth Alves
4c370d0d32
qml keyboard for query-dialog
2016-09-12 15:31:07 -07:00
David Rowe
fe8b3b4d0d
Merge branch 'master' into 21040
2016-09-13 09:12:47 +12:00
Seth Alves
38a1556716
qml keyboard for running-scripts window
2016-09-12 13:28:46 -07:00
Seth Alves
e020351c93
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-12 11:22:12 -07:00
Howard Stearns
b949c83a05
remove jpg error popup behavior
2016-09-10 11:18:14 -07:00
Seth Alves
8899c0b790
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-10 10:43:07 -07:00
David Rowe
44282499c5
New glyph for "has transparent"
2016-09-10 14:37:09 +12:00
Seth Alves
44af3b43cc
fix property access
2016-09-09 17:02:11 -07:00
Seth Alves
c396196e0f
show and hide keyboard for qml windows
2016-09-09 16:48:46 -07:00
Brad Hefta-Gaub
258c83f864
Merge pull request #8551 from jherico/texture_load_test_pbo
...
Stuttering: Sparse Textures
2016-09-09 13:47:27 -07:00
Brad Hefta-Gaub
dbf29ba79d
Merge pull request #8569 from jherico/gli
...
Stuttering: Upgrade GLM & add GLI integration
2016-09-09 12:11:08 -07:00
Seth Alves
f6398315b1
avoid a crash-on-exit
2016-09-09 11:48:14 -07:00
Seth Alves
e5b56fec7c
put keyboard on location dialog
2016-09-09 11:32:17 -07:00
Brad Davis
ecfe56085d
GLM update and GLI integration
2016-09-09 10:18:15 -07:00
Brad Hefta-Gaub
fddbeb6d11
Merge pull request #8588 from zzmp/test/audio-jitter
...
add a test for audio jitter in DEV/PR builds
2016-09-09 10:17:34 -07:00
David Rowe
ce58edc4e0
Add frustum property to JavaScript Camera object
2016-09-09 18:56:05 +12:00
Brad Davis
bc6b43b7be
Add debug option to lower texture resolution
2016-09-08 22:19:17 -07:00
Brad Hefta-Gaub
ad8a832c86
Merge pull request #8582 from howard-stearns/open-browser-and-close
...
Handle window.open/close in Web content.
2016-09-08 21:17:40 -07:00
Brad Hefta-Gaub
b56ad737d4
Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation
...
Web Entities Virtual Keyboard + Event Bridge support
2016-09-08 18:36:46 -07:00
Anthony J. Thibault
d38625ce2a
Coding standard fix for JS portions of QML.
...
Semicolons at end of line.
2016-09-08 18:16:32 -07:00
Brad Hefta-Gaub
3d54600843
Merge pull request #8513 from Atlante45/feat/network-port
...
Add settings to change local port
2016-09-08 18:10:32 -07:00
Anthony J. Thibault
3574267382
Fix for keyboard on facebook share pop-up
...
It was a div tag with "contenteditable"="true" attribute.
2016-09-08 18:00:45 -07:00
Zach Pomerantz
e785c0cdf8
add test for audio jitter
2016-09-08 17:50:11 -07:00
Anthony J. Thibault
f7516c2b07
code convention and eslint on createGlobalEventBridge.js
2016-09-08 13:52:19 -07:00
howard-stearns
ebf280fd6f
Handle window.open requests from web pages in WebView following QT upgrade.
...
Handle window.close requests in the browser.
2016-09-08 13:06:33 -07:00
howard-stearns
b918e1ec51
fix system toolbar following upgrade to QT 5.6
2016-09-08 11:32:12 -07:00
Anthony J. Thibault
ebb4c0990b
Removed local copy of qtwebchannel.js, use qt resource version instead
2016-09-07 17:14:33 -07:00
Anthony J. Thibault
69bda0de83
Shift key resets after first alpha key.
2016-09-07 13:49:47 -07:00
Seth Alves
624cc655dd
disable code that backs-up in time to pick release velocity
2016-09-07 13:24:53 -07:00
Anthony J. Thibault
7b4b98971e
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 12:49:13 -07:00
Anthony J. Thibault
41e0b8732f
fix for occasional crash when deleting web entity
2016-09-07 10:59:16 -07:00
Anthony J. Thibault
dc0d0c2d5c
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 09:49:55 -07:00
Ken Cooke
9457d49103
Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio
2016-09-06 20:56:20 -07:00
Anthony J. Thibault
774509ba9e
Changed punctuation button to &123
2016-09-06 17:41:56 -07:00
Brad Davis
9d057233c6
Fixing rebase
2016-09-06 17:40:48 -07:00
SamGondelman
74e5814a48
try to fix rpath issue
2016-09-06 17:40:43 -07:00
SamGondelman
8a4d48ca8d
set browserProfile now that Qt bug is fixed
2016-09-06 17:38:47 -07:00
SamGondelman
99176588cc
remove old webwindowclass that relied on qwebkit
2016-09-06 17:36:59 -07:00
SamGondelman
7f2476f0f8
put pack macdeployqt call, but still removed qtwebprocess
2016-09-06 17:36:58 -07:00
SamGondelman
038aba20e4
disable dropshadows if unsupported (OSX and AMD cards)
2016-09-06 17:36:57 -07:00
SamGondelman
c993a6b818
try removing windows hack
2016-09-06 17:36:56 -07:00
SamGondelman
2db02fdde1
remove QtWebProcess hack on OSX
2016-09-06 17:36:56 -07:00
SamGondelman
716647037e
removed unused code
2016-09-06 17:36:54 -07:00
SamGondelman
9903e464d8
fix error in FileDialog.qml
2016-09-06 17:36:53 -07:00
SamGondelman
98cb3cc366
updated build instructions
2016-09-06 17:36:52 -07:00
SamGondelman
9d447d4dcc
enabled qnetworkrequest redirects everywhere I could find them
2016-09-06 17:35:06 -07:00
Brad Davis
20deae3242
Working on Qt 5.6 compatibility
2016-09-06 17:35:04 -07:00
Anthony J. Thibault
73315e3390
Punctuation mode now works
2016-09-06 17:07:41 -07:00
Anthony J. Thibault
28162915fd
Re-styled keyboard, now with working shift key
2016-09-06 15:21:58 -07:00
Anthony J. Thibault
71520a661a
WIP checkpoint of keyboard shift key support
2016-09-06 13:39:07 -07:00
Atlante45
eb007b24cd
Use invalid port to signal no value passed
2016-09-06 11:59:07 -07:00
Atlante45
9f07511fd8
Move setter to LimitedNodeList
2016-09-06 10:18:42 -07:00
Atlante45
fcf44911a3
Fix Windows warning
2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57
Add settings to change local port
2016-09-06 10:18:42 -07:00
Seth Alves
37db1cba26
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-09-06 09:38:44 -07:00
Brad Hefta-Gaub
78cf81954c
Merge pull request #8555 from jherico/thread_count
...
Stuttering: global thread pool management
2016-09-06 09:27:02 -07:00
Andrew Meadows
0a55afda69
Merge pull request #8554 from elisa-lj11/marketplaces_html
...
Include a marketplace status bar and access to "marketplace" of marketplaces
2016-09-02 17:12:05 -07:00
Anthony J. Thibault
9122a33fff
only raise the webEntity virtual keyboard in HMD mode
2016-09-02 16:53:40 -07:00
elisa-lj11
2f07ba87af
Renamed isZipped for more clarity on checking for non-fbx files
2016-09-02 16:48:55 -07:00
Anthony J. Thibault
a54c3bf8c0
support for backspace, carriage return, space and period.
2016-09-02 16:23:46 -07:00
Seth Alves
342f7edff3
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-09-02 16:12:41 -07:00
Brad Davis
94210d2e69
Use dynamic count for global thread pool
2016-09-02 15:23:35 -07:00
Brad Davis
91bfa7677c
Updating stats display for threaded rendering
2016-09-02 14:41:49 -07:00
Anthony J. Thibault
bcc0d27819
more reliable keyboard raise/lower
2016-09-02 12:50:31 -07:00
Anthony J. Thibault
0128d7c61b
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213
First pass of keyboard raising and lowering
2016-09-02 12:15:30 -07:00
Anthony J. Thibault
442f6207fb
Added raiseAndLowerKeyboard detector, streamlined EventBridge for web entities.
2016-09-02 11:17:08 -07:00
Anthony J. Thibault
21bf931559
eventBridge for web entities.
2016-09-01 16:32:06 -07:00
Seth Alves
25f6e1d79d
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-09-01 15:06:52 -07:00
Brad Hefta-Gaub
b3e5e21f40
Merge pull request #8559 from birarda/android-interface
...
create a foundation for interface target compile on android
2016-09-01 13:10:45 -07:00
Seth Alves
1a9f43cb67
fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled
2016-09-01 12:17:34 -07:00
Anthony J. Thibault
823420ae0a
Working web entity keyboard
...
* Missing many keys
* Does not dynamically appear and disappear
2016-08-31 17:57:13 -07:00
elisa-lj11
bebf9c5890
Added error feature when user tries to download a non fbx file
2016-08-31 17:46:35 -07:00
Stephen Birarda
7b8293dc80
repairs for non-android builds after changes
2016-08-31 17:28:09 -07:00
Stephen Birarda
6efa47a04e
workaround plugin build failures
2016-08-31 16:45:12 -07:00
Seth Alves
dc31525794
remove some left-over code
2016-08-31 16:39:57 -07:00
Stephen Birarda
85ba0f36cf
fix controllers/shared compile for android interface port
2016-08-31 16:34:31 -07:00
Seth Alves
280b603747
remove some leftover code
2016-08-31 16:30:51 -07:00
Seth Alves
74dc2ce493
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-31 16:26:21 -07:00
Chris Collins
02afa460ff
Merge pull request #8557 from jherico/location_bar
...
Don't show address bar when starting up in a connected state
2016-08-31 16:03:37 -07:00
elisa-lj11
5c40e9a8f5
Restored download ability and removed extra file types from download options
2016-08-31 15:39:29 -07:00
elisa-lj11
9748a17abe
checking out to try new branch
2016-08-31 15:22:28 -07:00
Brad Davis
b9a97712d5
Don't show address bar when starting up in a connected state
2016-08-31 15:17:57 -07:00
elisa-lj11
b131338dd0
Injected script to remove other file types from download options
2016-08-31 14:13:26 -07:00
Stephen Birarda
b56a596c29
put android build output in target folder
2016-08-31 13:23:19 -07:00
Stephen Birarda
62504d457b
put the apk and apk-build folders in root of build
2016-08-31 11:50:39 -07:00
Stephen Birarda
feef76cbab
add tools, no plugins, add InterfaceActivity
2016-08-31 11:31:07 -07:00
Anthony J. Thibault
37d7e926d9
first non-working prototype of web entity keyboard.
2016-08-31 11:14:01 -07:00
Stephen Birarda
7c2fea4598
remove glew/oglplus requirement for android interface
2016-08-31 11:03:53 -07:00
Stephen Birarda
f1ed7a2e78
initial changes needed for android interface cmake
2016-08-31 10:53:29 -07:00
Zach Pomerantz
441005bba0
use existing defaults for zoneless keylight
2016-08-31 09:47:53 -07:00
Zach Pomerantz
372c52fea5
restore default ambient skybox
2016-08-30 17:07:34 -07:00
Seth Alves
c6804ba721
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 16:23:22 -07:00
elisa-lj11
d16ef521f4
fixed merge conflicts from Howard's webview fix
2016-08-30 15:33:59 -07:00
Brad Davis
3ca01a1e4b
Merge pull request #8540 from howard-stearns/restore-WebView-tab-handler
...
restore onNewViewRequested
2016-08-30 15:21:27 -07:00
elisa-lj11
aceddb0cf8
merge with james repo
2016-08-30 15:07:01 -07:00
Seth Alves
cdd08bd38e
more anti-jitter changes
2016-08-30 14:59:30 -07:00
Seth Alves
78f54a7f33
get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away
2016-08-30 14:39:11 -07:00
howard-stearns
8824507523
new smaller WebView.qml
2016-08-30 14:37:08 -07:00
elisa-lj11
bbb80f4a55
hello again
2016-08-30 14:24:00 -07:00
elisa-lj11
074f9e0688
test to merge to status_bar branch
2016-08-30 14:15:27 -07:00
howard-stearns
564769f7d3
move WebView.qml to baseWebView.qml
2016-08-30 14:07:34 -07:00
howard-stearns
232ac74b26
back to master version
2016-08-30 14:06:20 -07:00
Seth Alves
5bda94b2ba
use same data as used for drawing show-hand-targets for controller joints in MyAvatar
2016-08-30 12:39:30 -07:00
howard-stearns
c5b998a2a8
use new hook in marketplace code
2016-08-30 12:18:03 -07:00
elisa-lj11
8b62c0e712
switching over to a fork
2016-08-30 11:49:49 -07:00
elisa-lj11
37cc50a14a
Merge remote-tracking branch 'highfidelity/master' into marketplaces_html
2016-08-30 10:45:26 -07:00
elisa-lj11
fa941e4a1b
Merge remote-tracking branch 'origin' into marketplaces_html
2016-08-30 10:42:56 -07:00
Seth Alves
2a9ffc1529
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 10:26:14 -07:00
Stephen Birarda
74fac8c7c9
Merge pull request #8512 from birarda/shareable-address
...
add shareable address from default name, leverage for steam join/invite
2016-08-30 09:35:24 -07:00
elisa-lj11
6bd41d0dd5
added status bar to marketplace
2016-08-29 18:43:52 -07:00
elisa-lj11
f2e61aa504
added status bar to marketplace
2016-08-29 18:43:32 -07:00
Seth Alves
87fbbd68ae
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 17:37:58 -07:00
Brad Hefta-Gaub
f3d157c396
Merge pull request #8500 from jherico/gl_context
...
Custom OpenGL context creation
2016-08-29 16:22:21 -07:00
howard-stearns
11f00ed46c
add a hook so that clients can gain access to the new component, window,
...
and request
2016-08-29 14:44:48 -07:00
howard-stearns
6272db42da
restore onNewViewRequested
2016-08-29 13:53:08 -07:00
Ken Cooke
28a99a7a03
Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio
2016-08-29 12:38:17 -07:00
Howard Stearns
a1ae9eebf2
Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning
...
Silence address bar log warning
2016-08-29 11:48:43 -07:00
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
howard-stearns
01af8899bf
silence address bar dialog qml warning
2016-08-29 10:47:22 -07:00
Seth Alves
178a68c967
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 10:21:07 -07:00
Ken Cooke
996bf0d763
Replace the Qt multimedia audio back-end on the Windows build.
...
Adds an external project (wasapi) to download a low-latency audio plugin for Qt, as a precompiled DLL.
Adds a post-build command to use this new plugin instead of the default Qt audio plugin.
2016-08-28 20:12:59 -07:00
Seth Alves
3fb10d0eea
action for arrow flight, etc
2016-08-28 19:08:13 -07:00
Seth Alves
76b72e32f0
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-27 09:06:45 -07:00
Brad Davis
587d015c57
Give names to offscreen contexts for easier debugging
2016-08-26 19:09:26 -07:00
Brad Hefta-Gaub
3d6691f3d1
Merge pull request #8527 from zzmp/fix/skybox-default-color
...
fix skybox default
2016-08-26 15:14:44 -07:00
Seth Alves
9394a25a1c
remove some anti-jitter code that was doing more harm than good
2016-08-26 12:47:19 -07:00
Seth Alves
9884426ad8
replace debugging aborts with asserts
2016-08-26 06:13:33 -07:00
Seth Alves
174a95a005
do some hokey pokey to avoid jitter of held entities while walking
2016-08-25 18:49:47 -07:00
Seth Alves
3b278adba3
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-25 17:28:18 -07:00
Brad Hefta-Gaub
10c465f591
Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering
...
Improved web entity rendering
2016-08-25 16:49:00 -07:00
Seth Alves
dfae5b64bd
attempt to avoid jitter of held entity while walking
2016-08-25 16:42:40 -07:00
Seth Alves
232917fcf8
when processing AvatarActionHold for another's avatar, use their hand-controller joint information
2016-08-25 16:02:58 -07:00
Seth Alves
7c5b8cb75d
send faux joints to the avatar-mixer
2016-08-25 15:21:29 -07:00
Zach Pomerantz
24162f0f3d
set skybox default color to empty color
2016-08-25 12:37:23 -07:00
Anthony J. Thibault
e82f6a90af
Improved web entity rendering
...
* fading now works properly
* web browsers are now fully opaque.
2016-08-25 11:04:23 -07:00
Seth Alves
39f52b3682
start on faux avatar joint that represent hand controllers
2016-08-25 10:58:23 -07:00
Andrew Meadows
d7bb555987
make menu wording more correct
2016-08-25 08:53:08 -07:00
Andrew Meadows
25fb7aacad
ShapeManager hands out const shape pointers
2016-08-24 22:26:56 -07:00
Anthony J. Thibault
c2af948e25
Merge branch 'master' into feature/handheld-marketplace
2016-08-24 16:07:04 -07:00
James B. Pollack
d9ebad7976
Merge pull request #8372 from elisa-lj11/zip_project
...
Added Clara.io to the marketplace
2016-08-24 15:53:58 -07:00
Zach Pomerantz
c740b263a8
detect unset skybox
2016-08-23 15:16:26 -07:00
Howard Stearns
89b00883dd
Merge pull request #8428 from highfidelity/discovery
...
Snapshot of Snapshot-Discovery to master
2016-08-23 14:32:10 -07:00
Howard Stearns
3f30b23b78
Merge pull request #8496 from huffman/fix/address-bar-popup
...
Fix address bar being opened when moving between places on same domain
2016-08-23 13:08:31 -07:00
Stephen Birarda
9461ca0cfc
use the facing shareable address for steam location
2016-08-23 11:56:18 -07:00
elisa-lj11
cdc5dde40e
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-23 11:22:43 -07:00
Stephen Birarda
fbe784155e
add a shareable address return to address manager
2016-08-23 11:19:14 -07:00
Anthony J. Thibault
b2dff8aa77
Easier to click buttons on web entities with shaky hand controllers
...
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees. See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE
* Fix for warnings when clicking on window.open() links in WebEntity
2016-08-23 10:19:49 -07:00
Anthony J. Thibault
c6ea64926c
Sensor space entity support
...
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space. Essentially, this
gives you the ability to place objects in the user's physical room.
WebTablets now are located in this feature and no longer jitter.
2016-08-23 10:13:06 -07:00
Brad Hefta-Gaub
21bc06f154
Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
...
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
howard-stearns
7601876641
Scale the activity card back up to match the window being scaled down, so
...
that it covers the address bar.
2016-08-23 09:44:28 -07:00
David Rowe
f7389dc059
Fix server card window scale
2016-08-23 16:28:32 +12:00
Zach Pomerantz
cbb115bbcc
fix typo argee->agree
2016-08-22 16:34:23 -07:00
howard-stearns
bc90b0bc43
pr review
2016-08-22 16:09:09 -07:00
elisa-lj11
2d2cb45c5d
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-22 16:05:16 -07:00
elisa-lj11
8bf87128d9
Fixed browser.qml 'onNewViewRequested'
2016-08-22 16:04:55 -07:00
howard-stearns
056b90c662
separate into four files
2016-08-22 15:01:55 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
howard-stearns
d0b58d8f8e
move thread safety into Application from caller
2016-08-22 12:49:51 -07:00
howard-stearns
80afc6a3b4
pr review comments
2016-08-22 10:59:21 -07:00
Anthony J. Thibault
b6a4904068
remove explicit check for WebEntity from setKeyboardFocus
...
Also, don't get entityTree from entityScriptInterface instead go thru EntityTreeRenderer
2016-08-22 10:56:35 -07:00
Ryan Huffman
bd86318611
Fix address bar being opened when moving between places on same domain
2016-08-22 10:36:56 -07:00
howard-stearns
02d3666d86
code review cleanup
2016-08-22 09:58:27 -07:00
Seth Alves
9bcda1bb45
merge from upstream
2016-08-20 15:25:04 -07:00
Howard Stearns
f877e65703
larger story card
2016-08-20 10:45:02 -07:00
Howard Stearns
7428eb2635
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-19 21:34:55 -07:00
James B. Pollack
0d42920f1b
Merge remote-tracking branch 'upstream/master' into demo_movement
2016-08-19 16:45:44 -07:00
howard-stearns
993340811f
switch over to metaverse server user story cards
2016-08-19 16:40:53 -07:00
howard-stearns
a3d64dbd9c
code cleanup
2016-08-19 14:14:31 -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
elisa-lj11
4aab389305
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-19 11:32:37 -07:00
elisa-lj11
8bc9a92429
removed extraneous debug prints
2016-08-19 11:32:13 -07:00
Anthony J. Thibault
8bb6bb7c6f
generalized keyboard focus interface
...
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.
* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
2016-08-19 10:56:52 -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
elisa-lj11
4c434e875e
fixed merge conflicts in Application.cpp
2016-08-19 09:46:22 -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
4492c4e64e
Allow javascript to safely open the correct login window (or answer that
...
it is unneded).
2016-08-18 14:19:36 -07:00
James B. Pollack
402bad3417
Merge remote-tracking branch 'upstream/master' into demo_movement
2016-08-18 13:43:54 -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
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
Seth Alves
15ce40ecf4
merge from upstream
2016-08-18 11:46:02 -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
1eaac8605f
invert the structure and make it work with oculus
2016-08-18 10:43:37 -07:00
Seth Alves
ccaf7379fc
missed some more due to conditional compilation
2016-08-18 10:31:53 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -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
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
Brad Davis
a32ab77b7d
Address issues with random camera locations caused by bad HMD sensor poses
2016-08-17 15:22:30 -07:00
James B. Pollack
a7ba4ce1f9
jumping
2016-08-17 15:11:07 -07:00
James B. Pollack
8bc6ca2fa1
demo changes
2016-08-17 15:08:43 -07:00
David Rowe
9fa4a20e55
Fix Asset Browser dialog
2016-08-18 09:37:26 +12: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
fbe971e730
Fix hand_pose_changed event
2016-08-16 17:46:21 -07:00
Anthony J. Thibault
03322a9c49
Fix for using hardware mouse in HMD mode
2016-08-16 17:09:59 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
Stephen Birarda
3355a90e7d
Merge pull request #8413 from huffman/feat/atp-bandwidth
...
Add asset server bandwidth to stats
2016-08-16 15:54:11 -07:00
Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
elisa-lj11
9ea9baeadf
Making JS/QML safer (DOES NOT WORK)
2016-08-16 14:12:19 -07:00
Zach Pomerantz
8c559bc65d
use lights from nontextured skyboxes
2016-08-16 13:27:22 -07:00
Zach Pomerantz
4d0c819173
remove peaking irradiance from default background
2016-08-16 13:26:33 -07:00
howard-stearns
d764c363cc
Merge branch 'discovery' into ux-improvements
2016-08-16 12:19:43 -07:00
howard-stearns
2b75240771
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-16 11:14:36 -07:00
howard-stearns
4da2cb685c
Set full url path to where the picture was taken.
...
Expand width of scroll, but leave a margin at both ends.
Include an image at the end to indicate that the scroll is swipable.
Adjust ighlight color and border size.
2016-08-16 10:43:05 -07:00
howard-stearns
2f114b9c92
fix image link. How did this ever work?
2016-08-16 10:38:00 -07:00
James B. Pollack
5a2c7cf58e
cleanup
2016-08-16 09:58:18 -07:00
James B. Pollack
f143c62e9c
whoops
2016-08-15 11:53:32 -07:00
Ryan Huffman
2598d27cf3
Add hand_pose_changed implementation for stats
2016-08-15 10:29:19 -07:00
James B. Pollack
a078b20f9d
make it work with click
2016-08-15 10:24:24 -07:00
James B. Pollack
493adca04f
map oculus grip to trigger
2016-08-15 10:02:53 -07:00
samcake
8d12a23efb
Merge pull request #8325 from jherico/deferred_batches_threaded
...
Threaded rendering
2016-08-15 09:59:44 -07:00
Ryan Huffman
b5e2913eb9
Move node received bandwidth tracking to LimitedNodeList
2016-08-15 09:23:02 -07:00
Brad Davis
5b09748c00
Merge pull request #8431 from imgntn/assetbutton
...
Open Asset Browser with Button from Edit.js Toolbar
2016-08-13 12:04:21 -07:00
Brad Davis
cac529a1b1
Display plugins now use gpu::Context API
2016-08-12 22:29:00 -07:00
Brad Davis
6d7edd38cc
Rename clearViewTransform
2016-08-12 22:28:59 -07:00
Brad Davis
39b424645a
Cropping no-preview image
2016-08-12 22:28:57 -07:00
Brad Davis
719e555381
Restoring reprojection to OpenVR
2016-08-12 22:28:55 -07:00
Brad Davis
d548da02d9
Expose whether nsight is running to the app, disable some stuff under nsight
2016-08-12 22:28:50 -07:00
Brad Davis
51a6f3552f
Cleanup
2016-08-12 22:28:46 -07:00
Brad Davis
901e2da828
Hand lasers
2016-08-12 22:28:29 -07:00
Brad Davis
adcfd55cc0
Batch replay reprojection
2016-08-12 22:28:23 -07:00
Brad Davis
7e93747acf
Working on reprojection
2016-08-12 22:28:22 -07:00
Bradley Austin Davis
274321de8a
First pass at threaded rendering
2016-08-12 22:18:36 -07:00
Anthony J. Thibault
1be434342b
Work In Progress snapshot
...
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
2016-08-12 17:11:59 -07:00
Clément Brisset
5a1c7bd4e6
Merge pull request #8407 from highfidelity/steam
...
Steam integration
2016-08-12 16:55:48 -07:00
Zander Otavka
62f4e3536b
Expose showing asset server to script interface
2016-08-12 15:18:30 -07:00
SamGondelman
ccca6d935f
don't fade after physics kick in
2016-08-12 14:35:22 -07:00
Howard Stearns
2641c0fd76
Merge pull request #8427 from howard-stearns/pull-from-master
...
Pull from master
2016-08-12 14:18:05 -07:00
howard-stearns
df3769166e
Merge branch 'master' of https://github.com/highfidelity/hifi into pull-from-master
2016-08-12 14:16:16 -07:00
Stephen Birarda
c330e005dd
Merge pull request #8426 from Atlante45/steam
...
New metaverse web API
2016-08-12 13:32:41 -07:00
Brad Davis
e2f7b443fd
Merge pull request #8339 from sethalves/overlay-children
...
3D Overlays can be children
2016-08-12 12:16:21 -07:00
howard-stearns
df0ceb17e8
send (hi res image) details as a json string
2016-08-12 11:09:22 -07:00
James B. Pollack
7866786da9
Merge pull request #8406 from AlexanderOtavka/script-load
...
Disable loading client scripts over ATP
2016-08-12 11:01:14 -07:00
Atlante45
19b3aa9c89
New metaverse web API
2016-08-12 10:42:32 -07:00
Clément Brisset
7c698b8cbb
Merge pull request #8423 from Atlante45/steam
...
Update Steam branch
2016-08-12 10:40:53 -07:00
Atlante45
e4dd4c1a41
Merge branch 'master' of https://github.com/highfidelity/hifi into steam
2016-08-12 10:38:05 -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
Ryan Huffman
211da3c428
Add more user activity tracking data
2016-08-11 16:49:29 -07:00
howard-stearns
747c43d065
basic user story card
2016-08-11 16:43:29 -07:00
howard-stearns
e6746acf4c
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-11 15:40:26 -07:00
Seth Alves
c363ca9887
3d-model overlays can now be children
2016-08-11 15:29:09 -07:00
Seth Alves
15e2140cb2
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-11 15:06:58 -07:00
Atlante45
c34153b67b
Change Web API arg name to be more descriptif
2016-08-11 11:57:43 -07:00
Ryan Huffman
b6620f128b
Add asset server bandwidth to stats
2016-08-11 11:06:36 -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
Anthony J. Thibault
8dac45c99e
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-10 11:27:21 -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
elisa-lj11
b8f5a9d22f
CR changes
2016-08-10 10:26:58 -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
Zander Otavka
4e16998b45
Disable loading client scripts over ATP
2016-08-09 17:36:59 -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
Atlante45
25b60d0c62
CR feedback
2016-08-09 10:07:57 -07:00
Seth Alves
607c168493
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-09 09:01:55 -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
Atlante45
f08b2f9257
Remove temporary override to reload QML
2016-08-08 15:39:44 -07:00
Atlante45
51b45f8f73
Steam invite are facing the current position
2016-08-08 15:39:25 -07:00
Atlante45
aa2ae31aab
CR UI fixes
2016-08-08 15:39:25 -07:00
Atlante45
7ec2f98cf2
Join lobby on startup
2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff
Invite friends in HMD
2016-08-08 15:39:25 -07:00
Atlante45
a13950752b
Update steam location with discoverability
2016-08-08 15:39:25 -07:00
Atlante45
f0ff975248
UI wiring
2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51
login UI first draft
2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0
Interface login through steam
2016-08-08 15:39:25 -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
elisa-lj11
c009834685
Fixes for linux build of quazip
2016-08-05 17:36:27 -07: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
Anthony J. Thibault
90a06f0d40
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-05 11:05:10 -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
elisa-lj11
90a1325f65
Finalized combobox feature
2016-08-04 17:02:57 -07:00
elisa-lj11
b39c8c52ab
Included combobox in marketplace view
2016-08-04 17:02:04 -07:00
elisa-lj11
d63d0ba870
In process of creating combobox for marketplace with qml
2016-08-04 17:02:04 -07:00
elisa-lj11
a9a8710689
Switched saving download/upload to temporary directory
2016-08-04 17:01:19 -07:00
elisa-lj11
b1b2ea48b2
Made code more QA; extra browser and download widget close upon download
2016-08-04 17:01:19 -07:00
elisa-lj11
a94a304700
Downloads from Clara.io and uploads to asset server
2016-08-04 16:59:38 -07:00
elisa-lj11
615627e981
Working download and unpackage from Clara.io
2016-08-04 16:59:38 -07:00
elisa-lj11
49712060ed
switching to the main site progress
2016-08-04 16:59:38 -07:00
elisa-lj11
c36fc29363
Zip download works
2016-08-04 16:59:03 -07:00
elisa-lj11
ab02d16eb7
QML troubleshooting
...
Trying to find out why it does multiple downloads on one click, when
everything fails. Has something to do with a download finish request
getting sent despite not being completed.
2016-08-04 16:58:31 -07:00
elisa-lj11
6152fa28b7
Download through QML
...
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70
working within webview to access url
2016-08-04 16:57:19 -07:00
elisa-lj11
76a847d34f
testing for URL bug
2016-08-04 16:53:09 -07:00
elisa-lj11
212e4f9cca
making quazip work
2016-08-04 16:48:14 -07:00
elisa-lj11
f277a019bf
FileScriptingInterface
...
Created new .cpp and .h for the download and unzipping of a model
2016-08-04 16:46:56 -07:00
elisa-lj11
4f33e1502f
starting the zip project
2016-08-04 16:46:56 -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
howard-stearns
f5d07f4186
helper text size and italic
2016-08-04 11:55:31 -07:00
howard-stearns
d39446f340
no place name over user-story scroll items
2016-08-04 10:36:17 -07:00
howard-stearns
421707c5d8
fix typo that was making user stories not show date
2016-08-04 10:07:33 -07:00
Seth Alves
1b571f3be3
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-04 09:58:41 -07:00
Seth Alves
905c6147cf
Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails
2016-08-04 09:56:32 -07:00
howard-stearns
c44ce0f5b5
Fix forward/back button states.
2016-08-03 17:03:27 -07:00
Chris Collins
2473bbf1db
Merge pull request #8313 from imgntn/tweak_lazers
...
Tweak Teleport + Hand Lasers
2016-08-03 16:40:28 -07:00
howard-stearns
8c6744e5e8
new address bar graphic
2016-08-03 16:18:41 -07:00
howard-stearns
30327d8135
New buttons, with hover behavior. Also don't impose test data if the api
...
gives data.
2016-08-03 16:02:22 -07:00
Philip Rosedale
98e40d54e1
Merge pull request #8355 from SamGondelman/touchDeadZone
...
Added dead zones to Hydra and Oculus Touch joysticks
2016-08-03 15:17:15 -07:00
James B. Pollack
7a41ed25db
Merge remote-tracking branch 'upstream/master' into tweak_lazers
2016-08-03 14:59:51 -07:00
Anthony J. Thibault
713bee84c3
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-03 14:06:43 -07:00
Seth Alves
40a5e4abc8
in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk
2016-08-03 13:54:25 -07:00
SamGondelman
2eb0c7735f
working on fading shape entities
2016-08-03 13:30:05 -07:00
howard-stearns
188e525efc
basic ugly feed/places toggle button
2016-08-03 11:48:58 -07:00
Seth Alves
ad4fc8c656
merge from upstream, don't hold up enabling of physics if a collision hull fails to load
2016-08-03 10:42:15 -07:00
Anthony J. Thibault
75b88b0794
WebEntities now support custom hifi url handling
...
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
2016-08-03 10:20:15 -07:00
SamGondelman
458e43fadc
added dead zones to hydras, style fixes
2016-08-03 10:18:57 -07:00
Howard Stearns
e593077b4b
basic display of user story feed (hardcoded switch place names vs feed)
2016-08-03 09:39:27 -07:00
Brad Hefta-Gaub
70cb3d3393
Merge pull request #8354 from AlexanderOtavka/remove-web-debug
...
Remove url change debug info for WebView
2016-08-03 09:10:10 -07:00
Seth Alves
cc7322a0de
Merge pull request #8334 from ctrlaltdavid/21015
...
refresh file dialog when directory content changes
2016-08-03 08:11:40 -07:00
Seth Alves
7e94d4c694
Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails
2016-08-02 19:34:17 -07:00
James B. Pollack
88ebeaa4cb
start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck
2016-08-02 18:46:47 -07:00
SamGondelman
1ce7623f41
added deadzones to oculus touch movements
2016-08-02 18:19:58 -07:00
Zander Otavka
3c30743d0d
Remove url change debug info for WebView
2016-08-02 16:48:39 -07:00
Anthony J. Thibault
0ab15f0dcd
fixed one frame lag on webEntity keyboard highlight overlay.
...
Also, made overlay not draw in front.
2016-08-02 15:35:59 -07:00
Howard Stearns
09557b1f9b
Merge pull request #8343 from howard-stearns/scroll
...
scrollable suggested places in address bar
2016-08-02 15:34:35 -07:00
Howard Stearns
c2d1f08551
Merge pull request #8342 from highfidelity/dk/snapshot
...
Snapshot button
2016-08-02 15:31:50 -07:00
Anthony J. Thibault
6d768d8327
hand controllers send touch events instead of mouse events to web entities
...
This gives a much better experience when scrolling web content.
2016-08-02 15:23:46 -07:00
howard-stearns
70e07f3299
remove highlight move animation
2016-08-02 13:56:01 -07:00
James B. Pollack
7fae7e9c77
cleanup
2016-08-02 12:26:37 -07:00
James B. Pollack
108e7a2fc1
Merge remote-tracking branch 'upstream/master' into tweak_lazers
2016-08-02 12:25:27 -07:00
James B. Pollack
a7b8f2c9df
updates
2016-08-02 12:25:24 -07:00
Seth Alves
79121133df
remove unneeded change
2016-08-02 12:00:45 -07:00
Seth Alves
528f417f74
Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails
2016-08-02 11:55:17 -07:00
Seth Alves
f91df4997d
re-enable falling-back to default avatar if an avatar's url is bad
2016-08-02 11:55:11 -07:00
Seth Alves
75f9626c2d
if MyAvatar simulation is cut short (due to no skeleton), still update the head position
2016-08-02 11:50:53 -07:00
Seth Alves
56af36ae64
set head position of other avatars even if they can't be drawn
2016-08-02 11:29:43 -07:00
Seth Alves
229b8d3b5e
testing a more explicit fix of the audio failure
2016-08-02 10:46:11 -07:00
Seth Alves
ed4b0b3589
call _skeletonModel.setURL, but leave our copy of _skeletonModelURL alone. This is so that we don't redo this every time we receive an identity packet from the avatar with the bad url.
2016-08-02 09:57:17 -07:00
Anthony J. Thibault
ed7eaebea8
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-02 09:23:18 -07:00
Seth Alves
5a1fe39737
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-01 18:57:32 -07:00
David Kelly
1d7cdff2bc
Snapshot button plus script
...
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does). Added button to do it, saves them to disk.
The plan is for us to add UI to share (or not) the snapshot. That's
why we are not going through the notifications. Also, the
script makes sure to hide/unhide hud and overlays. Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
2016-08-01 18:21:01 -07:00
Seth Alves
b953e6f0ff
when an avatar URL fails, switch to the default
2016-08-01 18:12:30 -07:00
David Rowe
31ac7a2812
Add OverlayWebWindow resized, moved, and closed signals
2016-08-02 12:40:01 +12:00
howard-stearns
c3bf52267d
Don't suggest loaded places.
2016-08-01 15:27:29 -07:00
Ryan Huffman
604c8f4a36
Merge pull request #8337 from humbletim/fix-Assets-getMapping
...
fix Assets.getMapping(path, callback) to return a value
2016-08-01 13:32:08 -07:00
howard-stearns
45a49c390b
Merge branch 'discovery' of https://github.com/highfidelity/hifi into scroll
2016-08-01 13:09:20 -07:00
howard-stearns
7cf41d441e
filtering by place
2016-08-01 12:28:57 -07:00
Seth Alves
28e0ca2e49
when a parent of a 3d overlay is deleted, delete the overlay
2016-08-01 10:55:34 -07:00
Seth Alves
70becfaff1
avoid some unneeded SpatiallyNestable transform-locks
2016-08-01 08:20:24 -07:00
Seth Alves
6f3146f872
oops, position and rotation are local, by this point
2016-08-01 08:00:51 -07:00
Seth Alves
182829e64c
get transform once rather than 3 times
2016-08-01 07:49:57 -07:00
Seth Alves
bddff3341a
angry De Morgan
2016-08-01 07:49:22 -07:00
Seth Alves
627048db84
pull missing location properties from overlay
2016-07-31 16:36:14 -07:00
Seth Alves
e4e86c245e
3d overlays can be children of entities or avatars
2016-07-31 14:11:56 -07:00
David Rowe
18b0ed9e8f
Close file browser dialog immediately after selecting asset to upload
2016-07-30 14:16:08 +12:00
Anthony Thibault
cf7450beb7
handControllerGrab and web entity input integration
2016-07-29 17:50:45 -07:00
Anthony Thibault
f71a59276c
Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering
...
Fix alpha cut-outs and incorrect gamma on web overlays and entities
2016-07-29 17:44:46 -07:00
David Rowe
800c2b9ec0
Refresh file dialog when directory content changes
2016-07-30 11:21:40 +12:00
howard-stearns
611223f013
highlight to show that the cards can be clicked
2016-07-29 15:49:20 -07:00
SamGondelman
676f4bdfcf
misc fixes from particles branch
2016-07-29 15:36:32 -07:00
howard-stearns
ae9421f1f6
smaller user label, and use the word "people"
2016-07-29 15:22:08 -07:00
howard-stearns
13771a52e8
Merge branch 'master' of https://github.com/highfidelity/hifi into scroll
2016-07-29 09:30:45 -07:00
howard-stearns
ff17761769
basic minority-report scroll (fixed initial data, but infinite cards)
2016-07-28 15:46:32 -07:00
