Commit graph

506 commits

Author SHA1 Message Date
PhilipRosedale
42f6ede43c azimuth = elevation, duh 2016-02-29 10:22:24 -08:00
PhilipRosedale
d1bc31afb6 azimuth function is really just a ratio 2016-02-29 10:16:34 -08:00
PhilipRosedale
cee79c8274 Fixed bug in rayPlane test 2016-02-28 15:44:23 -08:00
PhilipRosedale
e9aed83920 suppress debug messages 2016-02-28 12:41:40 -08:00
PhilipRosedale
1d681a2461 Add angular size and azimuth limits to object XZ translation 2016-02-28 12:00:13 -08:00
PhilipRosedale
47504a068e remove unused code 2016-02-26 16:58:38 -08:00
PhilipRosedale
7fd88793dc drag relative to plane where pointer collided selection box 2016-02-26 16:58:17 -08:00
ericrius1
0a6a35ddd8 need multiple explosions at once 2016-02-24 16:30:29 -08:00
Ryan Huffman
e6ccf501fa Merge pull request #7135 from zzmp/fix/grid
Update renderGrid to use a shader, and fix grid edit tools
2016-02-22 12:58:23 -08:00
Brad Hefta-Gaub
2810be8787 fix scripts to use new API 2016-02-19 17:57:49 -08:00
Zach Pomerantz
c9362a4073 Set grid major div min to 1 2016-02-19 15:58:08 -08:00
Zach Pomerantz
5d78867197 Set grid height via global y-coord 2016-02-19 15:41:38 -08:00
Zach Pomerantz
fd6aa9a78b Add layering to renderGrid, draw edit grid not layered 2016-02-19 13:57:32 -08:00
Zach Pomerantz
b68213f9bf Reintroduce grid to edit.js 2016-02-18 15:48:25 -08:00
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