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

5482 commits

Author SHA1 Message Date
ericrius1
25a2d1eb93 fixed rotation 2016-02-26 10:14:27 -08:00
ericrius1
b70d96ea96 Merge branch 'master' into whiteboardV2 2016-02-26 09:17:43 -08:00
Andrew Meadows
ef433c0e01 legacy support for EntityViewer.setKeyholeRadius() 2016-02-25 22:24:37 -08:00
ericrius1
0ce4385554 no offset increment 2016-02-25 18:22:54 -08:00
ericrius1
4d2a65926c test 2016-02-25 18:06:13 -08:00
Brad Hefta-Gaub
25634ea0ca Merge pull request #7204 from PhilipRosedale/betterLeap 
Leap Motion can near grab entities
 2016-02-25 17:48:56 -08:00
PhilipRosedale
4845de68dd fixed typo 2016-02-25 17:29:53 -08:00
PhilipRosedale
0cc1c930c5 mapped finger curl to trigger value 2016-02-25 17:04:46 -08:00
ericrius1
0602bf7f1a logging 2016-02-25 16:20:35 -08:00
Philip Rosedale
86d6d255fa Merge pull request #7199 from sethalves/fix-grab-heartbeat 
only update heartbeat in userData of grabbed entity every 5 seconds
 2016-02-25 16:17:11 -08:00
ericrius1
a79d334bed no query string 2016-02-25 16:12:34 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
ericrius1
668894b3e0 should work multiuser now 2016-02-25 16:05:03 -08:00
ericrius1
24bf4f851f can erase any stroke at any time 2016-02-25 15:23:02 -08:00
Brad Hefta-Gaub
9e2d326b30 Merge pull request #7177 from howard-stearns/ac-sound-searcher-update 
Update sound searcher and spawner for load handling.
 2016-02-25 15:10:42 -08:00
ericrius1
ddae2d4f74 only erase stroke map on release and preload 2016-02-25 15:00:54 -08:00
ericrius1
4de951242c eraser positioned correctly 2016-02-25 14:54:34 -08:00
ericrius1
22a5f3dcc0 wait even longer 2016-02-25 14:28:48 -08:00
ericrius1
338427ed3e wait longer before sending message 2016-02-25 14:28:35 -08:00
ericrius1
e9ad06fca7 removed query string 2016-02-25 14:25:12 -08:00
ericrius1
ef85d0451a removed files that shouldn't be there 2016-02-25 14:24:06 -08:00
Seth Alves
b253cd53b9 Merge pull request #7190 from ericrius1/playaFireworks 
Playa fireworks
 2016-02-25 14:02:25 -08:00
Eric Levin
4d27d5c9f2 Update fireworksLaunchButtonEntityScript.js 2016-02-25 13:45:08 -08:00
Seth Alves
6dafc654eb only update heartbeat in userData of grabbed entity every 5 seconds 2016-02-25 13:19:56 -08:00
ericrius1
98cf784c6f more smoke fading 2016-02-25 10:32:21 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
ericrius1
54ee3d347c more velocity 2016-02-25 09:53:17 -08:00
ericrius1
f12acfb7f3 simplfied 2016-02-25 09:49:44 -08:00
ericrius1
d4d5aed518 smoke tweaks 2016-02-25 09:44:48 -08:00
ericrius1
9a108c298f smoke tweaks 2016-02-25 09:34:22 -08:00
Howard Stearns
077d331004 whitespace 2016-02-25 09:34:07 -08:00
ericrius1
728612f9a7 far trigger launches fireworks 2016-02-25 09:26:37 -08:00
ericrius1
8f914c6673 removed query string on entity script 2016-02-24 20:08:35 -08:00
ericrius1
ad49bcda72 lowered num fireworks 2016-02-24 18:29:44 -08:00
ericrius1
7cb57aa067 alpha tweaks 2016-02-24 18:15:34 -08:00
ericrius1
a1eab365ce added name to launch pad 2016-02-24 18:11:08 -08:00
ericrius1
29c4ac83c0 can set launch position in userdata 2016-02-24 18:00:57 -08:00
ericrius1
857ccc7409 move sound with thing 2016-02-24 17:53:46 -08:00
Chris Collins
f6a6560b86 Merge pull request #7175 from sethalves/grab-clean-up-abandoned 
grab script cleans up abandoned grabs
 2016-02-24 17:20:46 -08:00
ericrius1
08e7adc518 tweaks 2016-02-24 17:08:12 -08:00
ericrius1
45e8287d1d particle trail in right spot 2016-02-24 16:55:31 -08:00
ericrius1
c26ad2b9d0 relative smoke trail 2016-02-24 16:52:02 -08:00
ericrius1
fdb5d33866 MORE RANDOM YAHH 2016-02-24 16:42:24 -08:00
ericrius1
208096f2e0 fireworks but no smoke 2016-02-24 16:36:54 -08:00
ericrius1
769a5ecca9 tweaks 2016-02-24 16:33:28 -08:00
ericrius1
0a6a35ddd8 need multiple explosions at once 2016-02-24 16:30:29 -08:00
Howard Stearns
274f72af52 Merge branch 'master' of https://github.com/highfidelity/hifi into ac-sound-searcher-update 2016-02-24 16:28:52 -08:00
Howard Stearns
90b5cdb30f Fix bug. Annotate. 2016-02-24 16:27:46 -08:00
Zach Pomerantz
c2ed5e5474 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-24 16:24:09 -08:00
ericrius1
0499334938 toadd: different colors for fireworks 2016-02-24 16:14:46 -08:00