Commit graph

17787 commits

Author SHA1 Message Date
David Rowe
2807f76e68 Fix semantics of function parameter 2016-10-06 15:49:16 +13:00
David Rowe
742e603fd6 Show cursor if user clicks in address bar 2016-10-06 15:21:08 +13:00
David Rowe
7d23cd7c7c Don't show cursor until after have started entering an address 2016-10-06 15:19:58 +13:00
David Rowe
b70eac353b Enable address entry by typing without clicking in address bar 2016-10-06 15:18:07 +13:00
Chris Collins
bc6797fc3a Merge pull request #8733 from zzmp/fix/audio-channel-swap
fix intermittent channel swapping
2016-10-05 15:54:25 -07:00
Zach Pomerantz
afce8c4a45 STEREO_FACTOR -> AudioConstants::STEREO 2016-10-05 13:02:28 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id
Add ability to parent overlays to MyAvatar for use across servers
2016-10-05 12:03:01 -07:00
Clément Brisset
3f64847888 Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures
Fix model overlay visibility and texture properties
2016-10-05 11:54:11 -07:00
Brad Hefta-Gaub
6f86ce8d3b Merge pull request #8683 from jherico/oglplus_b_gone2
Remove all usage of oglplus
2016-10-05 09:59:42 -07:00
Howard Stearns
32db63e177 Merge pull request #8737 from highfidelity/domain-check
Domain check
2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c Merge pull request #8715 from jherico/offscreen_fences2
Support external GL textures with proper fencing
2016-10-05 05:13:06 -07:00
Ryan Huffman
847a5cc7a1 Remove old texture setting code in ModelOverlay 2016-10-04 16:25:48 -07:00
Ryan Huffman
93d995a5ae Fix model overlay visible not working 2016-10-04 16:25:40 -07:00
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
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
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
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
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
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