Brad Davis
|
a47614c9b6
|
Revert "Build a better event bridge"
This reverts commit a43fde0803.
|
2016-03-25 09:48:25 -07:00 |
|
Andrew Meadows
|
6c36d55fea
|
Merge pull request #7459 from kencooke/master
Fix Reverb Zone settings to work correctly with new reverb
|
2016-03-25 08:17:45 -07:00 |
|
Brad Hefta-Gaub
|
cd5beabf10
|
Revert "Drop resource data after load"
|
2016-03-24 20:37:16 -07:00 |
|
Brad Hefta-Gaub
|
17a2ed7dd0
|
Merge pull request #7467 from zzmp/clean/drop-data
Drop resource data after load
|
2016-03-24 17:52:19 -07:00 |
|
Brad Davis
|
0ac70049c7
|
Merge pull request #7431 from hyperlogic/tony/vive-rendering-work
OpenVR rendering & Nsight instrumentation improvements
|
2016-03-24 17:44:30 -07:00 |
|
Brad Hefta-Gaub
|
d26fe77803
|
Merge pull request #7454 from jherico/qml_crashes
Fix async issues related to JS <-> App <-> QML <-> HTML communication
|
2016-03-24 17:32:38 -07:00 |
|
Zach Pomerantz
|
afc853572a
|
Drop resource data after load
|
2016-03-24 15:50:51 -07:00 |
|
Zach Pomerantz
|
8d0e419a5c
|
Clean image-reader to drop image sooner
|
2016-03-24 15:50:48 -07:00 |
|
Ken Cooke
|
c6ca984782
|
Fix Reverb Zone settings to work correctly with new reverb.
|
2016-03-24 12:59:52 -07:00 |
|
Brad Davis
|
a43fde0803
|
Build a better event bridge
|
2016-03-24 11:01:06 -07:00 |
|
Clément Brisset
|
caf2595e13
|
Merge pull request #7452 from birarda/udt-fixes
fix unecessary re-sends at capacity on udt, race in SendQueue timeout check
|
2016-03-24 11:00:57 -07:00 |
|
Ozan
|
003af03b33
|
Merge pull request #7400 from Menithal/default-use-pre-post
Set UserAnimPreAndPostRotations true by Default
|
2016-03-24 09:57:03 -07:00 |
|
Brad Davis
|
8bbabf186f
|
Fix async issues related to JS / QML object lifetimes
|
2016-03-24 09:38:54 -07:00 |
|
Philip Rosedale
|
f8f0e48af9
|
Merge pull request #7453 from Atlante45/fix/atp-req-limit
Make ATP respect request limit
|
2016-03-24 09:20:30 -07:00 |
|
Seth Alves
|
1aadebb4e7
|
Merge pull request #7445 from AndrewMeadows/shape-management
fix memory leak in ShapeManager
|
2016-03-24 08:45:49 -07:00 |
|
Philip Rosedale
|
0e2d9d8aaa
|
Merge pull request #7432 from samcake/orange
Fix some Model loading issues with the translucent textures
|
2016-03-24 08:41:35 -07:00 |
|
Andrew Meadows
|
21c770f37b
|
Merge pull request #7441 from zzmp/clean/resource-reinsert
Restrict Resource reinsertion
|
2016-03-24 08:41:12 -07:00 |
|
Philip Rosedale
|
61205e0e37
|
Merge pull request #7450 from ZappoMan/reduceLogSpam
reduce log spam
|
2016-03-24 00:19:09 -07:00 |
|
Philip Rosedale
|
366810a20c
|
Merge pull request #7447 from ZappoMan/fixNonAnimatedMotorProteins
fix animated motor proteins
|
2016-03-24 00:11:26 -07:00 |
|
Brad Hefta-Gaub
|
2b0670718f
|
Merge pull request #7449 from howard-stearns/report-previous-session-data
Report previous session data
|
2016-03-23 20:58:51 -07:00 |
|
Atlante45
|
69c516caaf
|
Have ATP respect request limit
|
2016-03-23 19:09:28 -07:00 |
|
Stephen Birarda
|
ef3f5e0221
|
fix for race in last receiver response
|
2016-03-23 18:23:30 -07:00 |
|
Anthony J. Thibault
|
de3144cde5
|
Merge branch 'master' into tony/vive-rendering-work
|
2016-03-23 18:13:59 -07:00 |
|
Stephen Birarda
|
1b322c8d01
|
don't oversend because of packet pairs
|
2016-03-23 18:07:28 -07:00 |
|
Brad Hefta-Gaub
|
62a56ecbfa
|
fix typos
|
2016-03-23 17:45:22 -07:00 |
|
Stephen Birarda
|
57da7c2ba7
|
add handling for short circuit loss in SendQueue
|
2016-03-23 17:29:46 -07:00 |
|
Brad Hefta-Gaub
|
574642a6e4
|
Merge pull request #7440 from zzmp/feat/resource-finished
Add finished signal to Resource loading
|
2016-03-23 17:17:53 -07:00 |
|
Anthony J. Thibault
|
73725106f0
|
OpenGLDisplayPlugin: For non-threaded present use fetchAndReleasewithGpuWait
|
2016-03-23 17:13:29 -07:00 |
|
Anthony J. Thibault
|
8bb387dc74
|
Revert GLEscrow changes
|
2016-03-23 17:11:16 -07:00 |
|
Brad Hefta-Gaub
|
fdd0b48ae1
|
reduce log spam
|
2016-03-23 17:06:03 -07:00 |
|
howard-stearns
|
c435ca212a
|
Report previous session time.
|
2016-03-23 16:59:17 -07:00 |
|
samcake
|
22191a2864
|
When an albedo texture is replaced from script,make sure its aloha channel is checked for opacity
|
2016-03-23 16:12:43 -07:00 |
|
Anthony J. Thibault
|
0d37515784
|
Merge branch 'master' into tony/vive-rendering-work
|
2016-03-23 15:59:59 -07:00 |
|
samcake
|
1e46b0803c
|
fixing repported issues during review
|
2016-03-23 15:59:57 -07:00 |
|
Brad Hefta-Gaub
|
3fa3b40f43
|
fix non-animated motor proteins
|
2016-03-23 15:56:31 -07:00 |
|
howard-stearns
|
550738776c
|
Pass whether or not previous session crashed to the UserActivityLogger.
|
2016-03-23 15:56:29 -07:00 |
|
samcake
|
7d99183474
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-03-23 15:47:00 -07:00 |
|
Andrew Meadows
|
ecfe198e35
|
patch btCompoundShape memory leak
|
2016-03-23 14:39:49 -07:00 |
|
Andrew Meadows
|
119ef24d5d
|
cleanup ShapeManager API and fix bitrot in tests
|
2016-03-23 14:39:49 -07:00 |
|
Andrew Meadows
|
a52ac3cc50
|
remove excess whitespace
|
2016-03-23 14:39:49 -07:00 |
|
Zach Pomerantz
|
8b1a78bac0
|
Restrict Resource reinsertion
|
2016-03-23 13:00:29 -07:00 |
|
Zach Pomerantz
|
17aa2845a8
|
Add finished signal to Resource loading
|
2016-03-23 13:00:02 -07:00 |
|
Brad Davis
|
84dc15aff6
|
Fix potential deadlock in QML
|
2016-03-23 12:59:17 -07:00 |
|
Brad Hefta-Gaub
|
8c290ea6b9
|
Merge pull request #7390 from Atlante45/feat/udp-flood-protection
Server side bandwidth dial
|
2016-03-23 11:47:41 -07:00 |
|
Brad Hefta-Gaub
|
08b87b9b98
|
Merge pull request #7434 from zzmp/clean/incomplete-fbo
Clean up QML Render Thread
|
2016-03-23 10:43:21 -07:00 |
|
Brad Hefta-Gaub
|
2e6c360708
|
Merge pull request #7427 from huffman/fix-scriptengine-threading
Add protection around ScriptEngine::runInThread being called twice
|
2016-03-23 10:27:16 -07:00 |
|
Chris Collins
|
29ac80d3fe
|
Merge pull request #7430 from ZappoMan/blenderDestructorCrash
make Blender keep a shared pointer to the model it's blending
|
2016-03-23 09:00:01 -07:00 |
|
Brad Hefta-Gaub
|
03a12ecf5a
|
Merge pull request #7433 from zzmp/fix/long-qml-instantiation
Avoid triggering deadlock on long local qml component instantion
|
2016-03-23 08:30:50 -07:00 |
|
Brad Davis
|
252a49eea4
|
Add a tracker and logging of memory allocated by the GPU library
|
2016-03-22 22:35:46 -07:00 |
|
Zach Pomerantz
|
40b21933a5
|
Clean QML Surface render log
|
2016-03-22 18:42:54 -07:00 |
|