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

492 commits

Author SHA1 Message Date
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2 
Particles in edit
 2016-02-16 18:33:01 -08:00
Zach Pomerantz
8c01d5f82b Remove camera tool's 3d hud overlays 2016-02-15 14:03:57 -08:00
ericrius1
b92c5555fe Merge branch 'master' into particlesInEdit2 2016-02-15 09:14:37 -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
Howard Stearns
4a50d7c456 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton 2016-02-07 18:41:04 -08:00
Howard Stearns
b08f364447 yes! 2016-02-07 18:29:10 -08:00
Howard Stearns
e52b910e53 connectionTest 2016-02-07 16:39:29 -08:00
Howard Stearns
b6472217c4 Clear accepted/bestPromise .winner when disconnected. 2016-02-07 16:08:40 -08:00
Howard Stearns
8b27b90566 Verify validId before reporting a winning reponse to a proposal. 2016-02-07 14:57:29 -08:00
Howard Stearns
dc50efe7ec final? 2016-02-07 10:42:43 -08:00
Howard Stearns
287d91d4b2 better 2016-02-03 20:57:35 -08:00
Bradley Austin Davis
c1d45b0c78 Remove declarative form creation from WindowScriptingInterface 2016-02-03 14:50:59 -08:00
Howard Stearns
055de61ec6 update 2016-02-03 11:10:04 -08:00
Howard Stearns
59f1cdfc18 Reinit bestPromise with each proposal. 2016-02-02 16:18:33 -08:00
Howard Stearns
03244fbeb5 fix promise-sending. 2016-02-02 15:37:22 -08:00
Howard Stearns
fbcacbe14a simpler betterNumber test. 2016-02-02 14:31:32 -08:00
Howard Stearns
3d01b3ec2b watchdog 2016-02-02 14:15:03 -08:00
Howard Stearns
38443af437 typo 2016-02-02 13:36:40 -08:00
Howard Stearns
d0af2220dc Virtual baton. 2016-02-02 13:20:41 -08:00
ericrius1
84f862d9c1 receiving web event from particle gui 2016-02-01 12:23:39 -08:00
ericrius1
f9a76a7502 Merge branch 'master' into particlesInEdit2 2016-01-29 17:20:48 -08:00
ericrius1
1a7887520d in progress 2016-01-28 16:38:24 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
ericrius1
804f82f2f1 good progress- can create particle entity from menu 2016-01-28 15:57:35 -08:00
David Rowe
2834dee00d Remove erroneous edit.js call with missing entity ID 2016-01-26 22:07:42 +13:00
Brad Hefta-Gaub
1ef01d670d Revert "Make entity properties be undefined after entity is unloaded" 2016-01-25 18:07:14 -08:00
David Rowe
9429f48a7c Remove erroneous edit.js call with missing entity ID 
JavaScript exception was being thrown now that entity properties are
undefined if entity is not found.
 2016-01-24 08:39:50 +13:00
Seth Alves
8ba800fda8 Merge pull request #6851 from AndrewMeadows/collisionless2 
namechange "ignoreForCollisions" to "collisionless"
 2016-01-19 11:33:55 -08:00
Brad Hefta-Gaub
15899558aa Merge pull request #6842 from AlessandroSigna/vrShop 
Vr shop
 2016-01-19 09:39:28 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
e763c055b3 more namechanges in JS scripts 2016-01-15 15:24:46 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
AlessandroSigna
41e6dd48e0 Overlay manager exposing findRayIntersection 2016-01-14 18:27:17 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Philip Rosedale
b8565358ff Added basic energy bar example 2016-01-11 09:16:33 -08:00
James B. Pollack
7d7d0d4c07 mege 2015-12-28 13:21:00 -08:00
James B. Pollack
c4d7b7b9bb Update utils.js 2015-12-28 10:21:23 -08:00
ericrius1
b4988b0998 Taking individual avatar hand size into consideration for grabbing objects 2015-12-23 15:09:10 -08:00
James B. Pollack
a25feb5578 switching branches 2015-12-17 16:58:38 -08:00
James B. Pollack
8e2128c692 update light volume when you move light parent 2015-12-17 11:59:21 -08:00
James B. Pollack
f1ec28e169 visualize volumes 2015-12-16 14:55:01 -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
James B. Pollack
3b6cd4c2d1 initial live earthqukes commit 2015-12-05 14:11:59 -08:00
James B. Pollack
aba65bd9b8 rename linearDamping to damping 2015-11-20 15:45:08 -08:00
Brad Hefta-Gaub
c7673aad4a Merge pull request #6447 from huffman/polyline-texture 
Add texture property to polyline entity type
 2015-11-20 13:31:34 -08:00
Ryan Huffman
b122dad7ea Add begin and middle textures to InfiniteLine 2015-11-19 15:16:23 -08:00
Philip Rosedale
5b853ddf57 Merge pull request #6402 from sethalves/grab-equip 
grab script bumper is an equip toggle
 2015-11-17 20:15:26 -08:00