Commit graph

5009 commits

Author SHA1 Message Date
Brad Hefta-Gaub
350743454b Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1
use smart pointers for entity simulations
2016-05-10 11:35:57 -07:00
Clément Brisset
c3ce463b6c Merge pull request #7854 from zzmp/refactor/delayLoad
Clean up resource cache's encapsulation of asynchronous loading
2016-05-10 10:47:23 -07:00
Brad Hefta-Gaub
d7eee98acc Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum
resurrection of threadsafe ViewFrustum
2016-05-10 09:06:38 -07:00
Seth Alves
b761ecf44f merge from upstream 2016-05-10 08:18:45 -07:00
Zach Pomerantz
9ac783a88d Black box asynch resource retrieval 2016-05-09 18:03:19 -07:00
Atlante45
5c196f3df5 Remove Deadlock status 2016-05-09 15:53:45 -07:00
Brad Hefta-Gaub
2c0204b0d6 Merge pull request #7821 from Atlante45/fix/collision-sound
Fix avatar/entity collision sound
2016-05-09 14:24:19 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Stephen Birarda
fb09efc0c9 send location updates immediately on mode change and startup 2016-05-06 12:01:03 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Andrew Meadows
778820edb4 fix broken dupe method implementation 2016-05-06 09:07:03 -07:00
Andrew Meadows
635e2e78e3 minor cleanup 2016-05-05 18:43:08 -07:00
Andrew Meadows
71b2d647e8 add locks and explicitly copy ViewFrustums 2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660 getViewFrustum() provides const pointer 2016-05-05 18:28:27 -07:00
Atlante45
07adef9465 Fix entities collision sounds 2016-05-05 14:55:28 -07:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
Anthony Thibault
d8a32c8329 Avatar eye gaze fix for HMDs
When no avatars are chosen for more detailed eye gaze tracking the eyes should look straight ahead.
Before this fix, if you were in room scale or not aligned with the camera sensor your gaze could drift to the left or to the right of your head's forward direction.
Now it should follow your head more closely.
2016-04-24 17:59:51 -07:00
Brad Hefta-Gaub
d87d631871 Merge pull request #7708 from zzmp/feat/render-rates
Add renderRates.js to visualize rates over time
2016-04-21 15:59:58 -07:00
Zach Pomerantz
1fe12e7029 Mv Rates to RatesScriptingInterface.h 2016-04-20 13:26:23 -07:00
Howard Stearns
9ff9682b2a Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
Brad Hefta-Gaub
0ac9601ea7 Merge pull request #7690 from ZappoMan/improveHMD
Introduce "recommended overlay rectangle" to display plugins
2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
0a79b5dd69 Merge pull request #7707 from huffman/fix/osx-default-script-dir
Remove fix for old QT file path bug in OSX
2016-04-18 18:01:47 -07:00
Zach Pomerantz
f48541961d Expose Rates to JS/QML 2016-04-18 17:43:34 -07:00
Ryan Huffman
4e0ac2a4be Remove fix for old QT file path bug in OSX 2016-04-18 16:07:53 -07:00
Brad Hefta-Gaub
01907f181f Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-18 16:01:42 -07:00
Seth Alves
3298883774 Merge pull request #7702 from zzmp/fix/clear-octree-on-exit
Clear entities and avatars on exit
2016-04-18 15:48:35 -07:00
samcake
dccf549118 Merge pull request #7676 from jherico/perf_testing
Manually generate mipmaps for textures while loading
2016-04-18 15:09:12 -07:00
Zach Pomerantz
790e325248 Clear entities and avatars on exit 2016-04-18 14:31:16 -07:00
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub
0520363da8 cleanup 2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Brad Davis
f3e5306f90 Working on an automated performance test 2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807 code review feedback 2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -07:00
David Rowe
8f6cfb72ea Fix QML warnings at shutdown 2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Brad Hefta-Gaub
c7f58dc17c first cut at exposing recommend overlay rectangle 2016-04-14 20:47:31 -07:00
Brad Hefta-Gaub
ea4da05cba Merge pull request #7643 from AndrewMeadows/faster-bullet
faster Bullet kinematics
2016-04-14 12:16:54 -07:00
Andrew Meadows
dcf28937cf cleanup cached Physics::sessionUUID 2016-04-14 11:18:10 -07:00
Zach Pomerantz
e80898f095 Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache 2016-04-14 10:12:16 -07:00
Brad Hefta-Gaub
7b5075cce5 Merge pull request #7645 from sethalves/dont-run-bullet-too-soon
add a heuristic for deciding when it's safe to enable bullet
2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
37dcfdad8a Merge pull request #7652 from huffman/feat/crash-menu
Move crash menu items to submenu and add new crash types
2016-04-14 09:32:36 -07:00
Seth Alves
ba0549dddd Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon 2016-04-14 09:18:58 -07:00
Chris Collins
47522e1774 Merge pull request #7659 from ZappoMan/newLODSettings
improve reset settings
2016-04-13 16:49:22 -07:00
Zach Pomerantz
7a15339631 Use AnimationCache for models 2016-04-13 15:44:47 -07:00
Ryan Huffman
47c2a1722b Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu 2016-04-13 14:40:46 -07:00
Ryan Huffman
bc247ec058 Remove unused Application::crashApplication() 2016-04-13 14:01:41 -07:00