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
Clément Brisset
becee3bba3
Merge pull request #8685 from thoys/ac-fixes
...
Assignment Client fixes
2016-09-30 11:05:58 -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
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
Clément Brisset
f26fbca699
Merge pull request #8623 from ZappoMan/improvedPreview
...
Improved preview
2016-09-20 19:05:26 -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
David Rowe
fe8b3b4d0d
Merge branch 'master' into 21040
2016-09-13 09:12:47 +12:00
Howard Stearns
b949c83a05
remove jpg error popup behavior
2016-09-10 11:18:14 -07:00
David Rowe
44282499c5
New glyph for "has transparent"
2016-09-10 14:37:09 +12: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
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
