Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 04:50:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
39138 commits 71 branches 59 tags 1.2 GiB
Commit graph

5298 commits

Author SHA1 Message Date
ericrius1
c43500f38a added textures field to particle explorer 2016-02-16 15:36:03 -08:00
ericrius1
023fd0607d added alpha start 2016-02-16 15:29:42 -08:00
ericrius1
d9d0e78dc5 button close 2016-02-16 15:21:18 -08:00
ericrius1
bf21bc2d48 reworked exporting properties 2016-02-16 14:06:02 -08:00
ericrius1
ad43e4ff6d Fixed multiple particle tabs appearing 2016-02-16 12:56:34 -08:00
ericrius1
46907f446b Listening for page loaded event instead of set timeout === less lag 2016-02-16 11:42:01 -08:00
ericrius1
46679b29f7 particle tab deleted when particle system deleted 2016-02-16 11:11:58 -08:00
ericrius1
f98941e80f switching between particle entities 2016-02-15 12:52:05 -08:00
ericrius1
85d8fc2944 particle image 2016-02-15 11:56:41 -08:00
ericrius1
3adc88aa70 need to fix icon 2016-02-15 11:11:23 -08:00
ericrius1
e4d4044a2b particleExplorer works in edit tab 2016-02-15 09:41:47 -08:00
ericrius1
b92c5555fe Merge branch 'master' into particlesInEdit2 2016-02-15 09:14:37 -08:00
Brad Hefta-Gaub
376c23f1a3 Merge pull request #7100 from imgntn/edit_props 
Hide hyperlink property for web entities
 2016-02-12 18:29:35 -08:00
Brad Davis
b5cba79f0c Merge pull request #7095 from ZappoMan/hmdHacking 
Various bug fixes in related to HMD overlay support
 2016-02-12 17:50:42 -08:00
Brad Hefta-Gaub
48fe638312 Merge pull request #7104 from howard-stearns/update-orbitingSound 
update-orbitingSound.js
 2016-02-12 17:44:47 -08:00
Howard Stearns
9a3972c43f wait for sound to download 2016-02-12 17:42:44 -08:00
Brad Hefta-Gaub
d85a8a4fb9 Merge pull request #7103 from jherico/render-rate 
Don't drop to half the vsync rate when we can't keep up
 2016-02-12 17:11:03 -08:00
Brad Hefta-Gaub
df6437236e some CR feedback 2016-02-12 16:13:12 -08:00
Howard Stearns
25671fbefe Update orbitingSound.js to use a sample file that exists and setOptions function. 2016-02-12 16:01:23 -08:00
Brad Davis
908e153c36 Don't drop to half the vsync rate when we can't keep up 2016-02-12 15:57:27 -08:00
James B. Pollack
c469fc6a29 hide hyperlink property for web entities 2016-02-12 14:30:21 -08:00
Chris Collins
3321265ae7 Merge pull request #7086 from howard-stearns/clear-away-on-buttons 
Clear pause/away on controller button press
 2016-02-12 12:56:42 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
Seth Alves
94bc1764a8 fix auto-updating of adjustments to worn or equipped entities 2016-02-12 06:58:44 -08:00
Seth Alves
ca5525cc3f if an entity already was near-picked, don't do a distance-to-center check on it. 2016-02-12 06:58:14 -08:00
howard-stearns
7c4e31687c simpler/better/more reliable (peek) 2016-02-11 13:27:56 -08:00
Chris Collins
c6bc91f8b2 Merge pull request #7084 from jherico/toolTabs 
Allow closed tabs to delete properly
 2016-02-11 13:20:20 -08:00
howard-stearns
0d8404e7e8 interact more safely with mappings 2016-02-11 13:05:47 -08:00
howard-stearns
93d72833bf Merge branch 'master' of https://github.com/highfidelity/hifi into clear-away-on-buttons 2016-02-11 12:10:53 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Chris Collins
a4afa03fe5 Merge pull request #7077 from sethalves/clean-up-grab-signaling 
Clean up grab signaling + various fixes
 2016-02-11 10:20:56 -08:00
samcake
99e9b3ecdd Merge pull request #7043 from zzmp/fix/render-ui 
Revamp the render engine ui
 2016-02-11 09:57:51 -08:00
Zach Pomerantz
3bace3cdbb Rework the qml for brevity 2016-02-11 08:48:01 -08:00
Zach Pomerantz
9c5881345a Disable the AO gpuTimer pending cpp fix 2016-02-11 08:48:00 -08:00
Zach Pomerantz
dbc59ccc2b Revamp render engine debug JS script 2016-02-11 08:47:59 -08:00
Seth Alves
880aedd444 update to track grab-script changes 2016-02-10 19:01:25 -08:00
Seth Alves
ecf22cd8b8 update toybox toys to use changed grab entityMethod calls 2016-02-10 18:22:20 -08:00
howard-stearns
a2ca0e8470 initial exploration 2016-02-10 17:01:11 -08:00
Seth Alves
8e16bda7bb start to clean up grab generated signals 2016-02-10 16:40:50 -08:00
Andrew Meadows
d121dab937 Merge pull request #7057 from sethalves/grab-then-equip 
Grab then equip
 2016-02-10 14:16:31 -08:00
Brad Hefta-Gaub
d7db08d150 Merge pull request #7042 from howard-stearns/virtualBaton 
Virtual baton
 2016-02-10 13:48:34 -08:00
Howard Stearns
989192e9fd Make randomize clearer. 2016-02-10 12:53:05 -08:00
Howard Stearns
31d72ffb8d 2 is magic. 2016-02-10 12:17:58 -08:00
Howard Stearns
4241f4b305 Convert all simple one-liners containing ') { ' to instead take up three lines. 2016-02-10 12:03:07 -08:00
Seth Alves
9d21c3d549 Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip 2016-02-10 11:35:25 -08:00
Ken Cooke
a875542142 Merge pull request #7053 from birarda/integrate-new-hrtf 
Integrate the new audio HRTF in AudioMixer
 2016-02-10 07:34:50 -08:00
Seth Alves
c2cbca88cb allow grabbing with one hand and then equipping with other 2016-02-09 16:54:32 -08:00
Seth Alves
43592fd699 Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform 
Better avatar animation when attached to a moving entity
 2016-02-09 14:30:02 -08:00
Anthony J. Thibault
072172b1a2 SpatiallyNestable: now with velocity support! 
Moved velocity and angularVelocity into the SpatiallyNestable base class.

Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.

MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
 2016-02-08 19:43:23 -08:00
ericrius1
3acc077bbd replaced sound url for example entity 2016-02-08 17:47:57 -08:00