Seth Alves
e8f26b675a
try to fix path to osx scripts
2016-03-30 15:04:29 -07:00
Seth Alves
62372415be
get this working on windows
2016-03-30 14:01:35 -07:00
Seth Alves
bb43347599
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-30 13:33:59 -07:00
Seth Alves
26e01bbacd
rewrite a bunch of path/url mangling code
2016-03-30 13:33:49 -07:00
Brad Hefta-Gaub
699b3a9dd7
Merge pull request #7499 from birarda/udt-fixes
...
fix an overflow in portable high resolution clock on windows
2016-03-30 10:54:00 -07:00
Brad Hefta-Gaub
d99dcf5450
Merge pull request #7487 from hyperlogic/tony/animated-culling
...
Improved render bounding boxes for animated models
2016-03-30 09:27:43 -07:00
Seth Alves
7c0bb72aff
started on making ~ mean the application directory in script paths
2016-03-29 18:32:46 -07:00
Seth Alves
0c72ca1be3
works on windows now
2016-03-29 13:39:35 -07:00
Stephen Birarda
b9ce427344
use c-style casts to respect the coding standard
2016-03-29 13:25:03 -07:00
Stephen Birarda
37950e9931
use explicit double casts for win_high_resolution_clock
2016-03-29 13:13:22 -07:00
Seth Alves
3aa1090ced
working toward allowing local files in running-scripts window
2016-03-29 11:58:21 -07:00
Seth Alves
b88770228e
convert running-scripts window to use local script files
2016-03-29 10:40:56 -07:00
Stephen Birarda
b134f22cfa
fix an overflow in portable high resolution clock on windows
2016-03-28 18:51:34 -07:00
howard-stearns
b09b9a4a0a
snapshot after using tree from entity item.
2016-03-28 16:58:20 -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
Seth Alves
de8153bd75
on windows and osx use default scripts bundled with interface
2016-03-28 12:23:23 -07:00
Anthony J. Thibault
bf433487fa
Dynamic bound update for skinned mesh
...
* Use all cluster matrices to compute bound for skinned mesh.
This is far less expensive then doing per-vertex work, but it's not free, for avatars especially.
* Remove skinnedMeshBound, compute it instead.
* Compute clusterMatrices in render update, because we need them to update bounds.
2016-03-26 12:22:02 -07:00
Anthony J. Thibault
b4e70d9101
WIP: checkpoint
...
* bug fix in AABox::operator+=
* added AABox::emiggen
* Avatar now has a default bound for it's skinned mesh.
* WIP: AABox tests; NEED MORE
* Model: split collision and model mesh render items.
Because ModelMeshRenderItems need special handling to update bounds for animated joints.
* Model: dynamically update the bound for rigidly bound animated meshes
* Rig: added access to geometryToRigTransform
* RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working)
* Geometry.cpp: removed unused bounds parameter in evalPartBounds
* ModelMeshPartPayload: bounds updating
* non-animated: use existing _localBound
* rigid bound mesh: use _localBound transformed by clusterMatrix joint transform
* fully skinned mesh: use _skinnedMeshBound provided by the application.
2016-03-25 21:29:20 -07:00
Seth Alves
1532800a4e
Merge branch 'master' of github.com:highfidelity/hifi into fix-logging-crash
2016-03-25 16:17:58 -07:00
Brad Hefta-Gaub
541c1e5c6f
Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks
2016-03-25 13:03:31 -07:00
Seth Alves
13eddef312
fix locking in GenericQueueThread::process
2016-03-25 11:37:04 -07:00
Brad Hefta-Gaub
fb09ad51b3
CR feedback
2016-03-24 21:14:07 -07:00
Brad Hefta-Gaub
7de8a2267f
one more try
2016-03-24 18:09:14 -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
06a6a8462f
more cleanup
2016-03-24 16:34:09 -07:00
Brad Hefta-Gaub
2b595fb329
break out thread safe moving average to get around unix build hell
2016-03-24 16:26:28 -07:00
Brad Hefta-Gaub
8691aa6905
fix unix build and CR feedback
2016-03-24 15:45:44 -07:00
Brad Hefta-Gaub
6eed8fb429
fix unix build
2016-03-24 13:30:20 -07:00
Brad Hefta-Gaub
208b594ef8
make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines
2016-03-24 12:37:07 -07:00
Anthony J. Thibault
de3144cde5
Merge branch 'master' into tony/vive-rendering-work
2016-03-23 18:13:59 -07:00
Andrew Meadows
a52ac3cc50
remove excess whitespace
2016-03-23 14:39:49 -07:00
Brad Davis
84dc15aff6
Fix potential deadlock in QML
2016-03-23 12:59:17 -07:00
Anthony J. Thibault
9dd24f81d4
Fix for osx and linux
2016-03-22 18:24:48 -07:00
Anthony J. Thibault
c40b70688c
Made Nsight wrapper win32 only.
2016-03-22 17:43:36 -07:00
Anthony Thibault
225c462685
Improved NSIGHT instrumentation
...
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
2016-03-21 21:47:59 -07:00
Atlante45
6d2498b4f2
Remove debug print
2016-03-21 14:50:18 -07:00
Seth Alves
cbfde2032c
fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand
2016-03-17 17:09:32 -07:00
Seth Alves
db5c6d80d2
possibly fix a couple of crashes
2016-03-17 10:31:54 -07:00
Seth Alves
e8a03b725f
try again on queryAACube
2016-03-14 13:03:27 -07:00
Seth Alves
908481d5d4
merge from upstream
2016-03-14 11:15:16 -07:00
Seth Alves
01659cf93b
try, try again
2016-03-11 16:21:20 -08:00
Seth Alves
5f05d576cc
move checkAndAdjustQueryAACube into SpatiallyNestable
2016-03-11 15:55:42 -08:00
Anthony J. Thibault
5eeb4ca594
Fix one frame lag controller lag/jitter
...
Move userInputMapper->update() after inputPlugin->pluginUpdate().
2016-03-11 09:28:25 -08:00
Howard Stearns
2b576e86f0
Merge pull request #7259 from jherico/crashes
...
Crash fixes
2016-03-09 16:42:36 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Anthony J. Thibault
deb17e1f93
Merge branch 'master' into tony/hand-controller-move-improvements
2016-03-08 17:45:50 -08:00
Brad Hefta-Gaub
6d211dd4e5
first cut at fixing the scene not stable bug
2016-03-08 14:52:21 -08:00
Anthony J. Thibault
0d62b10a8f
Added Mat4 support to script
...
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
2016-03-07 16:16:14 -08:00
Brad Davis
2f89253dc1
Make Overlays usable from QML
2016-03-04 11:35:54 -08:00
