Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 19:55:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35897 commits 25 branches 0 tags 1.1 GiB
Commit graph

35897 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
17b5ade9c0 allow moving distantly grabbed objects with head 2015-12-03 16:45:46 -08:00
Brad Hefta-Gaub
528b8e5d3f fix warnings 2015-12-03 16:45:01 -08:00
Howard Stearns
187c213f41 reset skeleton 2015-12-03 16:42:57 -08:00
Brad Hefta-Gaub
1df24dd174 Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemoval 2015-12-03 16:31:15 -08:00
Ken Cooke
1d01f08324 Fix compiler warnings 2015-12-03 16:27:35 -08:00
howard-stearns
1b42c5a172 Make MyAvatar.get/setAnimGraphUrl take a url(!), and make setting it 
actually do something.
 2015-12-03 16:16:01 -08:00
Seth Alves
a600df5ea6 try a different method of exagerating hand motion onto distanly held object 2015-12-03 16:04:39 -08:00
Clément Brisset
d6a2a2550b Merge pull request #6526 from imgntn/butterfly 
Update model for butterflies.js
 2015-12-03 15:25:55 -08:00
Clément Brisset
686673795f Merge pull request #6539 from imgntn/solidtoys 
Fix Solidity of some Single Toy Creators
 2015-12-03 15:17:02 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Howard Stearns
4a8649c202 Change get/setRenderDistanceLow/HighLimit and avatarRenderDistanceHighLimit to get/setRenderDistanceInverseLow/HighLimit and avatarRenderDistanceInverseHighLimit. 2015-12-03 14:23:16 -08:00
samcake
902b6b8ea1 Merge pull request #6506 from jherico/maggie 
OpenGL class cleanup
 2015-12-03 13:55:29 -08:00
Brad Davis
cc80dfb9e1 Fixing case on gl surface format helper 2015-12-03 13:08:26 -08:00
Brad Hefta-Gaub
1a5bc5d111 removing optional compression 2015-12-03 12:40:24 -08:00
Seth Alves
e5b1cfa920 fix windows build 2015-12-03 11:15:04 -08:00
James B. Pollack
fbca1c9754 another toy 2015-12-03 11:12:28 -08:00
Brad Hefta-Gaub
849a8707d2 remove wantsColor support since its always true and required for entities 2015-12-03 11:11:15 -08:00
James B. Pollack
cf5c8c08e2 update toys to be inverted while held 2015-12-03 11:10:22 -08:00
Seth Alves
4e74c98ae7 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-03 11:00:13 -08:00
Seth Alves
6f79b381f9 working toward making children of avatar joints work 2015-12-03 11:00:06 -08:00
Brad Davis
2cea593fbd Remove RealSense & MIDI 2015-12-03 11:00:01 -08:00
Brad Hefta-Gaub
0c05ffe9ce remove coverage map and occulusion culling, since it was always disabled 2015-12-03 10:20:04 -08:00
Ryan Huffman
667d2b728e Fix uninitialized xColor value when converting script value 2015-12-03 09:52:56 -08:00
Ryan Huffman
ce882a9c11 Replace QSharedPointer ctor with ::create 2015-12-03 09:43:36 -08:00
Howard Stearns
65334659ae Merge pull request #6535 from ZappoMan/rightClickMenu 
change camera cycle and context menu to hydra 0 buttons
 2015-12-03 09:24:31 -08:00
Brad Davis
3854523787 Fixing 32 bit build breakage 2015-12-03 09:17:41 -08:00
Brad Hefta-Gaub
c0bd54e8a2 change hydra secondary thumb to 0 button 2015-12-03 09:06:18 -08:00
Seth Alves
2d804555de minor cleanups 2015-12-03 08:59:15 -08:00
Ryan Downe Karpf
0e11c0980e Merge pull request #6531 from ericrius1/toyboxSounds 
Made ping pong gun have restitution of 0
 2015-12-03 08:19:08 -08:00
Brad Hefta-Gaub
b122586ea5 remove camera cycle and context menu from standard mapping 2015-12-03 08:08:04 -08:00
Brad Davis
55799403c9 64 bit support for Leap Motion on windows 2015-12-02 21:52:06 -08:00
Brad Davis
7a05a664f4 Updating GPU for 64 bit 2015-12-02 21:34:11 -08:00
ericrius1
dec4cd012e made ping pong gun have restitution of 0 2015-12-02 18:26:09 -08:00
Anthony J. Thibault
4f836568ad Tests to verify AnimPose decomposition is working. 2015-12-02 17:26:32 -08:00
David Rowe
a0dcf72a3b Use animation handlers to control hand position and orientation 2015-12-03 14:09:46 +13:00
Anthony J. Thibault
b56cf58e33 Fix for mirrored transforms in FBX models 
extractScale will now return negative scale for left-handed matrices.
 2015-12-02 16:55:04 -08:00
David Rowe
0f3722a05c Fix Leap Motion calibration avatar pose 2015-12-03 13:14:22 +13:00
Andrew Meadows
744da64c50 Merge pull request #6527 from ZappoMan/debugEntitiesSending 
Add some debugging stats to entity server
 2015-12-02 15:51:47 -08:00
Andrew Meadows
144983d345 Merge pull request #6528 from hyperlogic/tony/non-uniform-scale-model-entity-fix 
Fix for model entities with non-uniform scaled mesh
 2015-12-02 15:14:38 -08:00
Brad Hefta-Gaub
4497d21aec remove nodes that disconnect from out viewer stats 2015-12-02 14:51:48 -08:00
Brad Hefta-Gaub
1e51a90204 add edit times and entity ids to the viewer stats 2015-12-02 14:43:00 -08:00
Seth Alves
6eae98fb28 merge from upstream 2015-12-02 14:38:26 -08:00
Anthony Thibault
e0ca1c0f4c Merge pull request #6496 from PhilipRosedale/master 
Improved audio-driven mouth shapes
 2015-12-02 14:20:20 -08:00
Anthony J. Thibault
9c0b4bc2a2 Fix for model entities with non-uniform scaled mesh 
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.

This should fix the roads in Qbit as well as the blocks in toybox.
 2015-12-02 14:09:47 -08:00
Ryan Downe Karpf
1d57f4daa8 Merge pull request #6524 from ericrius1/toyboxSounds 
Removed collision sound for bow and lowered restitution on flashlight and spraycan to avoid multiple bounce sounds
 2015-12-02 13:56:36 -08:00
Brad Hefta-Gaub
08ba535c38 add some basic send tracking 2015-12-02 13:43:05 -08:00
Ryan Huffman
d9eddbe738 Remove unnecessary ptr get() in PacketList 2015-12-02 13:32:56 -08:00
James B. Pollack
a9438490fe update butterfly model 2015-12-02 12:53:19 -08:00
Howard Stearns
861393910a Add an avatar LOD preference called "Minimum Avatar Display Distance" 2015-12-02 12:12:57 -08:00
ericrius1
6d953a65dd changed restitution to 0 2015-12-02 12:09:21 -08:00