samcake
|
9b58d50fd4
|
BUilding a more complete set of tools to monitor performances
|
2016-03-25 15:28:06 -07:00 |
|
samcake
|
9fb1a9a2a8
|
Merge and many more counters
|
2016-03-25 03:02:18 -07:00 |
|
samcake
|
3f844d7a82
|
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
|
2016-03-24 20:36:29 -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
|
fc41c5bca9
|
Merge pull request #7448 from Menithal/entity-properties-refresh-cache
Added Refresh Buttons to entityProperties
|
2016-03-24 17:34:46 -07:00 |
|
Brad Hefta-Gaub
|
6d76a5872f
|
Merge pull request #7461 from hyperlogic/tony/avatar-culling-fix
Avatar: fix for Avatar animation updates while wearing HMD
|
2016-03-24 17:34:20 -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 |
|
samcake
|
0c8556528b
|
Polishing the PerfPlot qml to display usefull things
|
2016-03-24 17:25:58 -07:00 |
|
Brad Hefta-Gaub
|
299103fc4f
|
Merge pull request #7466 from zzmp/clean/image-reader
Clean image-reader to drop image sooner
|
2016-03-24 16:24:47 -07:00 |
|
Howard Stearns
|
d580cb8694
|
Merge pull request #7464 from jherico/atomic_display_plugin
Make display plugin switching atomic from other threads
|
2016-03-24 16:16:56 -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 |
|
Brad Davis
|
520cccb219
|
Make display plugin switching atomic from other threads
|
2016-03-24 15:19:46 -07:00 |
|
Anthony J. Thibault
|
ba4520fe56
|
Avatar: fix for Avatar animation updates while wearing HMD
The boundingSphere vs frustum check now uses the displayViewFrustum, which
more accurately reflects the actual projection matrix used for rendering.
|
2016-03-24 13:23:30 -07:00 |
|
Menithal
|
24f2bdac77
|
Fixed Styling
|
2016-03-24 20:58:32 +02: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 |
|
Brad Hefta-Gaub
|
16c5971a7f
|
Merge pull request #7455 from ctrlaltdavid/20860
Miscellaneous improvements to Attachments dialog
|
2016-03-24 09:21:36 -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 |
|
Andrew Meadows
|
c8655b8524
|
Merge pull request #7438 from PhilipRosedale/airship
Sample script: Airship
|
2016-03-24 08:40:36 -07:00 |
|
David Rowe
|
51728d14a7
|
Miscellaneous improvements to Attachments dialog
|
2016-03-24 21:17:36 +13:00 |
|
Philip Rosedale
|
8e572ed635
|
Merge pull request #7423 from thoys/20859
CR for Job #20859 - Fix particle color selection
|
2016-03-24 00:20:59 -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 |
|
PhilipRosedale
|
8c4ecc64d9
|
fix entity script location
|
2016-03-23 22:49:18 -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 |
|
Brad Hefta-Gaub
|
3505c14552
|
Merge pull request #7444 from birarda/uncover-qml
Attachments Dialog QML updates (from contractor)
|
2016-03-23 20:45:50 -07:00 |
|
Brad Hefta-Gaub
|
cdd5126589
|
Merge pull request #7451 from hyperlogic/tony/increased-deadlock-timer
DeadlockWatchdogThread: bumped up age from 10 to 15 seconds.
|
2016-03-23 20:39:12 -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 |
|
Anthony J. Thibault
|
0ef5c45815
|
DeadlockWatchdogThread: bumped up age from 10 to 15 seconds.
This will, hopefully, prevent false positives from people loading content on slow PCs.
|
2016-03-23 17:59:54 -07:00 |
|
PhilipRosedale
|
7b326c9d7b
|
fixes per review
|
2016-03-23 17:56:02 -07:00 |
|
samcake
|
add811e404
|
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
|
2016-03-23 17:52:27 -07:00 |
|
samcake
|
6d6f0398f5
|
TRying to create a graph :)
|
2016-03-23 17:52:06 -07:00 |
|
Brad Hefta-Gaub
|
62a56ecbfa
|
fix typos
|
2016-03-23 17:45:22 -07:00 |
|
Anthony Thibault
|
88c4e54cff
|
openvr: predict 3 frames into the future
Becasue I revered the latency fix in the GLEscrow queue.
*sigh*
|
2016-03-23 17:38:40 -07:00 |
|
Howard Stearns
|
a393f36978
|
Forgot important comment.
|
2016-03-23 17:31:21 -07:00 |
|
Stephen Birarda
|
57da7c2ba7
|
add handling for short circuit loss in SendQueue
|
2016-03-23 17:29:46 -07:00 |
|
Howard Stearns
|
c09c1438f8
|
ivar init order.
|
2016-03-23 17:28:54 -07:00 |
|
Philip Rosedale
|
e1f3665185
|
Merge pull request #7435 from hyperlogic/tony/all-jitter-must-die
MyAvatar: fix jitter in hands when moving
|
2016-03-23 17:28:47 -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 |
|