Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 02:07:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
38535 commits 75 branches 59 tags 1.2 GiB
Commit graph

15535 commits

Author SHA1 Message Date
Seth Alves
edea0320e6 try again to make this thread safe 2016-01-19 15:44:22 -08:00
Seth Alves
a515d6debe call into correct thread to getJointNames on entity 2016-01-19 15:16:58 -08:00
Seth Alves
90847dc49c oops 2016-01-19 15:00:33 -08:00
Seth Alves
09dd3e2a56 merge from upstream, respond to code review 2016-01-19 14:38:22 -08:00
Stephen Birarda
74b2a44050 merge the master and user configs after a settings change 2016-01-19 13:08:34 -08:00
Stephen Birarda
4cbbd24c7e complete handling of immediate temp name grab 2016-01-19 13:04:05 -08:00
Seth Alves
f265656e74 expose getJointNames for entities to js 2016-01-19 12:55:17 -08:00
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Zach Pomerantz
387a14b6b1 Fix shadowMap vertical keylight edge case 2016-01-19 12:01:40 -08:00
Zach Pomerantz
398f83be3f Change shadow debug buffer to reuse shadowMap tex 2016-01-19 12:01:18 -08:00
Andrew Meadows
db77f22a61 use "collidesWith" instead of "collisionMask" 
but make "collisionMask" work for those who want it
 2016-01-19 11:41:22 -08:00
Seth Alves
a2bec2a5bf Merge pull request #6857 from ctrlaltdavid/20779 
Fix crash in Running Scripts when edit filter after highlighting script
 2016-01-19 11:40:47 -08:00
Stephen Birarda
858adf383e update comment for config migration 2016-01-19 11:38:31 -08:00
Stephen Birarda
483e0f419b use mkpath to create new data directory 2016-01-19 11:37:49 -08:00
Seth Alves
8ba800fda8 Merge pull request #6851 from AndrewMeadows/collisionless2 
namechange "ignoreForCollisions" to "collisionless"
 2016-01-19 11:33:55 -08:00
Stephen Birarda
74806d9d2b migrate old DS config file to new path 2016-01-19 11:28:29 -08:00
Zach Pomerantz
568ae2e7bc Move ShoudRenderFunctor to render::CullFunctor 2016-01-19 11:24:11 -08:00
Ryan Huffman
de36f3eeb2 Update ServerPathUtils::getDataDirectory to use custom path lookup 2016-01-19 10:54:38 -08:00
Brad Hefta-Gaub
e15c7f089e Merge pull request #6850 from sethalves/various-fixes 
Various fixes
 2016-01-19 10:15:46 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Zach Pomerantz
7a5562abce Do not cauterize bones in SHADOW_RENDER_MODE 2016-01-18 20:51:28 -08:00
Zach Pomerantz
3c80002dfe Fix keylight frustum culling by calc internal state before use 2016-01-18 20:10:52 -08:00
Zach Pomerantz
ff425f40ae Fix shadow leaking scene items 2016-01-18 18:43:01 -08:00
Zach Pomerantz
1b36d56b7a Add shadowmap as a debug feature 2016-01-18 17:12:42 -08:00
Seth Alves
e365d93ed9 don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file 2016-01-18 16:50:26 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
samcake
29945bba92 Merge pull request #6837 from zzmp/feat/render-shadow 
Add RenderShadowTask
 2016-01-18 15:45:51 -08:00
Seth Alves
135f25bde7 changes so that avatar-mixer wont attempt to resolve a parentID 2016-01-18 15:35:54 -08:00
Howard Stearns
6f84a67453 Merge pull request #6840 from jherico/qml_cleanup 
File dialogs and modal message boxes in QML
 2016-01-18 15:04:37 -08:00
Howard Stearns
5caf10beed Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck 
Include checking the angular size of entities on the server side for LOD support
 2016-01-18 14:13:34 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
Seth Alves
823428290d Merge branch 'master' of github.com:highfidelity/hifi into various-fixes 2016-01-18 13:26:45 -08:00
Brad Hefta-Gaub
b8747709ef CR feedback, dead code cleanup 2016-01-18 12:11:23 -08:00
Brad Hefta-Gaub
d10e1cc39d CR feedback, dead code cleanup 2016-01-18 12:09:21 -08:00
Seth Alves
94bafb4a1e Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove 
namechange collisionsWillMove --> dynamic
 2016-01-18 11:51:59 -08:00
Seth Alves
3b3720781f fix a place where parent's scale wasn't properly squashed 2016-01-18 11:15:53 -08:00
Seth Alves
d6e3b85237 fix javascript access via localPosition and localRotation 2016-01-18 11:15:32 -08:00
Seth Alves
4232e400cc add getJointIndex call 2016-01-18 11:15:03 -08:00
Zach Pomerantz
6434d98365 Separate directional shaders with(out) shadowmaps 2016-01-18 11:11:28 -08:00
Brad Hefta-Gaub
88af387214 cleanup 2016-01-18 10:10:24 -08:00
samcake
bc579f2605 Clening up the gpu::Timer behavior, now need a way to show it 2016-01-18 09:53:41 -08:00
Brad Hefta-Gaub
2774df38bc check for entity size before including it for LOD 2016-01-18 09:06:57 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
samcake
86e9c5ac9b Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-16 22:17:08 -08:00
samcake
39f1649cdf refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing 2016-01-16 22:16:07 -08:00
Brad Davis
cf8d2c5182 Integrate file open dialog into running scripts dialog 2016-01-15 23:53:37 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
samcake
483c28dc2d Adding gpu timer feature to actually the GPU cost of rendering 2016-01-15 19:00:18 -08:00
David Rowe
51cb9dd05e Fix crash in Running Scripts when edit filter after highlighting script 2016-01-16 15:50:33 +13:00
Zach Pomerantz
7f3e102b5e Rename renderLights to renderItems 2016-01-15 17:55:07 -08:00
Zach Pomerantz
7fd20bb036 Set shadow pipelines manually to avoid duplication 2016-01-15 17:55:07 -08:00
Zach Pomerantz
331d32ef78 Add render Jobs for Shape sorting 2016-01-15 17:55:07 -08:00
Zach Pomerantz
4bbf206f64 Clean up DrawTask 2016-01-15 17:55:07 -08:00
Zach Pomerantz
625eee2b9c Clean RenderShadowTask ctor 2016-01-15 17:55:07 -08:00
Zach Pomerantz
f3a5be9ec0 Decrease shadowMap res to 1024 2016-01-15 17:55:07 -08:00
Zach Pomerantz
562c909ad8 Update shadow shaders 2016-01-15 17:55:07 -08:00
Zach Pomerantz
b2c9cf7452 Fit shadowmap to viewFrustum better 2016-01-15 17:55:07 -08:00
Zach Pomerantz
2b27e48bf9 Update shadow shaders 2016-01-15 17:55:07 -08:00
Zach Pomerantz
bc379e920b Update shadow programs 2016-01-15 17:55:07 -08:00
Zach Pomerantz
fad38c0bfb Add uniform buffer to LightStage 2016-01-15 17:55:07 -08:00
Brad Hefta-Gaub
29b9592c8c Merge pull request #6838 from ctrlaltdavid/20763 
Fix reading model's "textures" property
 2016-01-15 17:02:14 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Stephen Birarda
275fa1c5c7 fix for override warnings with clang on OS X 2016-01-15 15:41:34 -08:00
Andrew Meadows
952f5b23f6 namechange collisionsWillMove --> dynamic 2016-01-15 15:21:25 -08:00
Andrew Meadows
8b420adbc8 namechange MotionType to PhysicsMotionType 2016-01-15 15:21:25 -08:00
Brad Davis
bb02a1eda2 Fix JS web window crash caused by race condition 2016-01-15 14:45:40 -08:00
samcake
fef5e3c8da Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 14:44:57 -08:00
Zach Pomerantz
5c1c1e3a3b Change LightStage setFrustum signature to near/farDepth 2016-01-15 12:57:31 -08:00
Zach Pomerantz
d6e5e2de81 Fix orientation of shadow frustum 2016-01-15 12:43:45 -08:00
samcake
2494623bc7 Cleaning the code for review 2016-01-15 10:55:43 -08:00
Zach Pomerantz
986af50b71 Remove unneccessary const 2016-01-15 10:50:42 -08:00
Ryan Huffman
0f2b9744d1 Merge branch 'console' of github.com:birarda/hifi into console-logging 2016-01-15 10:46:22 -08:00
Zach Pomerantz
b423bc38ba Remove magic numbers 2016-01-15 10:46:01 -08:00
Ryan Huffman
a5eb54b1b7 Move DomainServer script location to app data directory 2016-01-15 10:36:09 -08:00
Zach Pomerantz
e914f02445 Use near/far in LightStage setFrustum 2016-01-15 10:28:52 -08:00
Zach Pomerantz
710fb5df53 Fix shadowed orientation in LightStage 2016-01-15 10:18:29 -08:00
Seth Alves
fcd2284dc8 Merge pull request #6843 from AndrewMeadows/sadness 
fix bug causing grab to disappear objects
 2016-01-15 09:27:02 -08:00
samcake
3f4f10c38c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 09:21:13 -08:00
Andrew Meadows
b9352d3eaa prevent nan inside spring action 2016-01-15 08:44:52 -08:00
samcake
ae18bb8ef7 FIxed the stereo rendering 2016-01-14 19:23:29 -08:00
Zach Pomerantz
e2158e48a1 Declare Corners explicitly 2016-01-14 18:03:58 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window 
Tool window in QML
 2016-01-14 16:56:27 -08:00
samcake
577666da6e Merging upstream master 2016-01-14 15:10:54 -08:00
Zach Pomerantz
ec496f1907 Return copy of Light from LightStage 2016-01-14 14:06:32 -08:00
Zach Pomerantz
c704a8d8c5 Add RenderShadowTask 2016-01-14 13:53:11 -08:00
Zach Pomerantz
7744b89ba5 Prepare shadowMap pipeline to debug in color 2016-01-14 12:56:28 -08:00
Ryan Huffman
a43b9ba2c3 Add ServerPathUtils 2016-01-14 12:55:32 -08:00
Zach Pomerantz
b9b407fea0 Remove static shadowMap 2016-01-14 12:49:43 -08:00
Zach Pomerantz
0776ae7e72 Add LightStage for rendering lights 2016-01-14 12:49:42 -08:00
Zach Pomerantz
82f7ea515d Clean up task construction 2016-01-14 12:49:42 -08:00
Andrew Meadows
72928fdbd6 fix problem where grab stops on slow movement 2016-01-14 10:42:27 -08:00
Ryan Huffman
196161fe93 Merge pull request #66 from birarda/console-dev 
some initial packaging work and console fixes
 2016-01-14 10:17:24 -08:00
Howard Stearns
5c1eef6a65 Merge pull request #6830 from AndrewMeadows/fix-arrows 
Fix for arrows that stop moving too early
 2016-01-14 09:36:26 -08:00
Zach Pomerantz
ed5c53f23c Add getCorners to ViewFrustum 2016-01-14 01:29:49 -08:00
Brad Hefta-Gaub
8f8afabbfe Merge pull request #6811 from Atlante45/master 
Fix skybox not always rendering correctly
 2016-01-13 21:00:48 -08:00
Brad Hefta-Gaub
ec344f7f86 Merge pull request #6822 from jherico/local_script_stop 
Fix inability to stop local scripts
 2016-01-13 20:26:36 -08:00
David Rowe
a59cbd1aca Merge branch 'master' into 20763 2016-01-14 17:25:44 +13:00
samcake
0285d48de3 Exposing many more controls of the AO in order to adjust the effect 2016-01-13 18:57:47 -08:00
Zach Pomerantz
1436b4f6b1 Guard against unspecified deferredDebugMode 2016-01-13 18:17:40 -08:00
Zach Pomerantz
5c9c34377e Move GL context sync to render Engine (from Task) 2016-01-13 17:53:15 -08:00
Zach Pomerantz
70cc7d87e4 Expose global light through DeferredLighting singleton 2016-01-13 17:52:02 -08:00
Zach Pomerantz
e471dcc90e Fix GLBackend::do_setDepthRangeTransform by swapping hither/yon 2016-01-13 17:50:34 -08:00
Zach Pomerantz
2938829167 Add shadow items to stats 2016-01-13 17:49:37 -08:00
Zach Pomerantz
ee69d8f817 Fix bitsetters for ShapeKey::Builder 2016-01-13 17:44:01 -08:00
U-GAPOS\andrew
0126684a96 collisionMask shouldn't override ignoreForCollisions 2016-01-13 16:58:34 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Atlante45
ef5af45acd Replce GPUObjectWrapper by public const member 2016-01-13 15:01:54 -08:00
Atlante45
504939f193 Use a unique_ptr to track gpu objects 2016-01-13 14:07:48 -08:00
Atlante45
8da027c56f Encapsulate GPUObject in a safer way 2016-01-13 13:51:53 -08:00
Atlante45
741c22c0ac Move SimpleProgramKey to cpp 2016-01-13 11:47:43 -08:00
Atlante45
1789878be1 Remove dead code 2016-01-13 11:47:43 -08:00
Atlante45
c30569cd55 Naming coding standard 2016-01-13 11:47:43 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
Brad Davis
e8adcd9f1f Fix inability to stop local scripts 2016-01-12 21:11:47 -08:00
David Rowe
061657b703 Merge branch 'master' into 20763 2016-01-13 17:54:45 +13:00
Atlante45
e8d7411eea Indentation/Coding Standard 2016-01-12 20:49:38 -08:00
Atlante45
47586e97a6 Stay closer to the old code (Use early exit) 2016-01-12 20:49:25 -08:00
Atlante45
911375b7a1 Don't change apply zone logic 2016-01-12 20:49:25 -08:00
Atlante45
5e41421f9d Fix for skybox not always loading 2016-01-12 20:49:25 -08:00
Atlante45
0008b1a055 Code cleanup 2016-01-12 20:49:25 -08:00
Atlante45
3f90312375 Fix for XCode auto indent 2016-01-12 20:49:25 -08:00
samcake
89d2d102f6 exposing the ditheringEnable field 2016-01-12 18:51:30 -08:00
samcake
0d8e247626 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 16:56:51 -08:00
samcake
6779874da8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 16:06:34 -08:00
Andrew Meadows
6a5a74700f activate sprung objects when action strong enough 2016-01-12 15:11:27 -08:00
Andrew Meadows
2288d96868 fix CharacterController ray cast for floor 2016-01-12 15:11:27 -08:00
Andrew Meadows
c52c543ab8 use strings for JS collisionGroup API 2016-01-12 15:11:27 -08:00
Andrew Meadows
222398e5cc no packet version check for collision mask 2016-01-12 15:10:18 -08:00
Andrew Meadows
6c49d81475 collision mask bit reinterpretation 
also cache sessionID in static methods inside PhysicsEngine
 2016-01-12 15:08:52 -08:00
Andrew Meadows
502921e877 more consistency for collision group values 2016-01-12 15:08:52 -08:00
Andrew Meadows
c9b125612c fix bugs 2016-01-12 15:08:52 -08:00
Andrew Meadows
e1ba4ff0a8 add CollisionMask entity property 2016-01-12 15:08:52 -08:00
Brad Hefta-Gaub
cd167e43fb Merge pull request #6812 from jherico/running_scripts 
Running scripts in QML
 2016-01-12 13:40:47 -08:00
Brad Davis
f352332924 Fix logging warning 2016-01-12 13:09:16 -08:00
Brad Hefta-Gaub
90f4ca7b71 Merge pull request #6817 from jherico/script_crash 
Fix crash on shutdown due to lifetime of scripts
 2016-01-12 13:05:35 -08:00
Howard Stearns
d1a72e8d63 Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation 
Move hand animation control into grab script
 2016-01-12 13:02:59 -08:00
Brad Davis
21534cbde0 Layout for running scripts 2016-01-12 12:40:42 -08:00
Brad Davis
55af5eaf06 Fix crash on shutdown due to lifetime of scripts 2016-01-12 12:40:02 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
Zach Pomerantz
016a14d3d5 Init the shapePlumber 2016-01-11 20:19:54 -08:00
Zach Pomerantz
c9e1d8f5f4 Set up pipelinelib correctly (use filters insig bits) 2016-01-11 20:17:52 -08:00
samcake
f5854641f9 Trying to improve the ao 2016-01-11 18:33:39 -08:00
Zach Pomerantz
db91b12203 Refine addPipeline signature to be more explicit 2016-01-11 17:31:19 -08:00
Zach Pomerantz
801dde7950 Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-11 16:38:04 -08:00
Zach Pomerantz
4ff2b85e1a Replace ShapePipelineLib abstract with ShapePlumber instanced class 2016-01-11 16:00:08 -08:00
samcake
38e9d2281d Merging with master 2016-01-11 15:49:16 -08:00
Brad Hefta-Gaub
511ad76092 Merge pull request #6800 from jherico/running_scripts 
Moving running scripts functionality to scripting library
 2016-01-11 15:01:55 -08:00
Chris Collins
9c5cdfaa61 Merge pull request #6809 from hyperlogic/tony/transform-post-mult-fix 
Bug fix for Transform.postScale() with non-uniform scale.
 2016-01-11 14:38:16 -08:00
samcake
e593bb4245 Merge pull request #6788 from zzmp/refactor/render-job-task2 
Promote render::Job to render::Task, render::Job::Varying to render::Varying
 2016-01-11 13:52:36 -08:00
Brad Davis
d1d178787c PR comments 2016-01-11 12:55:23 -08:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00
Anthony J. Thibault
e4e4cb0110 Bug fix for Transform.postMult() with non-uniform scale. 
Previously it would not flag the matrix as non-uniform, this would
cause some operations (such as inverse) to be incorrect.
 2016-01-11 12:03:44 -08:00
Brad Hefta-Gaub
c0cf717a04 CR feedback 2016-01-11 11:13:33 -08:00
Brad Hefta-Gaub
dfba05ae5f CR feedback 2016-01-11 11:07:07 -08:00
Anthony J. Thibault
8f78a0624c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-11 10:16:51 -08:00
samcake
1517d792ae Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-10 09:39:37 -08:00
Zach Pomerantz
407c1bc626 Handle out-of-range in render::FetchItems 2016-01-08 20:16:08 -08:00
Zach Pomerantz
293e432fe9 Fix setter named getFocalLength 2016-01-08 20:14:44 -08:00
Zach Pomerantz
c1e8fe88e4 Fix shader typo (ambien->ambient) 2016-01-08 20:14:31 -08:00
Zach Pomerantz
ea8bdd5728 Change pipeline initialization to depend on class, not global pipelineLib state 2016-01-08 20:14:08 -08:00
Zach Pomerantz
bf68f2f2fa Templatize item culling 2016-01-08 20:11:52 -08:00
Zach Pomerantz
c8d3342aca Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-08 17:04:02 -08:00
Brad Hefta-Gaub
e2a3903def add support for advanced/developer plugins and change diplay modes to match spec 2016-01-08 16:58:25 -08:00
Zach Pomerantz
56aba41299 Rename ShapeRender to DeferredPipelineLib 2016-01-08 14:02:49 -08:00
Brad Hefta-Gaub
86691d5d0e remove vsync and framerate menus from 2d display plugin 2016-01-08 13:12:43 -08:00
Ryan Huffman
4851def51c Add status HTTP server to AC Monitor 2016-01-08 10:35:04 -08:00
Philip Rosedale
d5c8689843 Merge pull request #6793 from sethalves/fix-get-query-aabox 
fix queryAABox bug
 2016-01-08 09:49:27 -08:00
samcake
97071288ed Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-08 09:23:55 -04:00
Anthony J. Thibault
cac19b8579 grab animation work 
Hand animations now have 5 states:

* idle
* open
* grasp
* point
* farGrasp

The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.

Also, removed hand trigger AnimVar setting from C++ Rig class.
 2016-01-07 19:36:57 -08:00
Zach Pomerantz
d8a3ae70a7 Conform to coding standard 2016-01-07 17:02:15 -08:00
Anthony J. Thibault
c2736cb68c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-07 16:58:10 -08:00
Seth Alves
31bed934fe fix bug caused by accidental reuse of variable -- queryAABox was often of size 1 rather than the correct dimensions 2016-01-07 16:27:14 -08:00
Anthony J. Thibault
7bef1ebdac Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script 2016-01-07 16:14:52 -08:00
David Rowe
6eed6a0bc3 Merge branch 'master' into 20763 2016-01-08 13:13:39 +13:00
Anthony J. Thibault
031f59b7b5 Support for adding soft attachments from script. 
Also, bug fixes for setting MyAvatar.attachmentData property.
 2016-01-07 16:12:36 -08:00
Zach Pomerantz
695c69fd34 Conform to coding standards 2016-01-07 14:26:59 -08:00
Zach Pomerantz
c19b457401 Forward arguments and mark T::JobModel as dependent name 2016-01-07 14:15:01 -08:00
Zach Pomerantz
e809c4f89d Avoid copying Item before rendering 2016-01-07 13:42:56 -08:00
Philip Rosedale
c5ab29071e Merge pull request #6791 from jherico/qml_hang 
Stop QML hanging the app on shutdown
 2016-01-07 13:29:47 -08:00
Zach Pomerantz
1b3e144395 Rename Shape to ShapePipelineLib, Shape.h to ShapePipeline.h 2016-01-07 13:29:35 -08:00
David Rowe
fc2bf8f585 Miscellaneous code tidying, noticed in passing 2016-01-08 10:17:36 +13:00
Brad Davis
660304a0a3 Stop QML hanging the app on shutdown 2016-01-07 12:25:25 -08:00
Zach Pomerantz
7f0781f6e8 Move model update next to bindTransform 2016-01-07 11:49:02 -08:00
Zach Pomerantz
39269f12ec Clean and fix Wreorder 2016-01-07 11:40:01 -08:00
Zach Pomerantz
0f6d9a4db6 Use variadic for addJob for cleaner construction 2016-01-07 11:40:00 -08:00
Seth Alves
bc538a0f7d Merge pull request #6756 from AndrewMeadows/physics-cleanup-003 
more correct management of MotionState pointers
 2016-01-07 11:04:28 -08:00
Andrew Meadows
8ae1e750ab Merge pull request #6783 from sethalves/fix-h0ld-action 
try harder to ensure that a held object is active in bullet
 2016-01-07 10:53:55 -08:00
Andrew Meadows
0df920d9a3 Merge pull request #6718 from birarda/master 
cleanup QTimer management in ThreadedAssignment
 2016-01-07 10:53:35 -08:00
Seth Alves
cf9af462b5 replace some logging with an assert 2016-01-07 10:21:39 -08:00
Andrew Meadows
42711e5bad remove unused variable 2016-01-07 10:20:03 -08:00
Andrew Meadows
36e19b43c9 add some comments; specify const and overrides 2016-01-07 10:19:46 -08:00
Andrew Meadows
4f29156da1 fixing asserts for EntityItem delete pipeline 2016-01-07 10:19:46 -08:00
Andrew Meadows
6a642bdcf8 fix misusage of smart-pointers 2016-01-07 10:19:46 -08:00
Andrew Meadows
e8e965d548 fix crash mode for empty LineEntityItem 2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b overhaul of MotionState cleanup 
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
 2016-01-07 10:19:46 -08:00
Andrew Meadows
8886f48c78 minor cleanup 2016-01-07 10:19:46 -08:00
Andrew Meadows
f5d24a87ca remove entities from physics before we delete them 2016-01-07 10:19:46 -08:00
Andrew Meadows
b34df211df cleanup API for removal from EntitySimulation 2016-01-07 10:19:46 -08:00
Andrew Meadows
4208380d1c namechange 2016-01-07 10:19:46 -08:00
Brad Hefta-Gaub
553e455a53 Merge pull request #6759 from huffman/script-engine-slot-exception 
Add logging of signal slot exceptions in ScriptEngine
 2016-01-07 08:54:34 -08:00
David Rowe
25309e84b3 Fix interpreting textures properties 2016-01-07 17:30:28 +13:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order 
Address some z-ordering issues in overlay windows
 2016-01-06 20:08:52 -08:00
David Rowe
a6bfecf038 Format original textures property string more properly 2016-01-07 16:52:29 +13:00
David Rowe
f64481c510 Warn user if cannot evaluate model's textures property 2016-01-07 16:47:48 +13:00
Zach Pomerantz
f902c4078d Clean old DrawSceneTask 2016-01-06 18:55:14 -08:00
Zach Pomerantz
9b4a395f6b Promote render::Job to render::Task::Job 2016-01-06 18:55:13 -08:00
Anthony J. Thibault
1251be1b2b Merge branch 'master' into tony/grab-script-hand-animation 2016-01-06 16:26:56 -08:00
Brad Hefta-Gaub
8b9c2cde63 fix warnings 2016-01-06 15:29:05 -08:00
Brad Hefta-Gaub
f0338690c8 whitespace change 2016-01-06 14:54:50 -08:00
Seth Alves
b873d92469 try harder to ensure that a held object is active in bullet 2016-01-06 14:12:58 -08:00
Brad Hefta-Gaub
edc132efce fix warning 2016-01-06 12:53:57 -08:00
Zach Pomerantz
bcb01feb94 Merge branch 'render-shape' of http://github.com/Atlante45/hifi into feat/render-shape 2016-01-06 11:46:16 -08:00
Atlante45
b68572fdd0 Cleanup renderShapes render loop 2016-01-06 11:43:17 -08:00
Zach Pomerantz
9bc661adc8 Cleanup for style/dead code 2016-01-06 11:42:58 -08:00
Brad Hefta-Gaub
0b43685f1e Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner 2016-01-06 11:26:05 -08:00
Seth Alves
096ab44311 fix network version number 2016-01-06 11:01:31 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Brad Hefta-Gaub
f3aeaec6a9 Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner 2016-01-06 10:58:50 -08:00
samcake
7e2cf741c0 Clen up, exposingthe level of obscurance 2016-01-06 13:16:16 -04:00
samcake
12ad08560f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-06 09:50:58 -04:00
Anthony J. Thibault
3e6ff0eb68 Moved hand animation control into grab script. 2016-01-05 19:56:56 -08:00
Zach Pomerantz
d8ff133cc6 Fix include in gpu-test 2016-01-05 18:11:24 -08:00
Zach Pomerantz
da50eacaad Resolve Hash const function and include per Jenkins 2016-01-05 18:08:28 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
Brad Davis
e4913a56ab Merge pull request #6775 from sethalves/fix-polyvox-rendering 
update polyvox shader to track changes in packDeferredFragment
 2016-01-05 20:24:33 -05:00
Brad Davis
4a9c558809 Merge pull request #6776 from Atlante45/fix/lambda-crash 
Cleanup web entity connections
 2016-01-05 20:23:51 -05:00
Zach Pomerantz
948dc26d24 Add debug statement for invalid ShapeKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
4eff377258 Change Slots->Slot to be congruous with gpu 2016-01-05 17:20:08 -08:00
Zach Pomerantz
258a414404 Add ShapeKey::NO_PIPELINE for shapes without Shape::Pipeline 2016-01-05 17:20:08 -08:00
Zach Pomerantz
df54d1dcc9 Fix render::Shape::Pipeline ownership by storing shared_ptr in map 2016-01-05 17:20:08 -08:00
Zach Pomerantz
ad329a9331 Return nullptr if no pipeline is found 2016-01-05 17:20:08 -08:00
Zach Pomerantz
63444aac72 Back to shapeContext, compiling 2016-01-05 17:20:08 -08:00
Zach Pomerantz
cf35974f02 Move shapeContext to jobContext 2016-01-05 17:20:08 -08:00
Zach Pomerantz
dfcb74c3be Split renderItems to Lights/Shapes 2016-01-05 17:20:08 -08:00
Zach Pomerantz
7913ca7f3b Render using ShapeRender, pickPipeline in renderItems 2016-01-05 17:20:08 -08:00
Zach Pomerantz
c725fd1520 Add specialized ShapeRender for deferred 2016-01-05 17:20:08 -08:00
Zach Pomerantz
c0800abdc5 Add virtual ~Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
e96b1fa881 Return copies of local vars in Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
74c4930034 Remove DrawBackround task 2016-01-05 17:20:08 -08:00
Zach Pomerantz
1a3a9be605 Use PipelinePointer for rendering Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
59a354ea8c Change payload interface to return ShapeKey, not MaterialKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
16bb861046 Add render::Shape to abstract ModelRender 2016-01-05 17:20:08 -08:00
Seth Alves
722fe46a27 Merge pull request #6777 from AndrewMeadows/whitespace 
nothing but whitespace
 2016-01-05 17:14:19 -08:00
Brad Hefta-Gaub
2435e160a8 only emit collision events if you're the owner 2016-01-05 16:56:24 -08:00
Clément Brisset
a2135dfdd2 Merge pull request #6720 from ctrlaltdavid/20760 
Fix particle radius and rgba start, middle, finish interpolation
 2016-01-05 16:48:13 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
David Rowe
4d7ed6b68f Whitespace 2016-01-06 13:20:44 +13:00
Atlante45
981c6c7af5 Cleanup web entity connections 2016-01-05 16:08:25 -08:00
Seth Alves
1e69f695b4 update polyvox shader to track changes in packDeferredFragment 2016-01-05 16:06:59 -08:00
Seth Alves
b59934573a Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 13:50:12 -08:00
Seth Alves
f7041136ff put new property in right place 2016-01-05 13:26:16 -08:00
Brad Hefta-Gaub
c2f2f950fb Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe 
Make Avatar palm position/rotation accessors thread safe
 2016-01-05 13:07:47 -08:00
Brad Davis
908c1072ce Merge pull request #6763 from ZappoMan/scriptMessageBoxesOffscreen 
move alert and confirm to use offscreen ui
 2016-01-05 15:26:48 -05:00
Seth Alves
b222c12857 unmangle merge 2016-01-05 12:21:50 -08:00
Seth Alves
cd82383d33 Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability 2016-01-05 11:13:38 -08:00
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -08:00
Anthony J. Thibault
a21b604746 Simplified implementation of ThreadSafeValueCache 2016-01-05 11:08:08 -08:00
Seth Alves
212d2d9e8f merge from upstream 2016-01-05 10:27:45 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Anthony J. Thibault
9ea6079c64 Merge branch 'master' into tony/get-palm-thread-safe 2016-01-05 10:16:52 -08:00
Stephen Birarda
ddb8b67267 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-01-05 09:56:05 -08:00
Brad Hefta-Gaub
d98c2d1413 migrate callers of QMessageBox::question() to OffscreenUi::question() 2016-01-05 09:39:39 -08:00
Seth Alves
96f506a98d code review 2016-01-05 07:27:27 -08:00
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Seth Alves
afc1757adf Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 19:17:45 -08:00
samcake
c31b943b88 APplying the AO to both direct lighting and ambient 2016-01-04 23:02:30 -04:00
David Rowe
16d4234d55 Get rid of a couple of multiplies 2016-01-05 15:23:25 +13:00
Seth Alves
3db68e3151 add model joints to debugging 2016-01-04 18:16:20 -08:00
Seth Alves
2d246a840f better packing for qvector of bools 2016-01-04 18:14:29 -08:00
David Rowe
a265ffb631 Get rid of a couple of if statements and duplicate calls 
Courtesy of Clement
 2016-01-05 15:13:22 +13:00
Seth Alves
0b9f92e50f fix quat (un)packing 2016-01-04 18:01:48 -08:00
Seth Alves
69839b4b16 better packing of qvector of quats 2016-01-04 17:50:25 -08:00
samcake
f92235b032 maybe fixes the compilation bug on windows/nvidia ? 2016-01-04 21:20:42 -04:00
Seth Alves
3026415f03 add some missing property handling boilerplate 2016-01-04 16:17:00 -08:00
Seth Alves
202a6ae294 debugging 2016-01-04 15:56:08 -08:00
Seth Alves
ccf29e3772 debugging 2016-01-04 15:52:58 -08:00
Stephen Birarda
1646ac55ef include application version in networking 2016-01-04 15:32:07 -08:00
Seth Alves
9304477233 split out calls for rotation and translation 2016-01-04 15:29:06 -08:00
Seth Alves
5beba58e5f debugging 2016-01-04 15:05:08 -08:00
Seth Alves
bd35532c5d debugging 2016-01-04 15:02:45 -08:00
Seth Alves
ef8673610f debugging 2016-01-04 14:58:13 -08:00
samcake
78ff43bed2 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-04 18:57:13 -04:00
Seth Alves
cd92a9fa1a adjust timestamps 2016-01-04 14:51:43 -08:00
Seth Alves
9a708f2e74 try splitting edit into 2 packets 2016-01-04 14:48:49 -08:00
Andrew Meadows
164c649a33 Merge pull request #6681 from howard-stearns/pid-render-limits 
Pid render limits
 2016-01-04 14:47:31 -08:00
Seth Alves
6c8eb90ee0 debugging 2016-01-04 14:42:37 -08:00
Andrew Meadows
d2b757d6ad Merge pull request #6755 from zzmp/fix/optimize-gpu-stream-copy 
Optimize getVertexStream() by using a const&
 2016-01-04 14:31:21 -08:00
Seth Alves
7f2e0cd103 expose a way to set translation and rotation of all model joints at once 2016-01-04 14:13:08 -08:00
David Rowe
f04222b5ac Merge branch 'master' into 20760 2016-01-05 10:29:04 +13:00
Seth Alves
2147b0d78e fix locking 2016-01-04 12:31:58 -08:00
Seth Alves
c9ed36f9a6 include joint data in script properties 2016-01-04 12:31:45 -08:00
Seth Alves
ef7438958b better debugging prints for model joints 2016-01-04 12:30:55 -08:00
Seth Alves
768934ae11 update entity timestamps when sending joint information 2016-01-04 11:29:15 -08:00
Seth Alves
9e49fcf0a4 include model-joints in debugging output 2016-01-04 11:29:01 -08:00
samcake
2486d94b03 A working prototype of ao... 2016-01-04 14:36:46 -04:00
Ryan Huffman
810da77abe Update ScriptEngine signal exception handling to call hadUncaughtExceptions 2016-01-04 10:34:55 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00