Clément Brisset
476ccadb38
Merge pull request #8732 from huffman/feat/category-in-logs
...
Add category to log lines
2016-10-05 13:29:41 -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
2bb2aca2be
Remove commented line in LogHandler
2016-10-04 16:54:37 -07:00
Ryan Huffman
a52e2d8bc5
Add category to log lines
2016-10-04 16:49:24 -07:00
Ryan Huffman
c683c82817
Fix setting textures in model overlays
2016-10-04 16:24:43 -07:00
Chris Collins
1087885380
Merge pull request #8721 from kencooke/audio-fixes2
...
Fix audio support on Windows7
2016-10-04 10:14:37 -07:00
Brad Hefta-Gaub
9554befb68
Merge pull request #8714 from Atlante45/ack2
...
Fix potential race condition on static memory
2016-10-04 10:05:53 -07:00
Ken Cooke
8491254664
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-fixes2
2016-10-03 18:13:43 -07:00
Brad Davis
8c5028158f
Fix crash on destroying web entities and overlays
2016-10-03 18:02:21 -07:00
Ken Cooke
46526a309d
Increase audio input buffering on Windows 7
2016-10-03 17:46:09 -07:00
Brad Davis
ca3572f991
Support external GL textures with proper fencing
2016-10-03 17:09:10 -07:00
Chris Collins
ca1a7135eb
Merge pull request #8706 from kencooke/audio-fixes
...
Improve support for audio when input rate != output rate
2016-10-03 16:46:56 -07:00
Ryan Huffman
0b2def6013
Fix style error
2016-10-03 15:23:39 -07:00
Ryan Huffman
e213a47814
Fix incorrect return values in getProcessorInfo
2016-10-03 15:19:03 -07:00
Ryan Huffman
dafb5c5bab
Add processor information to launch user activity event
2016-10-03 15:11:56 -07:00
Atlante45
573d5898cc
Make static control packets class members
2016-10-03 13:46:55 -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
afcb5b8557
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-10-03 10:17:46 -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
Ken Cooke
9590d2eef9
Fix support for audio when input rate != output rate
2016-10-03 09:08:32 -07:00
Brad Hefta-Gaub
3612ed95c3
Merge pull request #8703 from hyperlogic/bug-fix/qml-surface-get-root-item-crash
...
Fix for crash bug in web entities
2016-10-02 20:31:35 -07:00
Brad Davis
53f358d77a
Fix warnings
2016-10-02 11:44:36 -07:00
Brad Davis
488d191428
Remove all oglplus usage and references
2016-10-02 11:44:34 -07:00
Brad Davis
d83d3fe98e
Make shader compilation from non-GPU code easier
2016-10-02 11:44:32 -07:00
Brad Davis
f28962af12
Remove dead class from oglplus helpers
2016-10-02 11:44:32 -07:00
Brad Hefta-Gaub
c7551a2207
Merge pull request #8700 from ZappoMan/fetchTextureMapCrashFix
...
fix crash when bouncing to eschatology and eschatology-dev
2016-10-01 21:34:20 -07:00
Brad Hefta-Gaub
51e67df39a
Merge pull request #8669 from jherico/oglplus_b_gone
...
Remove oglplus usage in Offscreen QML rendering
2016-10-01 21:20:51 -07:00
Brad Hefta-Gaub
7ef8e53d03
Merge pull request #8701 from ZappoMan/getShapeKeyCrashFix
...
add guards to getShapeKey
2016-10-01 20:23:50 -07:00
Brad Hefta-Gaub
7fe16442fa
make calculateTextureInfo thread safe
2016-10-01 15:47:17 -07:00
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
04f6547940
add guards to getShapeKey
2016-10-01 12:15:03 -07:00
Brad Davis
933388bc61
Remove oglplus usage from offscreen UI
2016-10-01 11:39:46 -07:00
Brad Davis
265996156c
Remove unused header and typedef
2016-10-01 11:39:45 -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 Hefta-Gaub
2cba3db2b6
fix crash when bouncing to escotology, which may or may not be related
2016-10-01 11:08:52 -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
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
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
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
4f7fdfc345
eliminated else, this might look cleaner
2016-09-30 03:31:35 +02:00
Zach Pomerantz
768354e49f
loopback local injectors on server echo
2016-09-29 15:25:17 -07:00
