Anthony Thibault
a79485f8c2
Fix for crash bug in web entities
...
Guard against nullptrs in RenderableWebEntitItem and WebEntityAPIHelper.
These pointers can go null if the webEntity is deleted on the main thread.
Also, the backing offscreen qml surface can be destroyed if the webEntity has not been rendered for 30 seconds
due to frustum culling.
2016-10-01 13:43:49 -07:00
Brad Hefta-Gaub
769a29332c
Merge pull request #8695 from jherico/texture_transfer_crash
...
Fix crash in initializing texture transfer thread
2016-10-01 11:31:37 -07:00
Brad Hefta-Gaub
55d5e80220
Merge pull request #8699 from jherico/gl_context_bug
...
Don't use GL functions before making the context current
2016-10-01 11:30:50 -07:00
Brad Davis
0f06d0e4cc
Don't use GL functions before making the context current
2016-10-01 10:40:36 -07:00
Howard Stearns
4c5bf3119e
Merge pull request #8696 from howard-stearns/check-timers-during-shutdown
...
fix crash in scripted timer on shutdown
2016-10-01 10:00:49 -07:00
Brad Hefta-Gaub
084560639d
Merge pull request #8681 from kencooke/fix-debug-build
...
Fix the Debug build of Interface on Windows
2016-09-30 19:17:19 -07:00
howard-stearns
c806f6cad2
better shutdown check for timer firings
2016-09-30 16:05:39 -07:00
Brad Davis
42e28fa010
Fix crash in initializing texture transfer thread
2016-09-30 15:48:10 -07:00
Brad Hefta-Gaub
41e90eda49
Merge pull request #8648 from sethalves/no-groups-no-log-spam
...
don't check for user membership in a null list of groups
2016-09-30 11:23:30 -07:00
Clément Brisset
02991bffab
Merge pull request #8687 from zzmp/feat/injector-loopback
...
loopback local injectors on server echo
2016-09-30 11:21:10 -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
Chris Collins
322a6e7f2d
Merge pull request #8686 from kencooke/unbuffered-audio-output
...
Even lower audio latency
2016-09-30 10:53:29 -07:00
Thijs Wenker
4f7fdfc345
eliminated else, this might look cleaner
2016-09-30 03:31:35 +02:00
Clément Brisset
b69a49d7bc
Merge pull request #8690 from Atlante45/console
...
CR for Backup old content on update
2016-09-29 17:55:29 -07:00
Atlante45
f17a062399
CR
2016-09-29 17:08:34 -07:00
Chris Collins
e165c0515a
Merge pull request #8680 from Atlante45/console
...
Backup old content on update
2016-09-29 16:30:58 -07:00
Chris Collins
b3fd9eeb63
Merge pull request #8688 from zzmp/fix/fade-injectors
...
fix incorrect repetition with fade for injectors on the mixer
2016-09-29 16:05:02 -07:00
Atlante45
b83243d65d
Fixed CSS madness
2016-09-29 15:49:47 -07:00
Atlante45
165e609851
Update instructions UI
2016-09-29 15:43:11 -07:00
Zach Pomerantz
43c40aa090
avoid repetition with fade on injectors
2016-09-29 15:25:41 -07:00
Zach Pomerantz
768354e49f
loopback local injectors on server echo
2016-09-29 15:25:17 -07:00
Chris Collins
01d2d9243a
Merge pull request #8682 from ZappoMan/graphicsSettings
...
add developer menu support to enable/disable dynamic texture management
2016-09-29 15:11:43 -07:00
Ken Cooke
d925a22fd4
Use new filename for the external as a simple form of versioning
2016-09-29 14:09:38 -07:00
Thijs Wenker
5025b4a5ed
NodeList set the sessionUUID before emitting the connectedToDomain signal
2016-09-29 22:15:53 +02:00
Thijs Wenker
7e3073e163
fix spelling bugs
2016-09-29 22:13:27 +02:00
Thijs Wenker
3d14a32d17
fix controller::ScriptingInterface not found warning in AC
2016-09-29 22:11:12 +02:00
Ken Cooke
f42c0dbd7c
Fix cmake checksum, for updated qtaudio_wasapi.zip with release and debug plugins
2016-09-29 13:01:15 -07:00
Ken Cooke
858297241b
Even lower audio latency
2016-09-29 12:48:21 -07:00
Atlante45
701c710857
Fix windows odd folder name issue
2016-09-29 12:15:48 -07:00
Brad Hefta-Gaub
38eccd32a8
add developer menu support to enable/disable dynamic texture management
2016-09-29 10:18:54 -07:00
Ken Cooke
468281f92d
Fix the Debug build of Interface on Windows
2016-09-29 06:58:14 -07:00
Atlante45
4830b5c2a0
Backup old domain.
2016-09-28 19:17:52 -07:00
Brad Davis
f73cd1d65e
Merge branch 'RC-21' back into master
...
Conflicts:
libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
2016-09-28 09:58:13 -07:00
Brad Davis
31fb395c27
Add support for disabling incremental texture transfers
...
Conflicts:
libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
2016-09-28 09:56:50 -07:00
Brad Hefta-Gaub
aff9999f4b
Merge pull request #8673 from jherico/incremental_disable
...
Add support for disabling incremental texture transfers
2016-09-28 09:54:19 -07:00
Brad Davis
7361b9a166
Add support for disabling incremental texture transfers
2016-09-28 09:23:15 -07:00
Brad Hefta-Gaub
ff73fa322e
Merge pull request #8668 from ZappoMan/hacktest
...
automatic (runtime) disabling of sparse textures systems with 4 or less cores
2016-09-28 09:13:33 -07:00
Brad Hefta-Gaub
b5de603921
runtime disabling of sparse textures on less than 4 core systems
2016-09-27 10:32:56 -07:00
Brad Hefta-Gaub
9363c4dda6
Merge pull request #8666 from sethalves/fix-ac-delete-entity
...
fix an AC script's ability to delete entities
2016-09-26 17:35:24 -07:00
Seth Alves
90adb5f67e
fix an AC script's ability to delete entities
2016-09-26 17:14:45 -07:00
Clément Brisset
9ab1830c98
Merge pull request #8662 from Atlante45/home-content-update
...
Ask if user want to update home content when available -- RC update PR
2016-09-26 13:27:11 -07:00
Stephen Birarda
43a3a9a7bd
Merge pull request #8656 from Atlante45/home-content-update
...
Ask if user want to update home content when available
2016-09-26 13:26:41 -07:00
Zach Pomerantz
84ba3223bb
Merge pull request #8650 from zzmp/fix/reload-qml-with-js
...
reload qml with scripts
2016-09-26 11:00:13 -07:00
Brad Davis
ad3355d36d
Merge pull request #8661 from jherico/RC-21
...
Merge from stable into RC-21
2016-09-26 10:54:41 -07:00
Brad Davis
3c9c5331f1
Stable merge
2016-09-26 10:53:48 -07:00
Brad Davis
197c935d75
Merge pull request #8660 from jherico/stable-merge
...
Merge from stable into master.
2016-09-26 10:51:02 -07:00
Brad Davis
1a1c8af58a
Merge from stable
2016-09-26 10:50:26 -07:00
Atlante45
f001cf7570
Make constant for home content URL
2016-09-26 10:44:59 -07:00
Atlante45
cb4d526dcf
Ask if user want to update home content when available
2016-09-23 20:18:41 -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
