Ryan Huffman
c683c82817
Fix setting textures in model overlays
2016-10-04 16:24:43 -07:00
Howard Stearns
4974c88880
Merge pull request #8663 from howard-stearns/address-bar-text-area-changes
...
Address bar text area changes
2016-10-04 13:50:40 -07:00
Anthony Thibault
60aff44f33
Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix
...
Remove frame lag and jitter from near grabbed physical objects.
2016-10-04 11:14:22 -07:00
Anthony J. Thibault
dcd425a165
Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls
2016-10-04 10:56:44 -07:00
Brad Davis
8c5028158f
Fix crash on destroying web entities and overlays
2016-10-03 18:02:21 -07:00
Brad Davis
ca3572f991
Support external GL textures with proper fencing
2016-10-03 17:09:10 -07:00
Anthony J. Thibault
327fcc970b
Remove frame lag from near grabbed physical objects.
...
In the game loop, physics occurs before avatar update.
Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when
the physics is run on the next update.
After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.
2016-10-03 16:01:54 -07:00
Ryan Huffman
b5eb943c1d
Add hmd stats to stats event
2016-10-03 15:12:14 -07:00
Ryan Huffman
dafb5c5bab
Add processor information to launch user activity event
2016-10-03 15:11:56 -07:00
David Rowe
caf1a93354
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-10-04 10:51:14 +13:00
howard-stearns
4fcddfdf2b
Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check
2016-10-03 13:02:32 -07:00
howard-stearns
0809484e33
Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus
2016-10-03 13:01:51 -07:00
David Rowe
4818ad2615
Merge branch 'master' into 21055
2016-10-04 08:46:30 +13:00
samcake
0189e3aea7
Github is borked ?
2016-10-03 11:29:17 -07:00
samcake
5adedbbb8b
replace the simple log by a unique log
2016-10-03 11:27:15 -07:00
samcake
0df69b8e15
Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug
2016-10-03 10:06:58 -07:00
Brad Davis
d3d3aa587c
Remove oglplus usage from OpenVR
2016-10-02 11:44:33 -07:00
Clément Brisset
becee3bba3
Merge pull request #8685 from thoys/ac-fixes
...
Assignment Client fixes
2016-09-30 11:05:58 -07:00
David Kelly
621e3fc000
Expose triggerOption to scripts, plus _physicsEnabled
...
Now any menu item can be triggered. Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such. Whee!
2016-09-30 09:06:17 -07:00
David Rowe
5e842843c6
Set alphabetic/numeric keyboard per field entered
2016-09-30 11:54:32 +13:00
Thijs Wenker
3d14a32d17
fix controller::ScriptingInterface not found warning in AC
2016-09-29 22:11:12 +02:00
Brad Hefta-Gaub
38eccd32a8
add developer menu support to enable/disable dynamic texture management
2016-09-29 10:18:54 -07:00
David Rowe
e9a398472a
Remove duplicate keyboard
...
Fixes keyboard raising and lowering when select entity with editor open.
2016-09-29 12:09:04 +13:00
David Rowe
2933e37a0a
Fix field not scrolling into view when raise keyboard in settings
2016-09-29 10:47:15 +13:00
David Rowe
40bfbf4021
Prevent flicker of keyboard area when navigate to a new page in browser
2016-09-29 10:35:18 +13:00
David Rowe
52f2d36096
Move "," and "." to numeric keyboard for ready use with numeric fields
2016-09-29 10:17:31 +13:00
David Rowe
f8572096b1
Merge branch 'master' into 21055
2016-09-28 20:00:04 +13:00
David Rowe
b60f649e0a
Scroll HTML window if necessary when raise keyboard
2016-09-28 19:27:16 +13:00
David Rowe
2344d15dbc
Raise and lower keyboard for HTML fields in Marketplace window
2016-09-28 16:41:01 +13:00
David Rowe
875566d956
Raise and lower keyboard for HTML fields in Browser window
2016-09-28 16:40:38 +13:00
David Rowe
ec00129988
Don't flood event bridge with raise/lower keyboard messages from HTML
2016-09-28 12:51:00 +13:00
howard-stearns
2dfc5ca268
Merge branch 'master' of https://github.com/highfidelity/hifi into address-bar-text-area-changes
2016-09-26 11:32:59 -07:00
howard-stearns
39d352e1a7
display location/connection status in address bar when it doesn't have
...
focus
2016-09-26 11:27:50 -07:00
David Rowe
bc8c400448
Fix up keyboards in attachments dialogs
2016-09-26 16:39:34 +13:00
David Rowe
302c8ede60
Miscellaneous fixes
2016-09-26 15:34:39 +13:00
David Rowe
7d1d71084d
Add keyboard to custom query dialog
2016-09-26 14:32:29 +13:00
David Rowe
023efe05f0
Move keyboard QML files
2016-09-25 09:54:48 +13:00
David Rowe
5b6835fbdb
Fix defocusing
2016-09-24 21:23:30 +12:00
David Rowe
0f672c3aa2
Scroll content if necessary when keyboard is displayed
2016-09-24 18:56:35 +12:00
David Rowe
8663455d01
Unfocus field and hide keyboard when click in blank part of dialog
2016-09-24 17:34:02 +12:00
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
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
