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

15136 commits

Author SHA1 Message Date
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
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
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
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
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
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
Philip Rosedale
d5c8689843 Merge pull request #6793 from sethalves/fix-get-query-aabox 
fix queryAABox bug
 2016-01-08 09:49:27 -08: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
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