Commit graph

42784 commits

Author SHA1 Message Date
Andrew Meadows
2bd83764e7 remove some debug cruft 2016-04-22 09:38:43 -07:00
Andrew Meadows
872622c6f7 fix acceleration of for server-side kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
14abb15216 set kinematic accel before stepping 2016-04-22 09:38:43 -07:00
Andrew Meadows
8efb07cfd8 correctg measured acceleration for kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
a3c66d8c91 reduce number of updates for fast-moving objects 2016-04-22 09:38:43 -07:00
Andrew Meadows
a79f49a5cd don't stop slow kinematic objs when sending updates 2016-04-22 09:38:43 -07:00
Andrew Meadows
afcf6d68a7 move deactivation thresholds to shared header 2016-04-22 09:38:43 -07:00
Andrew Meadows
ad045bc439 remove second-order term from kinematic motion 2016-04-22 09:38:43 -07:00
Andrew Meadows
8cbec06616 fix bug where kinematic objs pop on first step 2016-04-22 09:38:43 -07:00
Andrew Meadows
c8f0b0501a avoid active object update cycles 2016-04-22 09:38:43 -07:00
Andrew Meadows
3639ffe53e optimize kinematic motion math 2016-04-22 09:38:43 -07:00
Andrew Meadows
905c5398c4 add EntityItem::set/getTransformAndVelocities() 2016-04-22 09:38:43 -07:00
Andrew Meadows
771727890c more finely grained Bullet profiling 2016-04-22 09:38:43 -07:00
David Rowe
545d373a90 Display gap between consecutive selected entities 2016-04-22 13:29:53 +12:00
David Rowe
032b8a94a4 Change registration property's label 2016-04-22 13:22:57 +12:00
David Rowe
7b9e6b52fb Merge branch 'master' into 20872
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-04-22 13:19:47 +12:00
David Rowe
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00
David Rowe
266e4c998b Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD 2016-04-22 12:29:22 +12:00
Stephen Birarda
bc706191df add_definitions from cmake for each release type 2016-04-21 17:28:11 -07:00
Stephen Birarda
5ea8b83745 use noquote so URLs are not quoted 2016-04-21 17:16:21 -07:00
Stephen Birarda
19702a9cd4 cleanup check for resource retry 2016-04-21 17:14:07 -07:00
Andrew Meadows
c35ddccba1 Merge pull request #7718 from zzmp/fix/release-motion-states
Remove myAvatar motion states on shutdown
2016-04-21 17:11:25 -07:00
Stephen Birarda
8cd330f431 add back on fail when server unavailable 2016-04-21 17:07:29 -07:00
Stephen Birarda
3a8c2144bf move asset retry debug to print before retry 2016-04-21 16:55:49 -07:00
Ryan Huffman
9e46b43489 Add threading related asserts to AssetClient 2016-04-21 16:39:57 -07:00
Ryan Huffman
da5bbe51d1 Fix AssetClient not properly disconnecting from callbacks 2016-04-21 16:37:21 -07:00
Brad Hefta-Gaub
72c81e2378 Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew 2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
48fcaf9e4b Merge pull request #7734 from jherico/perf_testing
Make the rendering testing destination customizable
2016-04-21 16:10:20 -07:00
Brad Hefta-Gaub
0f966e934e Merge pull request #7728 from ctrlaltdavid/20887
Add link in Running Scripts that opens scripts folder
2016-04-21 16:01:52 -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
Brad Hefta-Gaub
68b0a3fa02 Merge pull request #7724 from huffman/fix/stars-grid-macro
Remove #line from starsGrid.slf
2016-04-21 15:59:06 -07:00
Brad Hefta-Gaub
85a8c90de7 Merge pull request #7729 from huffman/fix/osx-go-home
Fix 'Go Home' not working on OSX
2016-04-21 15:58:45 -07:00
Brad Hefta-Gaub
d9ae788818 more CR feedback 2016-04-21 15:55:50 -07:00
Brad Hefta-Gaub
e8af41c6ab more CR feedback 2016-04-21 15:54:51 -07:00
Brad Hefta-Gaub
2abcc454b0 CR feedback 2016-04-21 15:48:18 -07:00
Seth Alves
e2025b0d1f lock entity-tree before accessing entities 2016-04-21 15:27:15 -07:00
Seth Alves
b088191966 Merge pull request #7731 from huffman/fix/asset-request-crash
Fix AssetRequest crash where signal was not disconnected
2016-04-21 15:22:08 -07:00
Brad Davis
33ec73bfd8 PR comments 2016-04-21 15:11:11 -07:00
Brad Davis
ef466a64bf Add GPUIdent logic for determining video memory 2016-04-21 14:46:13 -07:00
Brad Davis
6c30194916 Support lowering the minimum mip of a texture at runtime 2016-04-21 14:46:12 -07:00
Brad Davis
b85b8db337 Better visual for texture stress test 2016-04-21 14:46:11 -07:00
Brad Davis
2689f2cc4a Add MB/KB/Byte conversion macros 2016-04-21 14:46:11 -07:00
Brad Davis
e4233f87ec Increase default renderstats window size 2016-04-21 14:46:10 -07:00
Brad Davis
5007c9bd4c Update glew version 2016-04-21 14:46:09 -07:00
Brad Davis
e9959df2df Decoupling resourcecache from nodelist 2016-04-21 14:46:09 -07:00
Howard Stearns
7aca95507e comments 2016-04-21 14:46:08 -07:00
Howard Stearns
7f748153c5 Mac code for gpu memory. 2016-04-21 14:46:08 -07:00
Brad Davis
8f91768bc0 Make the testing destination customizable 2016-04-21 13:47:55 -07:00
Atlante45
0c32f47f50 Don't call virtual method from base dtor 2016-04-21 13:25:31 -07:00
Ryan Huffman
63d98b1b5c Fix AssetRequest crash where signal was not disconnected 2016-04-21 12:12:04 -07:00