Eric Levin
830d08c385
Merge pull request #7498 from Atlante45/fix/import-entities
...
Make svo loading use ResourceManager
2016-03-29 08:09:47 -07:00
David Rowe
d07cc82512
Color some buttons
2016-03-29 23:39:02 +13:00
David Rowe
791d3b0310
Fix styling of disabled form
2016-03-29 23:24:34 +13:00
David Rowe
252a48ed5b
Miscellaneous fixes
2016-03-29 22:28:00 +13:00
David Rowe
ab37534e0d
Restyle dropdowns
2016-03-29 20:14:08 +13:00
David Rowe
a2d9f088ab
Typos
2016-03-29 18:47:13 +13:00
Anthony J. Thibault
24ca5b3d60
Update after merge changes to NetworkGeometry.
...
Also cleaned up API for ModelMeshPartPayload::updateTransformForSkinnedMesh() to pass a QVector const ref, instead of a raw pointer and a size.
2016-03-28 20:29:02 -07:00
Seth Alves
4f65f26717
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-28 20:26:23 -07:00
Anthony J. Thibault
940f3e636d
Merge branch 'master' into tony/animated-culling
2016-03-28 19:58:38 -07:00
Anthony J. Thibault
115fd607a0
Address performance issues introduced with this PR.
...
* Prevent clusterMatrices from being invalidated and re-computed in each updateItem lambda.
We do this by not setting _model->_needsUpdateClusterMatrices = true;
* Prevent redundant work if Model::enqueueLocationChange is called multiple times per frame.
We do this by introducing a preRenderLambdas map in the Application class.
Instead of adding work directly to the scene PendingChanges queue Model::enqueueLocationChange
adds a lambda to the Application preRenderLambdas map. The Application ensures that only one lambda will
be invoked for each model per frame.
2016-03-28 19:47:30 -07:00
Stephen Birarda
b134f22cfa
fix an overflow in portable high resolution clock on windows
2016-03-28 18:51:34 -07:00
Brad Hefta-Gaub
9bcc13d4a8
Merge pull request #7497 from samcake/orange
...
Fix import for local file.qml tfrom another qml
2016-03-28 18:44:25 -07:00
samcake
884a3e691d
Cleaning up moved files
2016-03-28 18:38:34 -07:00
samcake
a815c50fca
fixing the qml component
2016-03-28 18:36:17 -07:00
Atlante45
807698f0bb
Make svo loading use ResourceManager
2016-03-28 18:07:48 -07:00
samcake
95418e25c0
Try to fix the iinclude for the PerfPlot/qml
2016-03-28 17:46:19 -07:00
howard-stearns
1b3d9d7ab6
Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents
2016-03-28 16:59:20 -07:00
howard-stearns
b09b9a4a0a
snapshot after using tree from entity item.
2016-03-28 16:58:20 -07:00
samcake
b34ab28c22
Merge pull request #7456 from zzmp/feat/geocaching
...
Add model caching
2016-03-28 16:28:40 -07:00
Ken Cooke
a51cc9d12a
make self-reverb depend on wetDryMix
2016-03-28 16:04:45 -07:00
Atlante45
238131014b
Fix avatar manager naming
2016-03-28 15:00:36 -07:00
Atlante45
92ef8cafb1
Make sure pos/rot getters don't crash
2016-03-28 14:37:06 -07:00
howard-stearns
db13b15337
Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents
2016-03-28 14:26:18 -07:00
howard-stearns
7a066afa26
Checkpoint for freakin edit.js again.
2016-03-28 14:25:51 -07:00
Clément Brisset
b6ce7a7db8
Merge pull request #7492 from birarda/next-packet-delta
...
fix for incorrect next packet delta in udt::SendQueue
2016-03-28 14:12:04 -07:00
Zach Pomerantz
2de94e672b
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-28 14:08:30 -07:00
howard-stearns
d07967d6d8
Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents
2016-03-28 14:02:20 -07:00
Brad Hefta-Gaub
7396fa1cc3
Merge pull request #7493 from zzmp/fix/plugin-check
...
Default to desktop when display plugins fail to load
2016-03-28 13:49:58 -07:00
Clément Brisset
19ccee5d3c
Merge pull request #7490 from birarda/udt-fixes
...
cleanup unused public keys in ice-server
2016-03-28 13:48:45 -07:00
Seth Alves
b273d5efd3
fix defaultScripts filename
2016-03-28 13:48:19 -07:00
howard-stearns
c6347eb92a
checkpoint for debugging/comparing edit.js
2016-03-28 13:39:43 -07:00
Stephen Birarda
1df7cf5c8d
Merge pull request #7484 from Atlante45/fix/atp-req-limit
...
Fix segfault with gxx
2016-03-28 13:31:12 -07:00
Anthony J. Thibault
e77cf54483
Geometry.cpp: rename method
2016-03-28 13:29:28 -07:00
Brad Hefta-Gaub
44b37c332a
Merge pull request #7480 from jherico/webchannel_redux
...
Webchannel redux
2016-03-28 13:18:22 -07:00
Atlante45
659d7e7335
Fix segfault with gxx
2016-03-28 13:17:07 -07:00
Atlante45
103c6d89f2
Add Socket include to see debug macro
2016-03-28 13:11:44 -07:00
Zach Pomerantz
7bcef1d319
Fallback display to last, then desktop
2016-03-28 12:54:38 -07:00
Zach Pomerantz
c348c82307
Merge branch 'master' of github.com:zzmp/hifi into feat/geocaching
2016-03-28 12:28:55 -07:00
Zach Pomerantz
34a77b47a3
Restore SDL2 comments
2016-03-28 12:25:56 -07:00
Zach Pomerantz
b94e244844
Update oculus legacy plugin
2016-03-28 12:24:31 -07:00
Seth Alves
cefc5293b0
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-28 12:23:37 -07:00
Seth Alves
de8153bd75
on windows and osx use default scripts bundled with interface
2016-03-28 12:23:23 -07:00
Brad Hefta-Gaub
b26533bc14
Merge pull request #7481 from samcake/lemon
...
Monitoring Tool for rendering engine
2016-03-28 12:20:07 -07:00
Zach Pomerantz
37a725b06d
Fallback to desktop if display plugin fails
2016-03-28 12:12:52 -07:00
Zach Pomerantz
931cad34d1
Check plugin activation success
2016-03-28 12:05:58 -07:00
samcake
aa085f6955
Putting members of the ENgineStats class NOT public so they can keep their name proudly
2016-03-28 11:52:31 -07:00
samcake
b5028acde1
CLeaning up the location of the global variables, moved them to the gpu::COntext class as static
2016-03-28 11:45:07 -07:00
Brad Hefta-Gaub
3ca02c847d
Merge pull request #7489 from zzmp/fix/catch-qml-gl
...
Catch and report GL errors in QML render
2016-03-28 11:23:19 -07:00
Zach Pomerantz
776893a5ab
Improve logging for oculus errors
2016-03-28 11:22:56 -07:00
Stephen Birarda
c0b92486f9
fix incorrect next packet delta
2016-03-28 11:09:32 -07:00
