Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 02:04:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35994 commits 25 branches 0 tags 1.1 GiB
Commit graph

4569 commits

Author SHA1 Message Date
Brad Hefta-Gaub
92d1038871 Merge pull request #6590 from imgntn/particle_explorer_updates 
Update Particle Explorer to Ignore New Parenting Properties
 2015-12-10 07:43:40 -08:00
Brad Hefta-Gaub
27d28900a4 Merge pull request #6580 from imgntn/parented_flashlight 
Update Flashlight to use Parenting
 2015-12-10 07:43:10 -08:00
Brad Hefta-Gaub
1512703182 Merge pull request #6593 from Atlante45/master 
Update toys relativeRotation/Position
 2015-12-10 07:37:08 -08:00
Brad Hefta-Gaub
bd1ab418a4 Merge pull request #6606 from hyperlogic/tony/remove-animation-start-automatically-property 
[PROTOCOL CHANGE] Entities: Removed Start Automatically property from Animation Group
 2015-12-10 07:35:55 -08:00
Anthony J. Thibault
e9f529bf12 Entities: Removed Start Automatically property from Animation Group 
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
 2015-12-09 17:59:56 -08:00
Atlante45
17daff920c Fix all entities using relative grab pos/rot 2015-12-09 14:25:18 -08:00
Atlante45
4ee5bf316a Fix bow offsets 2015-12-09 14:25:18 -08:00
Atlante45
65bc6aa371 Fix left hand grab 2015-12-09 14:25:18 -08:00
Philip Rosedale
bda4e41958 Merge pull request #6581 from kencooke/audio-reverb 
New reverb parameters
 2015-12-08 14:59:58 -08:00
James B. Pollack
22a1ee83e6 ignore parenting properties 2015-12-08 10:39:04 -08:00
Seth Alves
71a5dfc4d6 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 17:04:02 -08:00
Leonardo Murillo
5d789095b5 Merge pull request #6570 from ctrlaltdavid/20740 
Update Leap Motion script to use animation state handlers
 2015-12-07 16:37:42 -08:00
Seth Alves
982e986f1a Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 14:31:18 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
Leonardo Murillo
25494ec867 Merge pull request #6562 from Atlante45/baseball 
Baseball
 2015-12-07 14:11:21 -08:00
Atlante45
84bc947854 Typo 2015-12-07 14:00:06 -08:00
Ken Cooke
90ef92c79b Fix slider layout 2015-12-07 13:34:55 -08:00
Ken Cooke
4803b3bd9f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb 2015-12-07 13:08:21 -08:00
Ken Cooke
8683bb5002 New reverb parameters 2015-12-07 13:05:30 -08:00
James B. Pollack
27ce0a36d3 cleanup logging 2015-12-07 12:20:06 -08:00
James B. Pollack
e9f21b4dba make lights parented to flashlight instead of updated in loop 2015-12-07 11:30:10 -08:00
Ryan Huffman
9d47ac000e Merge pull request #6479 from thoys/editjs-left-click 
No more right-click-move editing in edit.js
 2015-12-07 08:29:01 -08:00
Thijs Wenker
22bdc1ae84 Make it possible to use the focus-right-click-drag-camera in the edit.js script again. Still keep right-clicking ignore Toolbar and entity selection events. 2015-12-07 13:49:49 +01:00
Seth Alves
f0fb9966ad expose parent-joint-index to edit.js 2015-12-06 12:34:41 -08:00
James B. Pollack
378b71d701 dont spin by default 2015-12-05 17:51:55 -08:00
James B. Pollack
7859241ad3 spin the earth for fun 2015-12-05 17:43:13 -08:00
James B. Pollack
906540272e disable collisions for now because of shapetype 2015-12-05 17:39:43 -08:00
James B. Pollack
30b32765b9 make earth grabbable to show parenting 2015-12-05 17:32:02 -08:00
James B. Pollack
ade32cbf61 remove collisions and add parenting 2015-12-05 17:30:38 -08:00
James B. Pollack
a899fe0e1b fix typo 2015-12-05 17:26:11 -08:00
James B. Pollack
945b5bd00f cleanup 2015-12-05 17:11:27 -08:00
James B. Pollack
d518def974 poll by default 2015-12-05 17:01:54 -08:00
James B. Pollack
7fc3d0f34e header 2015-12-05 16:58:50 -08:00
James B. Pollack
4a5b9bd523 start position 2015-12-05 16:57:09 -08:00
James B. Pollack
4999b34327 cleanup interval 2015-12-05 16:54:55 -08:00
James B. Pollack
f33f4cbcae cleanup 2015-12-05 16:22:17 -08:00
James B. Pollack
1f2d726211 awesome stuff 2015-12-05 16:16:58 -08:00
James B. Pollack
3b6cd4c2d1 initial live earthqukes commit 2015-12-05 14:11:59 -08:00
David Rowe
404deba78d Adjust avatar thumb root joint angle to look better 2015-12-05 16:26:21 +13:00
David Rowe
560b9f012f Get hand positioning and orientation working again 2015-12-05 16:25:28 +13:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
Philip Rosedale
06c8235b19 Merge pull request #6544 from sethalves/distance-grab-adjustment 
distance-hold adjustment
 2015-12-04 14:34:10 -08:00
Seth Alves
4246672813 enable head-moving of distance grabbing 2015-12-04 10:38:24 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Seth Alves
17b5ade9c0 allow moving distantly grabbed objects with head 2015-12-03 16:45:46 -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
James B. Pollack
fbca1c9754 another toy 2015-12-03 11:12:28 -08:00
James B. Pollack
cf5c8c08e2 update toys to be inverted while held 2015-12-03 11:10:22 -08:00
David Rowe
a0dcf72a3b Use animation handlers to control hand position and orientation 2015-12-03 14:09:46 +13:00