Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37358 commits 71 branches 56 tags 1.2 GiB
Commit graph

37358 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
75b3523c33 Simplify grab animation logic 
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js

Deleted old hydra/squeezeHands.js to avoid confusion.

Added new sqeezeHands.js script to the default scripts.
 2016-01-13 17:57:51 -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
samcake
1a2764a38c Merge pull request #6829 from Atlante45/render-shape-update 
Fix render engine memory leak
 2016-01-13 17:18:28 -08:00
U-GAPOS\andrew
0126684a96 collisionMask shouldn't override ignoreForCollisions 2016-01-13 16:58:34 -08:00
U-GAPOS\andrew
3aa1837e07 disable collisions between arrow and bow 
(the bow is currently kinematic while held)
 2016-01-13 16:57:51 -08:00
Philip Rosedale
ac61a33b63 Merge pull request #6825 from ericrius1/handGrabPositioningTweaks 
Adjusted relative hand grab data for gun, ping ponger, and bow to to …
 2016-01-13 16:08:09 -08:00
ericrius1
9a51a011c5 further tweaks 2016-01-13 15:51:22 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
ericrius1
5a9d533e70 ping pong and gun tweaks 2016-01-13 15:30:12 -08:00
Atlante45
ef5af45acd Replce GPUObjectWrapper by public const member 2016-01-13 15:01:54 -08:00
ericrius1
cda6d6e4ea bow tweaks 2016-01-13 14:44:42 -08:00
ericrius1
f02cc8fd46 Tweaked bow position 2016-01-13 14:43:52 -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
howard-stearns
830dcb582a Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing 2016-01-13 13:32:38 -08:00
howard-stearns
8a77e2ee95 Split physics perf timing into three parts: updateStates, stepSimulation, 
and harvestChanges.
 2016-01-13 13:31:37 -08:00
samcake
e41c49b19f Merge pull request #6818 from Atlante45/render-shape 
Move shape rendering code in DeferredLightingEffect to GeometryCache
 2016-01-13 12:27:27 -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
ericrius1
0a371e4b75 Adjusted relative hand grab data for gun, ping ponger, and bow to to optimize for owen grabbing 2016-01-13 11:06:29 -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
ericrius1
061cf5021c Don't clean up whiteboard on script shutdown 2016-01-12 19:31:43 -08:00
ericrius1
9dae425bfd Some fixes to whiteboard to get rid of gaps between lines and jagged lines 2016-01-12 19:28:41 -08:00
Seth Alves
699431a9ab testing something with chris 2016-01-12 17:27:36 -08:00
Seth Alves
1128982e65 pull grab script changes over from another branch 2016-01-12 17:16:56 -08:00
Seth Alves
6f85ee135f Merge pull request #6796 from AndrewMeadows/collision-groups 
entity collision masks can be set via script
 2016-01-12 16:18:56 -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
00e5d040a2 use collision masks to prevent grab-bootstrap 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