Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 14:38:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

3386 commits

Author SHA1 Message Date
Thijs Wenker
222234cf1d wild planky changes on value change 2015-07-14 03:40:58 +02:00
Thijs Wenker
6d1df03617 planky: load / save settings 2015-07-14 03:19:23 +02:00
Thijs Wenker
1f453e07e3 connection between planky script and web-window 
-load settings
-include toolbar
 2015-07-14 02:18:17 +02:00
Seth Alves
d44bb1a0d8 update javascript to use relative-to-entity line-point ends 2015-07-13 11:42:29 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
ericrius1
b3b12bd2dc adding custom shader for flipped normals 2015-07-13 08:54:53 -07:00
Seth Alves
c56b2918a4 allow voxels.js to work on an empty voxel-space 2015-07-12 10:35:44 -07:00
Howard Stearns
c340d336dc Functional sword script: 
Mouse and hydra.
Switchable hands.
Scores above buttons (2d) and above head in-world.
Adds avatar hit sound while sword is brandished.
 2015-07-10 15:43:56 -07:00
Brad Hefta-Gaub
33016e2797 Merge pull request #5293 from jherico/bart 
More profiling ranges and updated performance testing scripts
 2015-07-09 19:10:45 -07:00
Brad Davis
446f800aee More profiling ranges and updated performance testing scripts 2015-07-09 15:43:30 -07:00
Seth Alves
fa06f50841 fix header comment 2015-07-09 15:34:03 -07:00
Seth Alves
d197bf2a85 use palm rotation data in hold action 2015-07-09 12:18:32 -07:00
Thijs Wenker
12f34a71ab Merge branch 'master' of https://github.com/worklist/hifi into 20552 2015-07-09 20:57:34 +02:00
Thijs Wenker
c6b3801d0b proper block offset calculations 2015-07-09 20:53:09 +02:00
Philip Rosedale
542a5f100a Merge pull request #5280 from BingShearer/airhockey 
Air Hockey UI Fix
 2015-07-09 10:04:21 -07:00
Howard Stearns
c8da325213 Fudge the offset so that operates only when using the mouse. 2015-07-08 16:59:54 -07:00
Bing Shearer
ba4049754a Restored indentatioN 2015-07-08 16:53:55 -07:00
Bing Shearer
6080ec4509 Air Hockey UI now follows window border 2015-07-08 16:29:43 -07:00
Howard Stearns
6813a3afe1 Sword: 
+ init hands.
+ toolbar of brandishToggle/makeTarget/cleanup.
+ initial hit flash using overlays instead of ogl "fade".
 2015-07-08 15:27:45 -07:00
Howard Stearns
ef4620cabb Add a button to create/toggle-away sword. 
When brandished, display hit points (in overlay for this user).
 2015-07-08 11:52:37 -07:00
Chris Collins
16e79cc85f Remove lobby.js from the default scripts 
Lobby.js has some bugs that are not going to be fixed in the short
term. Therefore we are removing it from default scripts.
 2015-07-08 11:17:03 -07:00
Howard Stearns
11e52c8ae0 Baseline versions of fight club scripts. 2015-07-07 14:41:03 -07:00
Thijs Wenker
90284b8bb4 fixes mysterious button display bug 2015-07-07 21:33:28 +02:00
Thijs Wenker
da6986f759 Planky refactorings and basic planky settings 2015-07-07 21:06:12 +02:00
Brad Hefta-Gaub
96fecd093d Merge pull request #5237 from samcake/yellow 
Introducing the Status to the render::Scene & Engine, a per item information that can be displayed in 3D for debug
 2015-07-06 15:41:58 -07:00
samcake
a8ddc71946 Merge pull request #5262 from bwent/cookies 
Added checkbox functionality, double-click to reset panel
 2015-07-06 15:09:16 -07:00
bwent
8b4398cd5a Update cookies.js 2015-07-06 15:03:21 -07:00
bwent
2bdd2b8c2c Update cookies.js 2015-07-06 15:02:51 -07:00
bwent
5d91f1be83 Removed header comments 2015-07-06 13:26:16 -07:00
bwent
93fbfcbff7 Added checkbox functionality, double-click to reset panel 2015-07-06 12:09:08 -07:00
samcake
f9562bedd9 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 18:14:45 -07:00
Stephen Birarda
812b18c74e Merge pull request #5205 from SeijiEmery/unit-tests 
Unit tests
 2015-07-02 20:58:09 -04:00
samcake
0c55130548 maybe i have solved the passing of the status 2015-07-02 17:31:29 -07:00
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
Sam Gateau
8d8a902328 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 15:06:32 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
ericrius1
f52d9c1293 added paint scripts for polylines 2015-07-02 14:54:09 -07:00
Seth Alves
246861221c rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready. 2015-07-01 20:17:21 -07:00
Sam Gateau
d019ef4373 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 18:12:11 -07:00
Sam Gateau
e8b11f1198 Exposing the display Item Status to js to turn it on/off 2015-07-01 17:27:41 -07:00
Brad Davis
566842389b Animation performance test script 2015-07-01 17:04:48 -07:00
Brad Hefta-Gaub
8ec3f7ea46 Merge pull request #5228 from DaveDubUK/walk-1.25 
walk.js disable audio by default
 2015-07-01 13:19:45 -07:00
Clément Brisset
52d1ae18cc Merge pull request #5233 from SamGondelman/cameraMode 
correct menu shortcut for mouselook
 2015-07-01 11:15:31 -07:00
Seth Alves
33d9dc40f5 name stick 2015-06-29 16:08:50 -07:00
Seth Alves
2e5b25b5d8 include timescale in wire protocol ../../interface/src/avatar/AvatarActionHold.cpp 2015-06-29 14:34:26 -07:00
Sam Gondelman
0bf4c9dda2 correct menu shortcut for mouselook 2015-06-29 09:58:35 -07:00
Seth Alves
b19517ace7 make voxel editing work, even if the voxel-space is empty 2015-06-28 07:53:35 -07:00
Seth Alves
f2d8c78a88 make voxel editing work, even if the voxel-space is empty 2015-06-28 07:53:16 -07:00
Seth Alves
97cd5b8b99 Merge pull request #5223 from SamGondelman/cameraMode 
misc. key binding/camera fixes
 2015-06-27 10:55:34 -07:00
Seth Alves
7f609dca26 Merge branch 'cameraMode' of github.com:SamGondelman/hifi into actions-over-wire 2015-06-27 10:49:12 -07:00
Seth Alves
5ecc39b811 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 20:06:10 -07:00
DaveDubUK
bb2c640a6d walk.js disable audio by default 2015-06-27 09:23:18 +07:00
Atlante45
7aae36d73e Restore jquery 2015-06-26 17:58:53 -07:00
Sam Gondelman
2f0fcba1eb key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode 2015-06-26 17:28:02 -07:00
Seth Alves
7def9c2e28 better handle failure to rez the stick 2015-06-26 17:10:50 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Howard Stearns
ce1e67b55a Merge pull request #5179 from DaveDubUK/walk-1.25 
walk.js version 1.25
 2015-06-26 07:02:09 -07:00
Zander Otavka
803f644edf Make hyperlink its own section in edit.js. 2015-06-25 11:40:09 -07:00
DaveDubUK
ce31e586b0 fixed sounds. fixed constants 2015-06-25 12:40:51 +07:00
DaveDubUK
ececf68f06 Merge branch 'master' of https://github.com/highfidelity/hifi into walk-1.25 2015-06-25 12:15:07 +07:00
Brad Hefta-Gaub
6c4a4866d3 Merge pull request #5202 from Atlante45/overlay 
Overlay have correct bounds
 2015-06-24 19:00:55 -07:00
Niraj Venkat
d89ff2f720 Merge pull request #5188 from AlexanderOtavka/master 
Improve address bar and edit.js entity properties list.
 2015-06-24 16:48:24 -07:00
Atlante45
bc1abbe9b2 Update scripts 2015-06-24 16:45:38 -07:00
Brad Hefta-Gaub
0269e1eff1 Merge pull request #5204 from huffman/toolbar-titlebar 
Add titlebar to toolbar and fix issue with draggable widgets not working (edit.js specifically)
 2015-06-24 16:12:39 -07:00
Ryan Huffman
4df1bea4ec Merge pull request #5167 from SamGondelman/hmdControls 
hmdControls.js for movement when wearing an HMD
 2015-06-24 14:40:31 -07:00
Ryan Huffman
54ee869d9b Fix y position of toolbar 2015-06-24 14:04:53 -07:00
Ryan Huffman
666eaa81fe Cleanup implementation of toolbar titlebar 2015-06-24 14:02:06 -07:00
DaveDubUK
0e71583048 code review changes for walk.js 1.25 2015-06-24 19:41:54 +07:00
DaveDubUK
73e59fe07f code review changes for walk.js 1.25 2015-06-24 19:25:25 +07:00
DaveDubUK
c2287e9953 code review changes for walk.js 1.25 2015-06-24 19:24:57 +07:00
Zander Otavka
8c77fd369b Add subsections to the edit.js properties list. 2015-06-23 17:40:38 -07:00
Ryan Huffman
694a051724 Add titlebars to toolBars.js 2015-06-23 15:32:24 -07:00
Howard Stearns
5114f82dca Fix https://app.asana.com/0/32622044445063/38213714069516 2015-06-23 12:07:01 -07:00
Seth Alves
4bf4e9f5da Merge pull request #5164 from ericrius1/lineBounds 
Line bounds
 2015-06-23 10:47:38 -07:00
Philip Rosedale
1930043329 Merge pull request #5191 from ericrius1/gunFix 
fixed bullet size to be smaller for gun.js script
 2015-06-23 09:53:23 -07:00
ericrius1
cf579ab275 fixed bullet size to be smaller 2015-06-23 09:52:29 -07:00
Zander Otavka
f7cd756796 Improve entity properties list in edit script. 
Add headers to break up logical sections, and reorder/relabel a few
properties.
 2015-06-23 09:17:23 -07:00
ericrius1
9014e8c038 increased dimensions for line entity 2015-06-22 15:34:46 -07:00
Philip Rosedale
fd96c3a280 Merge pull request #5184 from ericrius1/utilities 
Utilities
 2015-06-22 12:14:17 -07:00
ericrius1
6c84e5ad77 actually syncing brush to line color 2015-06-22 11:08:40 -07:00
ericrius1
1b69563b29 changed quad back to line; 2015-06-22 11:06:40 -07:00
Howard Stearns
edf024dff8 Merge pull request #5178 from ctrlaltdavid/20584 
CR for #20584 - Improve legibility of entities editor
 2015-06-22 10:46:15 -07:00
ericrius1
362d9a2481 syncing brush sphere with line color 2015-06-22 10:35:00 -07:00
DaveDubUK
10d981e6d5 walk.js 1.25 comments removal 2015-06-22 17:51:49 +07:00
DaveDubUK
54608b9cb3 walk.js version 1.25 2015-06-22 14:18:07 +07:00
ericrius1
8fcff2d648 changed indent spacing to 4 spaces 2015-06-19 19:03:47 -07:00
ericrius1
18014e968d removed horizontal "line break" style comment blocks 2015-06-19 19:00:42 -07:00
ericrius1
8bc9fc2e1f simplified paint.js script to allow for faster iteration and more thorough testing 2015-06-19 18:58:09 -07:00
David Rowe
bdcf87a3c6 Improve legibility of entities editor 
Increased font sizes.
Improved contrast between values and backgrounds.
 2015-06-19 16:28:45 -07:00
Sam Gondelman
a0d4b7ec7c without script, doesn't limit you to constant degree turns 2015-06-19 16:11:43 -07:00
Sam Gondelman
e78ce8055a hmdControls turns on when you enter VR mode, turns off when you exit, can toggle with CTRL+G 2015-06-19 11:17:36 -07:00
Ryan Huffman
1e69e647bb Remove pointer.js from defaultScripts because it causes crashes 2015-06-19 11:02:00 -07:00
ericrius1
1eaf5ae82a fixed utilities file to be able to be referenced by other files 2015-06-19 10:37:57 -07:00
Sam Gateau
5a2d2485c0 Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque 2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Sam Gondelman
9cfe8ecc01 added hmdControls.js to hmdDefaults.js 2015-06-18 18:59:10 -07:00
Sam Gondelman
decae5c1f1 finished hmdControls.js 2015-06-18 18:43:47 -07:00
ericrius1
7293330ced fixed indentation and lines delete when user exits to help with large model.svo/json file size 2015-06-18 18:17:02 -07:00
ericrius1
830a8b6909 checking for bounds and modified paint script to start a new line entity if user paints outside of line entity's bounding box 2015-06-18 18:14:03 -07:00
Brad Hefta-Gaub
750ce250fa Merge pull request #5150 from SamGondelman/mouseLook 
mouse look script
 2015-06-18 17:41:20 -07:00
Sam Gondelman
012a508eb2 removed extraneous code 2015-06-18 16:25:12 -07:00
Sam Gondelman
c84a6cbf28 added warping 2015-06-18 16:05:58 -07:00
Sam Gondelman
fb7ddde0ca removed magic numbers 2015-06-18 15:29:20 -07:00
Sam Gondelman
fd0efd91ff added shift action, added timers and fast mode to hmdControls.js 2015-06-18 13:59:37 -07:00
Philip Rosedale
61a2196a30 Reduce error tolerances for ballistic prediction that trigger updating the server 2015-06-18 13:21:37 -07:00
Sam Gondelman
3baf6d80ae removed magic numbers from mouseLook.js 2015-06-18 10:10:54 -07:00
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
Sam Gondelman
a37b089b33 merge with master 2015-06-17 12:17:09 -07:00
Sam Gondelman
c0797313a1 added mouseLook.js to default scripts 2015-06-17 12:08:23 -07:00
Andrew Meadows
61f62f96b0 Merge pull request #5129 from SamGondelman/master 
Integrating gamepads/hydras to input mapping system, zooming
 2015-06-17 11:39:38 -07:00
Sam Gondelman
3af0c138dd removed button image, extraneous variables 2015-06-17 11:39:11 -07:00
Sam Gondelman
17322645f2 added mouselook script, reticle and icons need changes 2015-06-17 11:17:38 -07:00
Seth Alves
f5cea57a48 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-17 07:20:15 -07:00
Philip Rosedale
7ead2bc46b Merge pull request #5120 from ctrlaltdavid/20576 
DO NOT MERGE - QA for #20576 - Play sound when mic is muted
 2015-06-16 13:27:01 -07:00
Seth Alves
a5f7ba51b6 only show polyvox property widgets if we are editing a polyvox. 2015-06-16 10:13:47 -07:00
Sam Gondelman
40bd747080 added trigger buttons to hydra, removed hydraMove.js from default scripts 2015-06-15 11:13:07 -07:00
Philip Rosedale
0b4d4c24d4 Merge pull request #5119 from ericrius1/paintingOptimizations 
added lifetime to painted lines to prevent huge model.json files when…
 2015-06-14 21:47:56 -07:00
Philip Rosedale
c113b4620d Merge pull request #5107 from howard-stearns/draggable-toolbar 
Draggable toolbar
 2015-06-14 21:46:49 -07:00
David Rowe
c369e305f8 Include dialTone.js in default scripts 2015-06-12 12:33:30 -07:00
David Rowe
f0b6b0f548 Play sound upon microphone being muted 2015-06-12 12:33:17 -07:00
David Rowe
546442ff9a Fix sound URLs 
Three slashes needed for Windows.
 2015-06-12 12:32:40 -07:00
Eric Levin
7ee609396c added lifetime to painted lines to prevent huge model.json files when lots of people draw in one domain. Got rid of gaps in lines when switching line entities 2015-06-12 11:58:43 -07:00
Howard Stearns
27f40ea881 Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
Howard Stearns
3cb4ee183e Update header. 2015-06-11 16:24:22 -07:00
Howard Stearns
e6bafb9bf1 Draggable toolBar.js, with persistence, and update some scripts for it. 2015-06-11 16:19:54 -07:00
Brad Hefta-Gaub
24fda9a733 Merge pull request #5085 from SamGondelman/master 
Exposing Input Key Binding To JavaScript
 2015-06-11 14:41:34 -07:00
Andrew Meadows
a3c5ea1b58 Merge pull request #5088 from sethalves/actions 
spring action with rotation and position target, rework grab script to use it
 2015-06-11 13:23:57 -07:00
Seth Alves
8ed9a3ca02 add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07:00
Brad Hefta-Gaub
a1ee339765 Merge pull request #5103 from samcake/punk 
TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene
 2015-06-11 10:17:38 -07:00
Andrew Meadows
f77f3f1e1e fix bug where grab.js moves mouse to screen corner 
when CTRL is pressed
 2015-06-11 08:43:19 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Philip Rosedale
b32994b359 Merge pull request #5083 from ctrlaltdavid/20551 
CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace
 2015-06-10 22:32:25 -07:00
Seth Alves
8bd80c511e make stick follow mouse motion 2015-06-10 21:08:00 -07:00
Seth Alves
4216308b9b Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 19:05:25 -07:00
Seth Alves
45c7cd4929 respond to code review, add a simple hold-a-stick script 2015-06-10 18:48:51 -07:00
Niraj Venkat
9ed8daa97c Removing unnecessary functions 2015-06-10 15:33:07 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Niraj Venkat
4617b7331c Working on creating functions to serialize and deserialize properties 2015-06-10 09:50:47 -07:00
Niraj Venkat
d90e43c5aa Adding text boxes for hyperlink href and description 2015-06-09 16:15:47 -07:00
Stephen Birarda
091ed5b514 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 15:51:45 -07:00
Seth Alves
6cce845984 rotate based on initial mouse-position and initial entity rotation rather than doing small deltas as the mouse moves 2015-06-09 14:26:44 -07:00
Seth Alves
23dab530f9 fix some glitchy behavior during rotation 2015-06-09 14:11:01 -07:00
David Rowe
a4885ff38c Close directory window after domain change 2015-06-09 12:33:30 -07:00
Seth Alves
ccb2f17b33 grab.js rotation sort-of works now 2015-06-09 11:21:13 -07:00
Seth Alves
42f94307d5 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-09 09:51:29 -07:00
Sam Gondelman
b1b2d1f85c ;) (added semicolons to js example) 2015-06-09 09:45:19 -07:00
David Rowe
cb6aef16e6 Merge branch 'master' into 20551 2015-06-09 09:36:44 -07:00
David Rowe
9e3ce344fb Display directory button just above edit toobar 2015-06-09 07:26:18 -07:00
Brad Hefta-Gaub
3fb5e47dcc Merge pull request #5064 from ericrius1/paint 
bumped max line points to 80
 2015-06-08 21:20:58 -07:00
Seth Alves
2fb64aad91 fix variable name 2015-06-08 20:31:35 -07:00
Seth Alves
14a45e8349 convert grab.js to use spring action. rotation doesn't work right, yet 2015-06-08 18:25:58 -07:00
Seth Alves
f491a7a786 Merge pull request #5084 from AndrewMeadows/inertia 
rewrite grab.js to follow mouse
 2015-06-08 17:35:03 -07:00
Brad Davis
90c18d0c48 Merge pull request #5080 from ZappoMan/team-teaching 
Merge TEAM-TEACHING into MASTER
 2015-06-08 17:34:42 -07:00
Andrew Meadows
b682a07714 merge upstream/master into andrew/inertia 
Conflicts:
	examples/grab.js
 2015-06-08 17:28:14 -07:00
Andrew Meadows
ef1e3aae00 faster move and max solid angle for distant grabs 2015-06-08 16:59:33 -07:00
Andrew Meadows
ffeac220f9 fix typo in variable name 2015-06-08 16:40:50 -07:00
Andrew Meadows
e70cd9edd9 remove unused variable 2015-06-08 15:11:42 -07:00
Andrew Meadows
4647f84638 rewrite grab.js to follow mouse 2015-06-08 14:58:42 -07:00
Eric Levin
6d59518149 added meditative ocean landscape and common utilities file 2015-06-08 14:02:38 -07:00
ZappoMan
24c8e7d0e6 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 13:50:50 -07:00
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
Stephen Birarda
4e755e304b fix spacing in new JS file 2015-06-08 11:31:24 -07:00
Stephen Birarda
666830c04d add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
David Rowe
f51feca37d Add directory button 2015-06-08 11:29:35 -07:00
Sam Gateau
de61f4ea0b Gettting th ehighlight on transparent to work 2015-06-08 02:52:13 -07:00
Sam Gateau
8d3a3221b0 shuffling the rendering steps to get to render transparent and light it correctly 2015-06-06 09:50:56 -07:00
Seth Alves
037a70b03a undo unneeded/breaky change in grab.js 2015-06-05 13:47:07 -07:00
ZappoMan
7dc0e8a66c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 12:21:29 -07:00
Eric Levin
21aa3b62bc bumped max line points to 80 2015-06-05 12:04:32 -07:00
Seth Alves
b425cc6491 merge from upstream 2015-06-05 11:56:33 -07:00
Philip Rosedale
1f11625db4 Merge pull request #5060 from ericrius1/paint 
moved ball marker closer to hand so painting feels more visceral
 2015-06-05 11:26:22 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Eric Levin
9f974c3b5c moves ball marker closer to avatar for mouse as well 2015-06-05 10:19:39 -07:00
Sam Gondelman
dd12e4740e example script for controller scripting, input mapping 2015-06-05 10:14:13 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Eric Levin
30ba7ffc29 moved ball marker closer to hand so painting feels more visceral 2015-06-05 09:36:12 -07:00
Andrew Meadows
08b64666fe Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume 
Smooth initial crash volume
 2015-06-05 08:40:09 -07:00
Seth Alves
b2db5f7fee update grab.js to use pull-to-point action, various other fixes 2015-06-05 07:10:44 -07:00
Eric Levin
fd8126510d marker ball now stays without mouse whether or not user is drawing 2015-06-04 21:41:19 -07:00
Eric Levin
9264ef980c added redo and undo functionality to mouse component of paint script, and fixed overlay not being deleted on script ending bug 2015-06-04 21:13:16 -07:00
Philip Rosedale
8c32f8f396 Merge pull request #5054 from ericrius1/paint 
added paint.js and line rider script. Users can paint lines with hydr…
 2015-06-04 20:52:23 -07:00
Eric Levin
f276ca30cd refactoring for common functions. Fix for randFloat 2015-06-04 17:55:55 -07:00
Eric Levin
241330442c added paint.js and line rider script. Users can paint lines with hydra or mouse, and then go on a ride over the line they just created. 2015-06-04 17:35:26 -07:00
Eric Levin
1fd0650955 removing overlay on script ending 2015-06-04 16:54:52 -07:00
Eric Levin
a2ae51371b updated pointer.js script to work with new line entity 2015-06-04 15:44:39 -07:00
Howard Stearns
5727400b9a Sound toys script (in examples/soundToys.js) 2015-06-04 14:20:19 -07:00
Sam Gateau
b339aa683a adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items 2015-06-03 11:25:45 -07:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
Sam Gateau
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -07:00
Seth Alves
a85a0b863d icon for create-polyvox button 2015-06-02 16:25:38 -07:00
Seth Alves
20d3814c1b code review 2015-06-02 10:00:07 -07:00
Seth Alves
175926736d Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-01 09:59:01 -07:00
Eric Levin
45331e5a0e removed sounds from grab script 2015-06-01 09:37:54 -07:00
Seth Alves
00af0a4376 trying to make thing behave when voxel-space is resized 2015-06-01 07:15:37 -07:00
Seth Alves
b9202ebfb6 added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look 2015-05-31 09:14:59 -07:00
Seth Alves
a3589788df allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items. 2015-05-30 18:33:35 -07:00
Seth Alves
ad71d7b7a2 allow changing of voxel-volume-size with edit.js 2015-05-30 18:14:36 -07:00
Seth Alves
fe59f8846f recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape 2015-05-30 16:43:11 -07:00
Seth Alves
96a40bd673 basic collisions with cubic polyvoxes 2015-05-29 18:50:26 -07:00
Eric Levin
8dda86f80d added brownianFun script to apply random forces to balls in a pen 2015-05-29 17:02:51 -07:00
Philip Rosedale
11844463d1 Merge pull request #4915 from AndrewMeadows/isothermal 
DO NOT MERGE grabHockey.js script can safely manipulate misc objects again
 2015-05-29 16:07:32 -07:00
Seth Alves
06ffcbf24d Merge pull request #4981 from ericrius1/blockWorld 
tiles and block no longer delete on script end, now user can delete a…
 2015-05-28 11:09:14 -07:00
Andrew Meadows
2a4cd468e4 Merge pull request #4979 from sethalves/polyvox 
initial pass at Polyvox Entity Type
 2015-05-28 10:43:50 -07:00
Eric Levin
03062fccd3 remove whiteboard by default in pointer.js 2015-05-28 10:17:47 -07:00
Seth Alves
4fa6f388b9 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 18:20:59 -07:00
Brad Hefta-Gaub
5da3a9440e Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples 
[REQUIRES #4962] Remove global collision and update examples
 2015-05-27 16:09:14 -07:00
Seth Alves
95c5ed66fc Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 15:37:33 -07:00
Seth Alves
43dd8b3fb1 Merge pull request #4980 from ericrius1/pointer 
Pointer
 2015-05-27 15:37:24 -07:00
Eric Levin
8db8277bf8 tiles and block no longer delete on script end, now user can delete all the stuff with a button click instead. Also blocks now spawn with random angular velocity for spinning fun 2015-05-27 15:20:49 -07:00
Eric Levin
07c8fb6c02 turned pointer and draw funcitonality off be default 2015-05-27 15:11:16 -07:00
Eric Levin
ca85401b77 added button so user can toggle pointer on/off 2015-05-27 15:08:52 -07:00
Seth Alves
7f99f261c2 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 13:59:13 -07:00
Seth Alves
29cb5ed126 Merge pull request #4967 from ericrius1/pointer 
modified pointer script to allow users to draw on surfaces
 2015-05-27 13:56:17 -07:00
Seth Alves
429cc631f3 limit size of polyvox data property to below MTU 2015-05-27 09:48:32 -07:00
Seth Alves
0f81445cee flag for polyvox to select minecraft vs walking-cubes. uppack to unpack 2015-05-27 07:04:44 -07:00
Eric Levin
3fb5476968 added blockWorld script to generate floor of tiles and drop jenga blocks at random points above floor 2015-05-26 16:46:01 -07:00
Eric Levin
579c62420d added header to pointer script 2015-05-26 16:43:34 -07:00
Eric Levin
7194d4a4da modified pointer script to allow users to draw on surfaces 2015-05-26 16:40:47 -07:00
Seth Alves
55028f6cb0 voxel data sent over wire and saved to json 2015-05-26 16:34:35 -07:00
Howard Stearns
ae73e68f7b Update header. 2015-05-26 13:27:37 -07:00
Howard Stearns
d214f128cd Miniumum change for gun to use per-entity collisions. 
I have *not* updated this script for other recent changes (e.g., to entityIDs).
 2015-05-25 17:39:15 -07:00
Howard Stearns
050829e442 typo 2015-05-25 17:23:22 -07:00
Howard Stearns
590ad22d89 Update spaceInvaders to use per-entity collision handlers. 
Also fix bitrot:
* The 'f' key triggers a profile, after which all bets are off regarding time-dependent behavior such as lifetime and update().
 (I'm moving space-invaders "fire" to the space bar as a work-around.)

* You don't get a collision without
 a non-default shapeType property (if the object type is "Model")
 a truthy collisionsWillMove property

* Entity handles (such as returned by Entity.addEntity) no longer have a separate 'id' property, so don't reference that. Just use the handle object itself.

* When an entity's lifetime expires, Entities.getEntityProperties(theEntityHandle) returns default values.
 It looks like the space-invaders script was written at a time when this returned falsey.
 (I'm changing the script to see if the properties.type === 'Unknown'.)

NOT FIXED is that the level of detail is cutting out when showing all the invaders.
 2015-05-25 17:16:35 -07:00
Howard Stearns
09e9d353ea Deprecate globalCollisionsExample.js, and add entityCollisionExample.js 2015-05-25 17:15:55 -07:00
Howard Stearns
706c837886 Use collisionSoundURL for billiards.js, instead of the global collision event. 2015-05-25 17:12:36 -07:00
Atlante45
18812ab25f Fix entityProperties.html undefined ref 2015-05-24 19:21:04 +02:00
Triplelexx
9a29489784 expose particle properties for editing 
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
 2015-05-23 17:57:25 +01:00
Brad Hefta-Gaub
225021671a Merge pull request #4950 from ericrius1/particleScriptName 
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
 2015-05-22 22:17:39 -07:00
Eric Levin
71c0aa4913 renamed ajt-test to particles.js since ajt-test doesn't tell us anything about what the script does 2015-05-22 15:33:38 -07:00
Eric Levin
d40d9cca69 deleted look.js (no longer needed) and removed from default scripts 2015-05-22 10:02:28 -07:00
Brad Hefta-Gaub
9b469226f3 Merge pull request #4934 from sethalves/fix-edit-js 
fix edit.js -- selectionManager.selections holds ids, not properties
 2015-05-21 18:32:05 -07:00
Seth Alves
35b1a6eee4 selectionManager.selections holds ids, not properties 2015-05-21 18:15:05 -07:00
Philip Rosedale
05a73d8a79 Merge pull request #4933 from ericrius1/inspectFix 
added oldMode as global vairable
 2015-05-21 18:14:40 -07:00
Eric Levin
ce1ccf1c40 added oldMode as global vairable 2015-05-21 18:08:04 -07:00
Eric Levin
8a0c1cab1e inspect now uses accurate picking and camera slerps to looks at target. pointer does not show u when user is inspecting 2015-05-21 15:31:30 -07:00
Seth Alves
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -07:00
Seth Alves
d8beed34d6 remove // ? comments 2015-05-20 16:27:28 -07:00
Seth Alves
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub
6955626b77 Merge pull request #4900 from ericrius1/hockey 
added check to airhockey script so entities that have never been crea…
 2015-05-20 14:50:00 -07:00
Brad Hefta-Gaub
6d20fa72db Merge pull request #4899 from Nex-Pro/plankyUpdate 
Planky Game. Added values for friction and restitution in the entity parameters.
 2015-05-20 14:49:39 -07:00
Brad Hefta-Gaub
75f6092023 Merge pull request #4902 from Atlante45/fix_source_url 
Fix sourceUrl box in edit.js
 2015-05-20 14:49:15 -07:00
Ryan Huffman
6f69ed2561 Fix calculated dimensions of spotlight 
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
 2015-05-20 09:11:48 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Andrew Meadows
139ebca258 less bad behavior when dragging across horizon 2015-05-18 23:09:08 -07:00
Andrew Meadows
d486899aad remove unused experimental grab placement 2015-05-18 22:54:00 -07:00
Andrew Meadows
fbd1b7e8b0 grabHockey.js can also rotate objects again 2015-05-18 22:49:23 -07:00
Andrew Meadows
b60907570a safe to use grabHockey.js to grab misc objects 2015-05-18 22:32:20 -07:00
Andrew Meadows
bb1fe8f439 cleanup and stability for grabHockey.js script 2015-05-18 16:57:25 -07:00
Seth Alves
58b6205433 pull in Andrew's adjustment of paddle confinement 2015-05-18 14:10:58 -07:00
Seth Alves
34b381d48c have airHockey.js provide the floor of the table, rather than the collision hull 2015-05-18 13:47:10 -07:00
Seth Alves
ab13eb2d16 put lowered friction back on table. incorportate Andrew's fix for the paddle crashing through the new table corners 2015-05-18 13:30:28 -07:00
Seth Alves
e2a39b4597 airhockey -- drop from slightly lower so paddle doesn't flip over. update grab script with new table name 2015-05-18 12:18:27 -07:00
Seth Alves
6d9db21d88 Merge branch 'master' of github.com:highfidelity/hifi into airhockey-hull 2015-05-18 12:09:10 -07:00
Seth Alves
5ea506f2c1 use a collision hull for table. make deletion code safer 2015-05-18 11:47:06 -07:00
Stephen Birarda
b5fb8b0d12 Merge pull request #4908 from howard-stearns/edit-script-type 
Fix (long-standing?) typo in edit.js file reference.
 2015-05-18 13:37:45 -04:00
Howard Stearns
adfe21b743 Fix (long-standing?) typo in edit.js file reference. 2015-05-18 10:28:47 -07:00
Andrew Meadows
257a730029 keep hokey paddle in playing field 2015-05-18 09:42:55 -07:00
Atlante45
9d27108acb Fix sourceUrl box in edit.js 2015-05-18 13:29:13 +02:00
Eric Levin
03a4e08573 deleted unecsesary whitespace 2015-05-16 07:41:25 -07:00
Eric Levin
b6f1a1b89b added check to airhockey script so entities that have never been created are not attempting to be deleted 2015-05-16 07:34:32 -07:00
Philip Rosedale
831148e280 Merge pull request #4888 from sethalves/finglonger 
more pointer.js fixes
 2015-05-15 17:18:32 -07:00
Philip Rosedale
1c3873358d Merge pull request #4896 from huffman/update-web-icon 
Update web icon
 2015-05-15 17:18:11 -07:00
Philip Rosedale
534869a7ad Merge pull request #4889 from ericrius1/dice 
changed dice to use collisionSoundURL prop
 2015-05-15 17:17:45 -07:00
Nex Pro
75ddad7ec1 Added values for friction and restitution in the entity parameters. 2015-05-16 00:43:05 +01:00
Ryan Huffman
a0369d243a Update web icon 2015-05-15 15:58:02 -07:00
Eric Levin
9bfca7f54d 'moved icons up so they don't interfere with dice icons and changed spanw icon from dice to puck icon' 
'
 2015-05-15 15:43:23 -07:00
Eric Levin
6e1c5d704c 'modified airHockey script to be able to spawn and delete using buttons, added light flashing on score, and puck now respawns on player's side who just got scored on 2015-05-15 15:24:10 -07:00
Seth Alves
60bd345e57 shorter timeout 2015-05-15 14:20:29 -07:00
Seth Alves
0d3add8596 left mouse button only 2015-05-15 14:16:06 -07:00
Seth Alves
aeb5cead65 more fixes to pointer.js 2015-05-15 14:02:25 -07:00
Eric Levin
9c6be26290 changed dice to use collisionSoundURL prop 2015-05-15 13:55:48 -07:00
Seth Alves
042713d1ec Merge branch 'master' of github.com:highfidelity/hifi into finglonger 2015-05-15 13:55:28 -07:00
Seth Alves
f535bd2a76 more fixes to pointer.js 2015-05-15 13:54:24 -07:00
Seth Alves
de8d06acf6 Merge pull request #4887 from PhilipRosedale/hockeygame 
remove line pointers from grab and hockey grab
 2015-05-15 13:43:55 -07:00
Philip Rosedale
cb0112e14e remove line pointers from grab and hockey grab 2015-05-15 13:21:58 -07:00
Seth Alves
bb3d1a6a58 rays never pick a line entity. some fixes to pointer.js 2015-05-15 13:10:16 -07:00
Seth Alves
1161f33b45 laser-poiner script for mouse 2015-05-14 20:25:29 -07:00
Seth Alves
3471c0a44f Merge pull request #4878 from PhilipRosedale/hockeygame 
new paddle models, low friction on field
 2015-05-14 18:23:27 -07:00
Philip Rosedale
7be463388b new paddle models, low friction on field 2015-05-14 18:22:30 -07:00
Eric Levin
7a12a4d58e added support for both right and left hydras for hydra scripts, and made picking accurate 2015-05-14 17:00:40 -07:00
Philip Rosedale
363f55c0f1 Merge pull request #4872 from ericrius1/hydraHockey 
added hydraHockeyGrab.js, which constrains moving object to xz plane …
 2015-05-14 15:05:44 -07:00
Andrew Meadows
53e241fb07 merge upstream/master into andrew/thermonuclear 2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea add restitution and friction Entity properties 2015-05-14 12:36:59 -07:00
Eric Levin
ebb590e58a added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script 2015-05-14 11:46:52 -07:00
Eric Levin
3393b60aba added hydraHockeyGrab.js, which constrains moving object to xz plane and disables rotation 2015-05-14 11:39:04 -07:00
Philip Rosedale
1e01aeb9ed first version, air hockey game 2015-05-13 23:11:24 -07:00
Brad Hefta-Gaub
b799b89dbc Merge pull request #4861 from thoys/20540 
CR for Job #20540 - Additions to Planky
 2015-05-13 20:40:58 -07:00
Brad Hefta-Gaub
5da0a8d7a3 Merge pull request #4860 from howard-stearns/entity-sound 
Entity sound.
 2015-05-13 20:07:44 -07:00
Philip Rosedale
4811697de3 Merge pull request #4866 from sethalves/fix-grab.js-entity-picking 
have grab.js do *accurate* picking!
 2015-05-13 19:52:09 -07:00
Seth Alves
73fa1af24a have grab.js do *accurate* picking! 2015-05-13 19:38:19 -07:00
Howard Stearns
b79a58c0c8 Whitespace. 2015-05-13 18:07:51 -07:00
Brad Hefta-Gaub
072a982fe3 Merge pull request #4851 from huffman/fix-edit-properties-width 
Remove nowrap from entity tool property labels
 2015-05-13 17:45:57 -07:00
Howard Stearns
8324da2f7f Whitespace formatting/indentation. 2015-05-13 15:48:22 -07:00
Howard Stearns
1a87ca04da Entity sound. 2015-05-13 13:18:02 -07:00
Brad Davis
9b6c20d93c Merge remote-tracking branch 'upstream/master' into web-entity 2015-05-13 09:49:53 -07:00
Ryan Huffman
b4416f3bc2 Remove nowrap from entity tool property labels 2015-05-13 08:36:11 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -07:00
Philip Rosedale
107faf39c4 Merge pull request #4844 from huffman/color-picker-reduce-size 
Make edit color picker slimmer
 2015-05-12 16:35:09 -07:00
Seth Alves
4a533748f4 Merge pull request #4848 from PhilipRosedale/master 
update position and rotation from the script, even though we should not have to
 2015-05-12 16:13:29 -07:00
Brad Davis
8c4f802dbf Merge remote-tracking branch 'upstream/master' into web-entity 
Conflicts:
	libraries/entities/src/EntityItemProperties.h
	libraries/entities/src/EntityTypes.h
 2015-05-12 15:56:02 -07:00
Brad Davis
745182a963 Working on web entities 2015-05-12 14:39:54 -07:00
Ryan Huffman
2e31cca7e5 Make edit color picker slimmer 2015-05-12 14:03:06 -07:00
Philip Rosedale
11ab97e0fc update position and rotation from the script, even though we should not have to. 2015-05-12 13:11:11 -07:00
Thijs Wenker
77e5e7a547 random blockheight variation in Planky 2015-05-12 21:38:49 +02:00
Seth Alves
f647db3bf0 Merge branch 'master' of github.com:highfidelity/hifi into line-entity 2015-05-12 11:36:56 -07:00
Seth Alves
7a85bfa0d1 fix up grab.js to use line entity 2015-05-12 11:36:05 -07:00
Seth Alves
38caed00ca Attempt to draw line entity item 2015-05-12 10:25:50 -07:00
Brad Hefta-Gaub
a32b4df6a5 Merge pull request #4841 from huffman/color-picker 
Fix skybox color picker
 2015-05-12 09:24:50 -07:00
Ryan Huffman
e673746d58 Fix skybox color picker 2015-05-12 09:22:53 -07:00
Brad Hefta-Gaub
9e308cce21 Merge pull request #4839 from huffman/color-picker 
Add color picker to entity properties
 2015-05-12 08:58:41 -07:00
Ryan Huffman
9f7e90d036 Add color picker to entity properties 2015-05-12 08:40:44 -07:00
Brad Hefta-Gaub
4d9e413b3f Merge pull request #4820 from hyperlogic/ajt/particle-system-improvements 
Improvements to particle entity.
 2015-05-12 08:40:11 -07:00
Clément Brisset
0bc12f40e6 Merge pull request #4834 from huffman/edit-draw-zone-boundaries 
Remove old zone drawing
 2015-05-12 14:29:42 +02:00
Clément Brisset
9bf4cf1262 Merge pull request #4830 from ZappoMan/moreZoneProperties 
New Zone Features
 2015-05-12 14:28:01 +02:00
Anthony Thibault
e1cbfcd901 Merge branch 'master' into ajt/particle-system-improvements 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224 Particle entity improvements based on code review. 
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
  remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
  particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
 2015-05-11 19:21:33 -07:00
Seth Alves
866a6fba9b Merge pull request #4823 from birarda/master 
repairs to AC stop and clean shutdown
 2015-05-11 18:11:52 -07:00
Seth Alves
237eb72bec if two people grab an enitity at once, don't forget about the original gravity 2015-05-11 16:01:50 -07:00
Ryan Huffman
24739d24e1 Fix calls to set draw zone boundaries 2015-05-11 15:23:39 -07:00
Ryan Huffman
6085aadbc7 Merge branch 'master' of github.com:highfidelity/hifi into edit-draw-zone-boundaries 
Conflicts:
	examples/libraries/zoneOverlayManager.js
 2015-05-11 15:19:54 -07:00
ZappoMan
73428ec12d add support to not displace very large clipboards on import 2015-05-11 14:21:58 -07:00
ZappoMan
28bacb4d82 add center in zone button to edit.js 2015-05-11 13:26:52 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Clément Brisset
5160eb5b94 Merge pull request #4819 from ZappoMan/moreZoneProperties 
More Zone Atmosphere Work: add automatic day/hour calculation
 2015-05-11 19:38:27 +02:00
ZappoMan
4b8c6fc624 fix typo 2015-05-11 09:53:23 -07:00
Brad Hefta-Gaub
12269ff475 Merge pull request #4822 from Atlante45/edit_js 
Hide/Show Skybox/Atmosphere props only when needed
 2015-05-11 09:10:03 -07:00
Atlante45
beba293d96 Hide Skybox/Atmosphere prps when not needed 2015-05-11 15:54:30 +02:00
Atlante45
94765f0c53 Add print type 2015-05-11 15:54:14 +02:00
Anthony J. Thibault
ede42285b1 Improvements to particle entity. 
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
 2015-05-10 17:13:46 -07:00
ZappoMan
17c3c1a18d add support for automatic hour/day calculations and backward compatibility on stage properties 2015-05-10 15:22:02 -07:00
Seth Alves
8da3490a4c when grabbing an entity, zero out its gravity. 2015-05-10 09:32:03 -07:00
ZappoMan
0b6a815a20 moved zone stage properties into a group 2015-05-08 20:17:01 -07:00
Philip Rosedale
72e1ea688a Merge pull request #4808 from ZappoMan/moreZoneProperties 
add has stars to edit.js & fix background mode: nothing bug
 2015-05-08 17:10:45 -07:00
Howard Stearns
abc99267af Typo was making edit.js fail and impossible to debug. 2015-05-08 16:19:39 -07:00
ZappoMan
9f229dc3b3 remove spinners from scatter values 2015-05-08 15:03:04 -07:00
Philip Rosedale
6008713a2a Merge pull request #4809 from PhilipRosedale/master 
don't apply changes to velocity unless needed
 2015-05-08 14:06:51 -07:00
Philip Rosedale
d40e4b7218 don't apply changes to velocity unless needed 2015-05-08 14:05:32 -07:00
Seth Alves
60d7e622f6 Merge pull request #4805 from PhilipRosedale/master 
Add a delete button to dice script
 2015-05-08 14:02:27 -07:00
ZappoMan
b1d5b2643f add has stars to edit.js 2015-05-08 13:17:39 -07:00
Stephen Birarda
69143d8677 add a script for server load testing 2015-05-08 11:57:38 -07:00
Philip Rosedale
de6a63c69a add delete button to clear existing dice 2015-05-08 09:49:58 -07:00
Brad Hefta-Gaub
bbc257199b Merge pull request #4802 from Atlante45/add_debug 
Add some debug to edit.js
 2015-05-08 08:18:45 -07:00
Atlante45
01e3c33bf1 Add some debug to edit.js 2015-05-08 16:13:04 +02:00
Philip Rosedale
32dbbbdc8f normalize a vector that needed it. Correct rolloff of grab force 2015-05-07 21:44:09 -07:00
Philip Rosedale
b59352a10e Merge branch 'master' of https://github.com/worklist/hifi 2015-05-07 21:08:06 -07:00
Philip Rosedale
d3a977d3f8 Fix velocity math error, add random color changes 2015-05-07 21:05:13 -07:00
Andrew Meadows
c7952311e5 Merge pull request #4784 from thoys/20522 
Added transparency and positioning updating of Planky button
 2015-05-07 16:55:06 -07:00
ZappoMan
20fe43c852 wire up new zone properties, fix bug in group proprties decode 2015-05-07 13:05:00 -07:00
ZappoMan
d9f17d010c first cut at adding new zone properties to edit tools 2015-05-07 11:41:23 -07:00
Atlante45
faabf29e84 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 19:58:26 +02:00
Atlante45
00571dad00 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 10:13:59 +02:00
ZappoMan
496da6fcd5 wire up the skybox color property to the new skybox renderer 2015-05-06 20:36:06 -07:00
ZappoMan
af2c3d91cf Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 18:05:54 -07:00
Thijs Wenker
b76e22c952 spelling mistake 2015-05-07 01:14:16 +02:00
Thijs Wenker
b3af1840c7 Added transparency and positioning updating of Planky button 2015-05-07 00:14:49 +02:00
Thijs Wenker
477447b95f Planky game script 2015-05-06 23:36:44 +02:00
ZappoMan
f2ebb6e821 fix output of group names to be lowercase 2015-05-06 11:30:41 -07:00
ZappoMan
edb84a1a14 Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 10:52:04 -07:00
Atlante45
50ba154615 Correctly wire setDrawZones 2015-05-06 17:04:01 +02:00
Clément Brisset
0470e72459 Merge pull request #4777 from cozza13/20529 
CR for Job #20529 - Change defaulscripts.js
 2015-05-06 16:12:22 +02:00
Chris Collins
7396bb138d Removed headmove 
removed head move, it is not being used by Oculus users at the moment
 2015-05-05 16:52:38 -07:00
Seth Alves
e637a9b5ae Merge pull request #4776 from PhilipRosedale/master 
dice don't go away unless 'X' key is clicked, harmonicOscillator.js
 2015-05-05 16:52:35 -07:00
Philip Rosedale
5fb79df4c9 dice don't go away unless 'X' key is clicked, added harmonicOscillator test script 2015-05-05 15:18:16 -07:00
ZappoMan
0cb14650b6 added skybox group properties to zones 2015-05-05 14:12:02 -07:00
ZappoMan
5fc5df7c55 change skyboxMode to backgroundMode 2015-05-05 12:38:44 -07:00
samcake
61f6139f4f Merge pull request #4764 from ZappoMan/atmosphereInZones 
First cut at adding "Atmosphere" support to zone
 2015-05-05 11:00:58 -07:00
ZappoMan
4422c63c79 another sample for changing atmosphere properties 2015-05-04 20:31:37 -07:00
ZappoMan
4b9c6728e7 fix issue with skyboxMode getting randomly set 2015-05-04 18:58:35 -07:00
Eric Levin
39efde7e8c added rotation ability to grab script 2015-05-04 18:14:46 -07:00
ZappoMan
8b3b32c70d add example 2015-05-04 17:21:50 -07:00
Seth Alves
8890c40e15 Merge pull request #4750 from PhilipRosedale/master 
Add limit to grab range to reduce max energy added by grabbing
 2015-05-04 15:59:07 -07:00
Philip Rosedale
7e7500eaad fix for coding standard 2015-05-04 15:57:21 -07:00
Stephen Birarda
6312d8643b Merge pull request #4759 from ericrius1/dice 
changed dice script to only play sound locally on collision, to avoid ev...
 2015-05-04 14:27:09 -04:00
Eric Levin
d930c942ff changed dice script to only play sound locally on collision, to avoid every client which sees collision injecting audio and creating that overloud effect 2015-05-04 10:16:50 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Stephen Birarda
274e98974b Merge pull request #4734 from Atlante45/ac_fix 
Fix for bot_procedural
 2015-05-04 12:44:08 -04:00
Philip Rosedale
475dad6863 Add limit to grab range to reduce max energy added by grabbing 2015-05-02 16:25:48 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Stephen Birarda
6d0e612923 remove other tabs from moveJoints 2015-05-01 16:16:01 -07:00
Stephen Birarda
b32aecc456 fix tabs/spaces in moveJoints 2015-05-01 16:15:35 -07:00
Ryan Huffman
ddec694393 Update add-zone icon in edit.js 2015-05-01 15:38:06 -07:00
Seth Alves
5390630497 Merge pull request #4743 from huffman/sphere-color 
Add support for changing sphere color in edit.js
 2015-05-01 13:17:46 -07:00
Ryan Huffman
e7a8255af2 Replace zoneOverlayManager with internal drawZoneBoundaries 2015-05-01 13:02:28 -07:00
Ryan Huffman
7f84b27880 Add support for changing sphere color in edit.js 2015-05-01 11:59:39 -07:00
Seth Alves
6139fc0d73 Merge pull request #4738 from huffman/entity-naming 
Add 'name' property to entities
 2015-05-01 11:58:30 -07:00
Stephen Birarda
7a2a391852 add script to move joints for av rate testing 2015-05-01 11:53:20 -07:00
Eric Levin
3ee111d757 added script to generate a lot of physical blocks within a specified range 2015-05-01 09:56:21 -07:00
Eric Levin
cac5fa1371 refactored grab script using velocity and spring force 2015-05-01 09:39:39 -07:00
Ryan Huffman
73a5b8c4e2 Add support for 'name' to edit.js 2015-05-01 08:42:23 -07:00
Eric Levin
4c80633a41 fixed bug where non-script related content would be deleted on script ending 2015-04-30 16:42:32 -07:00
Atlante45
762e6255d6 Fix botProcedural include 2015-05-01 00:34:24 +02:00
Eric Levin
a9c5f044c8 changed grab script so user can only grab with left mouse click and we update velocityof grabbed object every frame instead of flinging it onb release 2015-04-30 11:39:27 -07:00
Eric Levin
45ba678686 can now fling up and down as well as in xz plane 2015-04-29 23:40:53 -07:00
Eric Levin
2b9ec8b6bf fixed bug in grab.js where drop line overlay was not showing in correct position on first grab 2015-04-29 22:13:26 -07:00
Brad Hefta-Gaub
40d2e97d44 Merge pull request #4673 from ctrlaltdavid/20496 
CR for 20496 - Modify lobby.js to work as avatar selector
 2015-04-29 21:51:08 -07:00
Brad Hefta-Gaub
f093c9e535 Merge pull request #4727 from huffman/edit-speedup 
Update edit.js to buffer mouseMove events
 2015-04-29 21:46:27 -07:00
Ryan Huffman
0d2991b9b0 Update edit.js to buffer mouseMove events 
This helps keep events from getting backed up on the event queue by
handling move events in the update() loop and dropping extra move events
that might come before an update.
 2015-04-29 16:24:36 -07:00
Eric Levin
489fbaac57 added grab.js to defaultScripts.js 2015-04-29 09:45:58 -07:00
Eric Levin
8b9236a18d added grab.js script, which allows users to grab and fling physical objects 2015-04-29 09:44:22 -07:00
David Rowe
9576ad19a7 Move "Stereo Audio" option into developerMenu.js 
And rename it "Stereo Input" to better relect what it does.
 2015-04-28 14:14:10 -07:00
Stephen Birarda
b387c3e93a Merge pull request #4689 from Atlante45/master 
Send generated touchEndEvent if we don't get one from Qt
 2015-04-24 13:07:12 -04:00
Atlante45
53577107de Formatting 2015-04-24 19:06:46 +02:00
Atlante45
e2b60d35f0 Generate touchEndEvent if last event was more than 50 ms ago 2015-04-24 18:50:03 +02:00
Brad Hefta-Gaub
6c830459a6 Merge pull request #4688 from huffman/fix-zone-overlay 
Fix new zone overlays not moving
 2015-04-24 09:09:17 -07:00
Ryan Huffman
6a48010c0b Fix new zone overlays not moving 2015-04-24 09:01:12 -07:00
Atlante45
82a53c9139 Turn off all sections then turn on selected one 
This fixes the issue of properties present in a couple sections but not
all that are going to only be displayed for the last section the are in
that is being processed.
 2015-04-24 16:53:39 +02:00
Atlante45
32b78f02b4 Group ShapeType and CompoundShapeURL + add it to Zones 2015-04-24 16:52:51 +02:00
Andrew Meadows
0daaf20f01 Merge pull request #4675 from sethalves/detect-ballistic 
Detect ballistic motion + fix up simulation-owner code + fix up EntityItem constructor
 2015-04-23 14:19:51 -07:00
ZappoMan
aac5675579 add full domain example 2015-04-23 13:45:00 -07:00
Seth Alves
bc65616bb3 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-23 13:09:22 -07:00
Brad Hefta-Gaub
33557e5b05 Merge pull request #4680 from huffman/edit-zone-limits 
Add limits to zone fields in entity properties window
 2015-04-23 12:42:32 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Ryan Huffman
1657c50920 Add limits to zone fields in entity properties window 2015-04-23 12:00:13 -07:00
Ryan Huffman
361bf7e441 Remove unnecessary print 2015-04-23 10:15:18 -07:00
Ryan Huffman
78207f0d51 Make zones pickable in edit.js while control is down 2015-04-23 10:00:05 -07:00
Ryan Huffman
30b9e16c1a Remove unused findRayIntersection from zoneOverlayManager 2015-04-23 09:52:21 -07:00
Ryan Huffman
d45e935b93 Add show zone overlay option to menu 2015-04-23 09:52:01 -07:00
Ryan Huffman
4a99c21e7b Add zoneOverlayManager.js 2015-04-23 09:36:53 -07:00
Ryan Huffman
6612f9cb61 Fix key light properties in proeprties window 2015-04-23 09:33:58 -07:00
Ryan Huffman
ab261f4443 Update zone overlay to only be visible when edit is on 2015-04-23 09:33:33 -07:00
Ryan Huffman
af46ece9af Remove overlays.js include 2015-04-23 09:33:10 -07:00
Ryan Huffman
af93634fcb Merge branch 'master' of github.com:highfidelity/hifi into edit-zones 2015-04-23 09:32:37 -07:00
Ryan Huffman
5654e3abed Add zone overlay manager 2015-04-23 09:32:15 -07:00
Atlante45
d18229d52d Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 15:58:57 +02:00
Atlante45
c91ca146d5 Add different shapes to zone example 2015-04-23 15:22:58 +02:00
Atlante45
837a0d3ba8 rename collision model in edit.js 2015-04-23 12:13:52 +02:00
Seth Alves
5a7f8a2f5a git rid of unneeded bump code. re-indent billiards.js and rez in balls with some y velocity so they fall to the table 2015-04-22 17:06:21 -07:00
ZappoMan
fb4e334c70 implement volume priority for zones 2015-04-22 12:38:34 -07:00
ZappoMan
ac81e3e847 added example script 2015-04-22 11:27:35 -07:00
David Rowe
2eb5059668 Display avatar images and change avatar upon selection 2015-04-22 10:59:53 -07:00
David Rowe
63d0efcdec Open and close avatar selector with Ctrl-A 2015-04-22 09:48:09 -07:00
David Rowe
24178b72fb Use lobby.js as starting point for avatarSelector.js 2015-04-22 09:48:08 -07:00
Ryan Huffman
3dfbd70d41 Add new zone button 2015-04-21 13:16:55 -07:00
Ryan Huffman
4e2bcc0690 Add zone properties to entity property panel 2015-04-21 12:47:11 -07:00
Sam Gateau
48364cb598 refined the names of the key light porperties in Stage 2015-04-21 11:04:14 -07:00
Sam Gateau
687ca7fee5 Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working 2015-04-17 19:00:40 -07:00
Sam Gateau
f1e0d5855e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 11:33:39 -07:00
Clément Brisset
59e75826fe Merge pull request #4634 from ctrlaltdavid/20471 
CR for Job #20471 - Create rain.js
 2015-04-17 16:33:27 +02:00
Sam Gateau
1c5c7cc239 faking a checkbox to do a boolean property control 2015-04-16 17:55:55 -07:00
Sam Gateau
b5b146b81b Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution 
Expose these to javascript
 2015-04-16 17:35:37 -07:00
Atlante45
2f2be70eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into generated_ratio 2015-04-15 17:30:57 +02:00
Atlante45
d2775fe9b3 Fix for people running older version of interface 2015-04-15 16:52:41 +02:00
Atlante45
5f9d7a00fa Correct default to pink noise 2015-04-15 16:22:18 +02:00
Atlante45
9ea72f2a03 Added generated audio to developer menu script 2015-04-15 16:16:13 +02:00
Ryan Huffman
b6942e2300 Fix stuck-spinners in entity properties 2015-04-14 10:11:52 -07:00
Andrew Meadows
0a5ae8e7e1 Merge pull request #4610 from thoys/20367 
CR for Job #20367 - Enable getPublicScripts, and getRunningScripts
 2015-04-13 08:42:39 -07:00
Philip Rosedale
4ad5a6c138 Merge pull request #4630 from Atlante45/fix_quick_turn 
Fix quick turn
 2015-04-10 13:43:36 -07:00
Andrew Meadows
e9159304d2 Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol 
Acceleration and owner in wire protocol
 2015-04-10 09:07:47 -07:00
Atlante45
910e13edeb Merge branch 'master' of https://github.com/highfidelity/hifi into fix_quick_turn 2015-04-10 17:51:32 +02:00
Atlante45
176f1beb08 Fix camera quick turn 2015-04-10 17:50:41 +02:00
Philip Rosedale
61e6c0461b Merge pull request #4628 from huffman/fix-selection-error 
Fix error in entity properties not showing selections
 2015-04-09 20:52:21 -07:00
Ryan Huffman
5a9ee73476 Fix error in entity properties not showing selections 2015-04-09 20:10:02 -07:00
David Rowe
d057573825 Set raindrops spinning 2015-04-09 19:38:15 -07:00
David Rowe
54c0aeaa03 Work around entities not always getting velocity set at creation 2015-04-09 18:57:58 -07:00
David Rowe
10ac6bc9ca Don't render overlay unless debug 2015-04-09 18:17:45 -07:00
David Rowe
54980f46a9 Set raindrops falling 2015-04-09 17:29:14 -07:00
David Rowe
66ea84977a Create raindrops at specified rate 2015-04-09 16:18:10 -07:00
David Rowe
00f42c1e6c Move to acScripts 2015-04-09 15:52:59 -07:00
David Rowe
e4e372b2a3 Create a raindrop with a lifetime 2015-04-09 15:51:19 -07:00
David Rowe
55b92f7d1e Circle of origin for rain 2015-04-09 15:18:31 -07:00
Thijs Wenker
cf403a7ad8 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-09 23:47:20 +02:00
Thijs Wenker
0cb5ee5bd1 - Scripts JS object renamed to ScriptDiscoveryService. 
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
 2015-04-09 23:46:49 +02:00
Clément Brisset
fea7a58774 Merge pull request #4605 from ericrius1/light 
Updated lightcontroller.js logic to find the nearest light when user cli...
 2015-04-09 22:49:22 +02:00
David Rowe
d6c15549e4 Tweak users display to work better with variety of backgrounds 2015-04-09 13:03:12 -07:00
Eric Levin
396325629e added back original light controller script 2015-04-09 10:43:34 -07:00
Eric Levin
c0e7cd1f6a deleted unnecessary line with typo 2015-04-09 09:50:12 -07:00
Seth Alves
73a1265624 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-09 09:21:06 -07:00
Philip Rosedale
f51cafa066 Merge pull request #4616 from huffman/marketplace-always-visible 
Marketplace always visible
 2015-04-08 20:51:51 -07:00
Seth Alves
2448051c75 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-08 15:39:40 -07:00
Seth Alves
1dd01cde00 expand svo to hold acceleration and id of current simulator node 2015-04-08 15:39:34 -07:00
Ryan Huffman
a0e324f9f5 Add error for when importing on a domain without permissions 2015-04-08 13:58:14 -07:00
Ryan Huffman
b6af9fde9e Make marketplace button always visible 2015-04-08 13:57:41 -07:00
Philip Rosedale
5e681ee56b Merge pull request #4615 from huffman/align-checkboxes 
Align checkboxes
 2015-04-08 13:39:25 -07:00
Ryan Huffman
e3dea8ccc8 Remove margin in entityProperties 2015-04-08 13:24:03 -07:00
Ryan Huffman
92b91c9a38 Fix checkboxes not aligning with label 2015-04-08 13:23:48 -07:00
Ryan Huffman
e2a7072270 Update new entity positioning to be in front of camera 2015-04-08 12:50:02 -07:00
Ryan Huffman
83918c53b9 Update entityProperties properties to take up less space 2015-04-08 10:18:29 -07:00
Ryan Huffman
dc503ac068 Update entityProperties checkboxes to be inlined 2015-04-08 10:18:04 -07:00
Eric Levin
b8719f6e5f made new alternative light script 2015-04-08 09:21:24 -07:00
Eric Levin
6de4cec836 made randomly chosen sound persistent between sessions by storing sound index in user data. Now using previous rotation and position to compute offset position 2015-04-08 09:20:29 -07:00
Eric Levin
a16f6c2ce4 remove unnecessary print statement 2015-04-07 19:35:41 -07:00
Eric Levin
9c220b3e9b light container now assigned 1 of 3 random light switch sounds. Also light now changes position based on container's change in position AND rotation. 2015-04-07 19:25:37 -07:00
David Rowe
7acc413c66 Change visibility radio buttons to pop-up menu 2015-04-07 10:43:50 -07:00
Eric Levin
7d2fa8d7ce Updated lightcontroller.js logic to find the nearest light when user clicks on light switch entity- this will allow lights to work even when a user has disabled other users from spawning items in his domain 2015-04-07 10:20:19 -07:00
David Rowe
a844b73fcc Move widget parameters into propeties 2015-04-07 09:27:53 -07:00
Thijs Wenker
af34add63c added example for the new Scripts functions: 
example\misc\scriptsExample.js
 2015-04-07 17:39:50 +02:00
David Rowe
187ca2a403 Widgetize pop-up menu 2015-04-07 00:38:07 -07:00
David Rowe
0cbe4d3673 Apply users filter per control value 2015-04-06 22:09:03 -07:00
David Rowe
798d6437b1 Add pop-up menu of "show me" values 2015-04-06 21:54:15 -07:00
David Rowe
6cd512762d Add "Show me" prompt, value, and button to users online window 2015-04-06 20:51:17 -07:00
David Rowe
5a86f21506 Remove "2D" from identifiers 2015-04-06 18:39:30 -07:00
Clément Brisset
efbd74f539 Merge pull request #4597 from huffman/light-overlays 
Light overlays
 2015-04-06 16:02:44 +02:00
Ryan Huffman
f311cc5f07 Add light overlays 2015-04-03 16:27:42 -07:00
Ryan Huffman
748534cb9a Fix spotlight checkbox on entity properties 2015-04-03 16:25:28 -07:00
Atlante45
0434b1fd28 Remove unload callback 2015-04-03 16:09:23 +02:00
Brad Davis
605cf19f6f Merge pull request #4565 from ctrlaltdavid/20422 
CR for #20422 - Add the ability to manage friends via Interface
 2015-04-02 14:10:40 -07:00
Clément Brisset
01dc1b058c Merge pull request #4580 from birarda/master 
use non-persistent settings to avoid lobby crash confusion
 2015-04-02 17:37:24 +02:00
Stephen Birarda
69f0c50a3c fix cleanup order to ensure environment is re-rendered 2015-04-01 17:50:12 -07:00
Stephen Birarda
862f26a095 put the friendly lobby back in default scripts 2015-04-01 17:41:17 -07:00
Stephen Birarda
40f7e683da don't attach iron man helmet while in lobby 2015-04-01 17:38:32 -07:00
Stephen Birarda
b27a86fb25 always render yourself, handle change of render values elsewhere 2015-04-01 17:36:43 -07:00
Stephen Birarda
03292fd869 allow developerMenuItems to handle new render options 2015-04-01 17:26:56 -07:00
Stephen Birarda
560f53b842 use new API to toggle environment from lobby 2015-04-01 17:08:15 -07:00
Ryan Huffman
775bbdaebb Remove unnecessary css 2015-04-01 16:04:52 -07:00
Ryan Huffman
0f518b6dbd Update styling of property spinners in edit.js 2015-04-01 16:02:21 -07:00
David Rowe
96e888864a Merge branch 'master' into 20422 2015-04-01 14:56:48 -07:00
Brad Hefta-Gaub
e6b770ea19 Merge pull request #4576 from birarda/master 
pull lobby from default scripts to avoid permanent iron man
 2015-04-01 14:23:46 -07:00
Stephen Birarda
d6f43287dc pull the lobby from default scripts to avoid permanent iron man 2015-04-01 14:21:43 -07:00
Philip Rosedale
b5f79c7e6e Merge pull request #4571 from huffman/select-all-edit 
Add select all on focus behavior to entity properties window
 2015-04-01 14:06:00 -07:00
Ryan Huffman
f0dd20b21e Merge pull request #4570 from samcake/orange 
Clean up the sunLightExample.js and create the cookies.js
 2015-04-01 13:55:03 -07:00
Philip Rosedale
cd40b82e7d Merge pull request #4568 from huffman/line-height-update 
Update edit.js lineHeight to be more usable
 2015-04-01 13:44:57 -07:00
Philip Rosedale
4ec1d304e0 Merge pull request #4567 from thoys/20423 
CR for Job #20423 - Take gun.js to the next level.
 2015-04-01 13:43:52 -07:00
Sam Gateau
9918357724 fix var declaration issues 2015-04-01 13:37:41 -07:00
Brad Hefta-Gaub
1de1527414 Merge pull request #4569 from ctrlaltdavid/20431 
CR for Job #20431 - Remove XMLHttpRequest file reading and model uploading
 2015-04-01 13:00:16 -07:00
Ryan Huffman
c835fb63c3 Add select all on focus behavior to entity properties window 2015-04-01 12:52:46 -07:00
Sam Gateau
695a5bcfd7 Adding the cookies sciprt that provide a simple ui useful for debug and example, complete the interface on the scene script interface to provide the getters 2015-04-01 12:23:31 -07:00
Sam Gateau
3b92910a91 Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters 2015-04-01 12:22:35 -07:00
Ryan Huffman
eb7d940ed9 Update edit.js lineHeight property handling 2015-04-01 11:36:05 -07:00
Thijs Wenker
f3ff48ab60 Merge branch 'master' of https://github.com/worklist/hifi into 20423 2015-04-01 19:14:14 +02:00
Thijs Wenker
bd8ea7bfc0 Merge branch 'master' of github.com:PhilipRosedale/hifi into 20423 
Conflicts:
	examples/controllers/hydra/gun.js
 2015-04-01 19:13:46 +02:00
Stephen Birarda
a1f1f7603d Merge pull request #4564 from PhilipRosedale/master 
Buttons at bottom in dice, gun so not to conflict with edit.js
 2015-04-01 09:06:34 -07:00
Thijs Wenker
f22c739642 updated gunscript 2015-04-01 16:26:55 +02:00
Philip Rosedale
9642bd199d Buttons at bottom 2015-03-31 22:12:06 -07:00
Philip Rosedale
8114fdd1e2 move button locations, names some constants in avatar controller 2015-03-31 21:51:50 -07:00
David Rowe
e06f28b7c5 Merge branch 'master' into 20422 
Conflicts:
	examples/users.js
	interface/src/Application.cpp
 2015-03-31 21:01:54 -07:00
Eric Levin
fd3fc0acdd added unload function to lightController.js so light is deleted when it's parent entity is 2015-03-31 19:08:30 -07:00
Seth Alves
04901e99fc fix error message 2015-03-31 18:41:29 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
David Rowe
edaa4cdc65 Remove local file reading from scripts 2015-03-31 16:57:15 -07:00
Philip Rosedale
9635c6d248 Merge branch 'master' of https://github.com/worklist/hifi 2015-03-31 16:29:55 -07:00
Philip Rosedale
b7f0be761c gun buildings fall on creation, dice stops correctly 2015-03-31 16:27:09 -07:00
Brad Hefta-Gaub
867c8078bd Merge pull request #4553 from PhilipRosedale/master 
Blocks fall when made, better edge colors
 2015-03-31 15:53:44 -07:00
Philip Rosedale
f4695643e3 Blocks fall when made, better edge colors 2015-03-31 14:13:19 -07:00
Brad Hefta-Gaub
434349d947 Merge pull request #4541 from ctrlaltdavid/20428 
CR for Job #20428 - Add the ability to minimize/maximize users.js
 2015-03-31 13:09:46 -07:00
Ryan Huffman
79305141d1 Fix edit.js not selecting all when tabbing between properties 2015-03-31 10:51:07 -07:00
Philip Rosedale
0c9e6ad3c0 Merge pull request #4543 from stojce/20397 
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
 2015-03-31 08:13:54 -07:00
David Rowe
495b62b356 Add minimized state 2015-03-30 20:46:39 -07:00
David Rowe
622f10bd25 Add minimize button 2015-03-30 20:46:38 -07:00
Philip Rosedale
5cd031739b Merge pull request #4536 from PhilipRosedale/master 
Fix error with angular speed
 2015-03-30 17:07:22 -07:00
Philip Rosedale
63c1bdd0a8 Fix error with angular speed 2015-03-30 17:03:09 -07:00
Stephen Birarda
9f0e146782 Merge pull request #4530 from birarda/master 
fix for marketplace URL on right click
 2015-03-30 15:15:01 -07:00
Stephen Birarda
909c4ad919 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-30 15:10:53 -07:00
Stephen Birarda
75da852b39 fix for marketplace url on right click 2015-03-30 15:10:16 -07:00
Stojce Slavkovski
72f1f5ba62 stop makeHouses.js gracefully 
remove exit cleanup
 2015-03-30 22:08:26 +02:00
Stojce Slavkovski
eb46a4b647 Merge branch 'master' of https://github.com/highfidelity/hifi into 20397 2015-03-30 21:23:23 +02:00
Philip Rosedale
685de8cc7f Merge pull request #4522 from huffman/rename-attribution 
Rename attribution to marketplaceID
 2015-03-30 10:57:28 -07:00
David Rowe
cbf2012bf5 Add menu items that set visibility 
And synchronize visibility settings between Interface and users.js.
 2015-03-29 18:35:56 -07:00
David Rowe
be69c0b58f Add add/remove friends menu item 
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
 2015-03-28 13:05:23 -07:00
Stojce Slavkovski
463625f101 revert cleanup 2015-03-28 00:53:57 +01:00
Stojce Slavkovski
42a1079322 limit 20 per sec. / don't delete on script stop 2015-03-28 00:27:57 +01:00
David Rowe
418ff5929e Make friends add/remove button open WebWindow dialog 2015-03-27 15:38:20 -07:00
David Rowe
4e6dcf0d8e Add friends add/remove button 2015-03-27 15:38:20 -07:00
Ryan Huffman
ed62356f65 Remove attribution field from edit properties window 2015-03-27 13:36:56 -07:00
Ryan Huffman
1bdfa3abb5 Update right-click menu to look for marketplaceID 2015-03-27 13:36:22 -07:00
David Rowe
90c1da2094 Merge branch 'master' into 20416 
Conflicts:
	examples/notifications.js
 2015-03-27 12:13:29 -07:00
Ryan Huffman
36c79ccc03 Merge pull request #4520 from cozza13/20426 
CR for Job #20426 - Remove references to models out of edit.js
 2015-03-27 09:39:36 -07:00
Chris Collins
83af2feded Remove reference to FBX files 
Remove reference to FBX files
 2015-03-27 09:33:19 -07:00
Ryan Huffman
c9f4f4626b Update default light color to (150,150,150) 2015-03-27 09:21:32 -07:00
Brad Hefta-Gaub
7f74bd1ae9 Merge pull request #4513 from ctrlaltdavid/20421 
CR for Job #20421 - Add scrollbar to Users Online window
 2015-03-26 16:50:30 -07:00
Brad Hefta-Gaub
0cee3892ff Merge pull request #4516 from huffman/fix-edit-buttons 
Fix marketplace showing for all edit properties buttons
 2015-03-26 16:38:47 -07:00
Ryan Huffman
28e2e65da9 Fix marketplace showing for all edit properties buttons 2015-03-26 16:23:36 -07:00
ZappoMan
8e7ead2ead fix locking issue in enter/leave entity scripts 2015-03-26 16:05:31 -07:00
David Rowe
ef9d665146 Highlight scrollbar when it is being moved 2015-03-26 12:22:27 -07:00
David Rowe
876f3e8a23 Scroll when click above or below bar 2015-03-26 12:22:26 -07:00
David Rowe
c7fe7aa157 Update users displayed per scrollbar position 2015-03-26 12:22:26 -07:00
David Rowe
14e92eecad Click and drag scrollbar 2015-03-26 12:22:25 -07:00
David Rowe
1e1a277065 Scrollbar bar height varies with percentage of users displayed 2015-03-26 12:22:24 -07:00
David Rowe
98c88aab04 Handle no users able to be displayed, insufficient screen height 2015-03-26 12:22:23 -07:00
David Rowe
ba1a7c6761 Show/hide scrollbar depending on whether needed or not 2015-03-26 12:22:23 -07:00
David Rowe
567375368e Show first N users that can fit 2015-03-26 12:22:22 -07:00
David Rowe
8e66f5998a Add scrollbar background and bar 2015-03-26 12:22:21 -07:00
David Rowe
7c4ea855a8 Limit height of users window per screen space available 2015-03-26 12:22:20 -07:00
Brad Hefta-Gaub
918154e407 Merge pull request #4491 from huffman/export-json 
Update export entities to export as JSON
 2015-03-25 16:49:23 -07:00
Philip Rosedale
4cfa4ada92 Merge pull request #4508 from huffman/right-click-marketplace 
Right click marketplace menu
 2015-03-25 16:36:23 -07:00
Philip Rosedale
29b9212259 Merge pull request #4501 from Atlante45/light_types 
Light types
 2015-03-25 16:34:05 -07:00
Philip Rosedale
0c85881908 Merge pull request #4504 from huffman/disable-duplicate-on-locked-entity 
Disable duplicate on locked entity
 2015-03-25 16:31:49 -07:00
Stephen Birarda
f075674415 Merge pull request #4502 from huffman/webwindow-open-url 
Add more functionality to WebWindow (get/set url, raise)
 2015-03-25 13:25:29 -07:00
Ryan Huffman
b5b1c5a90b Remove extraneous print 2015-03-25 12:30:42 -07:00
Ryan Huffman
b8174b164f Update marketplace popup to hide on position or orientation change 2015-03-25 12:30:00 -07:00
Ryan Huffman
d07acfe9ac Add right-click marketplace popup 2015-03-25 12:29:38 -07:00
Ryan Huffman
8eed2b6603 Add PopupMenu to edit.js 2015-03-25 12:28:56 -07:00
Ryan Huffman
ea3ec91f71 Remove inspect tool from edit.js 2015-03-25 12:27:15 -07:00
Leonardo Murillo
d1d183e190 More .com changes 2015-03-25 13:05:10 -06:00
Ryan Huffman
5b4b78043a Remove unneeded print messages 2015-03-25 11:22:28 -07:00
Ryan Huffman
dec89ba96f Disable duplicating locked entities 2015-03-25 11:22:07 -07:00
Ryan Huffman
bb4417acc6 Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url 2015-03-25 10:49:24 -07:00
Atlante45
715fe1096f Random but persistant switch sound 2015-03-25 17:33:27 +01:00
Atlante45
725a8795fb Merge branch 'master' of https://github.com/highfidelity/hifi into light_types 2015-03-25 16:39:11 +01:00
Atlante45
19886bd33c Better handling of callback 2015-03-25 16:38:27 +01:00
Atlante45
afb96709f1 Only update userData when light entity is identified 2015-03-25 15:44:37 +01:00
Atlante45
92d3944044 Use preOp function for all common checks/updates 2015-03-25 15:04:06 +01:00
Philip Rosedale
9c24d2d0eb Merge pull request #4496 from stojce/20397 
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
 2015-03-24 17:35:44 -07:00
ZappoMan
0e44126106 added LOD Warnings to notifications.js 2015-03-24 16:38:13 -07:00
Ryan Huffman
d54526b8bb Merge branch 'master' of git://github.com/highfidelity/hifi into webwindow-openurl 2015-03-24 15:43:36 -07:00
Ryan Huffman
a901bc4b11 Update edit.js to export as .svo.json 2015-03-24 10:28:12 -07:00
David Rowe
cb6abfb2e6 Display notification if domain connection refused 2015-03-23 12:05:56 -07:00
Atlante45
c26f17e16b Update from light properties 2015-03-23 18:36:40 +01:00
Atlante45
ea0f3f05e7 Tune sound down 2015-03-23 17:55:23 +01:00
Atlante45
fdfdba5d2d Couple tweaks 2015-03-23 17:46:57 +01:00
Atlante45
963be820d0 Remove comments 2015-03-23 17:28:11 +01:00
Atlante45
40ed0146e2 Better handling of erased lights 2015-03-23 17:26:43 +01:00
Atlante45
30ea2eb722 Nicer way to update light Properties 2015-03-23 17:20:21 +01:00
Atlante45
efd177d80d Fix property save 2015-03-23 17:06:34 +01:00
Atlante45
66f954142a Fix light multiple creations 2015-03-23 17:06:12 +01:00
Atlante45
5fadcbe7d9 Prints cleanup 2015-03-23 17:05:46 +01:00
Atlante45
6b4845abf3 Some improvements to lightController 2015-03-23 16:47:24 +01:00
Atlante45
34248ea8fd Merge branch 'master' of https://github.com/highfidelity/hifi into light_types 2015-03-23 13:04:34 +01:00
Atlante45
34ab470624 lightController first draft 2015-03-20 21:21:18 +01:00
Atlante45
e4e0e2fd6b Update Edit.js HTML to display attribution property 2015-03-20 18:04:05 +01:00
Stojce Slavkovski
57011c2d4b get models from S3 2015-03-19 20:55:18 +01:00
Stojce Slavkovski
d0c4dddc1b Merge branch 'master' of https://github.com/highfidelity/hifi into 20397 2015-03-19 19:34:34 +01:00
Stojce Slavkovski
00f1d96af5 Use existing house models 2015-03-18 19:30:08 +01:00
ZappoMan
9dd913bd6d add copyright header to LODWarning.js 2015-03-17 15:51:08 -07:00
ZappoMan
6dbdfb7e7b add LODWarning.js to default scripts 2015-03-17 15:49:34 -07:00
ZappoMan
37ccd7b9f8 add LOD warnings script 2015-03-17 15:47:23 -07:00
Stojce Slavkovski
af789f842d #20397 initial version of script 2015-03-17 22:47:18 +01:00
ZappoMan
1e03335012 implement scripting interface for LODManager 2015-03-17 13:18:29 -07:00
Ryan Huffman
66517fa1c0 Add ability to show marketplace url from edit properties 2015-03-17 09:07:33 -07:00
Atlante45
c421adaf58 Fix unresolve merge conflict 2015-03-16 16:27:33 +01:00
Atlante45
ad16f49d01 Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-16 14:28:24 +01:00
Clément Brisset
dfd39ca1e1 Merge pull request #4448 from huffman/loading-image 
Add hourglass image to loading svo overlay
 2015-03-16 06:25:41 -07:00
Clément Brisset
934d9c087a Merge pull request #4447 from ctrlaltdavid/20394 
CR for Job #20394 - Build friends.js v1
 2015-03-16 06:24:35 -07:00
Stephen Birarda
641581a825 Merge pull request #4446 from huffman/marketplace-window 
Marketplace window
 2015-03-13 17:51:44 -07:00
Ryan Huffman
76f474bff1 Add hourglass image to loading svo overlay 2015-03-13 14:48:33 -07:00
Ryan Huffman
d512a67c8a Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays 2015-03-13 14:13:56 -07:00
Ryan Huffman
dc3453a878 Add Window.raiseMainWindow() 2015-03-13 14:10:46 -07:00
David Rowe
67b2d0c8ab Trim text to fit in window 2015-03-13 12:18:49 -07:00
David Rowe
f49ed0951e Fix clickable areas 2015-03-13 12:04:43 -07:00
Ryan Huffman
33f255fad2 Merge branch 'master' of github.com:highfidelity/hifi into marketplace-window 2015-03-13 11:46:21 -07:00
Ryan Huffman
905de8b03c Adjust marketplace window size 2015-03-13 11:46:15 -07:00
Atlante45
36814e837b Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-13 19:05:17 +01:00
Ryan Huffman
e94bac1971 Fix subimage indexing in toolBars.js 2015-03-13 10:07:31 -07:00
Ryan Huffman
504dceda6b Update edit.js icons 2015-03-13 10:07:12 -07:00
Stephen Birarda
edaee9716b Merge pull request #4438 from huffman/edit-rename 
Move editEntities.js to edit.js
 2015-03-13 09:39:34 -07:00
Clément Brisset
f5777867da Merge pull request #4439 from ctrlaltdavid/20394 
CR for Job #20394 - Build friends.js v1
 2015-03-13 09:00:14 -07:00
Atlante45
55a88e6076 Allow selection of all entities inside box in editEntities 2015-03-13 16:24:33 +01:00
Ryan Huffman
a3c2df5c77 Add menu option to turn on/off showing lights in edit mode 2015-03-12 16:16:29 -07:00
Ryan Huffman
165199c69d Update light overlay size 2015-03-12 15:55:31 -07:00
Ryan Huffman
2bedd1cfc7 Move editEntities.js to edit.js 2015-03-12 12:39:06 -07:00
Ryan Huffman
ebf70f818a Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2 
Conflicts:
	examples/editEntities.js
 2015-03-12 11:39:26 -07:00
Ryan Huffman
4335a41002 Update editEntities to call setActive on init 2015-03-12 11:38:51 -07:00
Ryan Huffman
c13ba4a318 Add toggling of light visibility 2015-03-12 11:38:29 -07:00
Ryan Huffman
ccbbba3def Update light default dimensions 2015-03-12 11:18:42 -07:00
Ryan Huffman
d82598327b Add light overlays 2015-03-12 11:18:32 -07:00
Brad Hefta-Gaub
f91a19a918 Merge pull request #4424 from huffman/open-svo 
Handle drag-n-dropped .svos and using interface to open .svo files
 2015-03-12 08:15:25 -07:00
David Rowe
dfd9506223 Add user location after username 
Credit @nbq
 2015-03-11 21:20:47 -07:00
David Rowe
2e16794615 Change font size to 12 2015-03-11 21:18:53 -07:00
David Rowe
eb22b0085b Add radio buttons 2015-03-11 20:05:35 -07:00
David Rowe
a109a18bc3 Add visibility control 2015-03-11 19:28:29 -07:00
Ryan Huffman
1904e5e209 Make look.js the default look script and remove the old scripts 2015-03-11 16:17:44 -07:00
Ryan Huffman
76ebac1185 Add import svo requests in editEntities 2015-03-11 15:44:26 -07:00
Philip Rosedale
cc3a86af94 Merge pull request #4419 from huffman/merge-touch-mouse 
Add look.js
 2015-03-11 14:40:27 -07:00
David Rowe
549eead9f2 Prepare to add visibility control 2015-03-11 12:36:57 -07:00
Clément Brisset
885e6206e9 Merge pull request #4420 from ctrlaltdavid/20394 
CR for Job #20394 - Build friends.js v1
 2015-03-11 11:17:04 -07:00
David Rowe
fd423e5019 Fix units 2015-03-11 11:07:02 -07:00
David Rowe
1a18decc6d Fix typo 2015-03-11 10:49:36 -07:00
David Rowe
bbffa6474b Add users.js to default scripts 2015-03-11 10:32:14 -07:00
David Rowe
532e4feebb Remove dead code and fix typos 2015-03-11 10:30:09 -07:00
Ryan Huffman
6c978c0ff3 Add look.js 
Merges both lookWithMouse and lookWithTouch, and updates mouse look to
only work with right-click
 2015-03-11 10:27:38 -07:00
David Rowe
22ff97fd27 Make visible by default 2015-03-11 10:25:24 -07:00
David Rowe
d36399c65d Add heading 2015-03-11 10:21:49 -07:00
David Rowe
c30bf5667f Fix teleporting to user 2015-03-11 10:15:34 -07:00
Ryan Huffman
e4f7e35587 Hide edit tools when inactive 2015-03-11 10:10:11 -07:00
David Rowe
ad08a7dde2 Position window at bottom left of screen 2015-03-11 09:37:18 -07:00
David Rowe
a3c4429e0b Longer wait until requesting status again after request error 2015-03-11 09:36:26 -07:00
David Rowe
d071bc50a4 Change from paragraph of usernames to single column of usernames 2015-03-10 17:20:08 -07:00
Brad Hefta-Gaub
6f24a62758 Merge pull request #4414 from birarda/master 
workaround for missing touch begin event in 5.4.x
 2015-03-10 17:09:33 -07:00
Stephen Birarda
3579bb46ab handle touch update without a touch begin event 2015-03-10 17:04:30 -07:00
Philip Rosedale
2e85cf7459 Merge pull request #4413 from birarda/master 
fix stereo to stereo resampling via soxr
 2015-03-10 16:09:31 -07:00
Stephen Birarda
8ede9fb39b fix stereo to stereo resampling 2015-03-10 15:50:30 -07:00
Seth Alves
cf20596d6d Merge pull request #4406 from ZappoMan/svoFromURL 
Support for importing from a network URL
 2015-03-10 15:41:41 -07:00
David Rowe
4e8fcd47c0 Show/hide users window with menu item 2015-03-10 13:51:25 -07:00
Philip Rosedale
182a1a726d remove debug 2015-03-10 13:34:16 -07:00
Philip Rosedale
2d6c51ac77 Detect moving objects before catching them 2015-03-10 13:32:56 -07:00
David Rowe
59762175e4 Grow/shrink window as size of users list changes 2015-03-10 12:44:34 -07:00
ZappoMan
e16961c958 removed dead code 2015-03-10 12:36:31 -07:00
ZappoMan
feddea821a cleanup import from file vs url 2015-03-10 12:35:12 -07:00
David Rowe
a4fe9c1a12 Click on username to TP to them 2015-03-10 12:32:48 -07:00
ZappoMan
5facb39aa7 support for import entities from network URL 2015-03-10 12:21:37 -07:00
David Rowe
63d8da0233 Display user names in 2D window 2015-03-10 10:57:47 -07:00
David Rowe
d25d3bc6ab Get users online from Web API 2015-03-10 10:57:46 -07:00
Andrew Meadows
a758ccd75a Merge pull request #4402 from birarda/master 
add underlying controls for user discoverability
 2015-03-10 08:30:46 -07:00
Stephen Birarda
2f22c0cd96 cleanup username API from GlobalServicesScriptingInterface 2015-03-09 16:28:01 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Andrew Meadows
51d05cc43e merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-03-09 08:51:49 -07:00
Seth Alves
08c3fa6363 merge from upstream 2015-03-08 17:29:05 -07:00
Seth Alves
cdeda67942 Collision Model url 2015-03-07 20:25:18 -08:00
Seth Alves
1bf8054cec Collision Model 2015-03-07 20:24:50 -08:00
Seth Alves
f6948193f1 add fields for collision model url 2015-03-07 20:24:11 -08:00
Seth Alves
72ebae72c0 allow adding entities with model urls that end in .obj 2015-03-07 20:22:32 -08:00
Andrew Meadows
ba6e66f169 merge upstream/master into andrew/isentropic 2015-03-07 18:03:49 -08:00
Andrew Meadows
5b854857c1 fix JS scripts to use radians per second 
in entity properties
 2015-03-07 18:02:41 -08:00
David Rowe
d112c455e2 Add hmdDefaults.js script 2015-03-06 17:49:31 -08:00
Brad Hefta-Gaub
fd6f8c7792 Merge pull request #4382 from huffman/import-export 
Improvements to Import/Export entities
 2015-03-06 16:31:57 -08:00
Ryan Huffman
b3631de93c Remove print statements from entityList.js 2015-03-06 12:03:36 -08:00
Ryan Huffman
9247ccd7b3 Remove ExportMenu.js and ModelImporter.js 2015-03-05 13:55:22 -08:00
Ryan Huffman
08b905095d Remove Paste Models and rename Import/Export to Entities 2015-03-05 13:54:27 -08:00
Ryan Huffman
a2617b2c96 Update editEntities import/export 2015-03-05 13:52:59 -08:00
Stephen Birarda
8f2dc7e38b resolve conflicts on merge with upstream master 2015-03-03 12:22:25 -08:00
Brad Hefta-Gaub
b88d52a310 Merge pull request #4363 from huffman/block-restricted-users 
Add permission-checking to edit entities
 2015-03-03 11:04:46 -08:00
Stephen Birarda
03de43d451 simplify notifications.js after chat removal 2015-03-03 10:22:57 -08:00
Stephen Birarda
cf227b94de remove global services example that leveraged xmpp 2015-03-03 10:17:53 -08:00
Stephen Birarda
a893f11ad7 remove load script from message that used xmpp 2015-03-03 10:17:29 -08:00
Clément Brisset
5ef86f88f5 Merge pull request #4364 from huffman/save-on-blur 
Fix properties window changes not taking affect when losing focus
 2015-03-03 08:35:49 -08:00
Ryan Huffman
98e0f235cc Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users 2015-03-02 14:47:26 -08:00
Brad Hefta-Gaub
6d8ccfbc2a Merge pull request #4357 from huffman/update-light-entity-properties 
Update light entity properties
 2015-03-02 13:51:48 -08:00
Ryan Huffman
f739bf2116 Fix properties window changes not taking affect when losing focus 2015-03-02 11:20:00 -08:00
Ryan Huffman
26e3b331ee Update editEntities.js lock checking to use event instead of polling 2015-03-02 10:42:09 -08:00
Ryan Huffman
0638459052 Add permission-checking to edit entities 2015-03-02 09:51:41 -08:00
Ryan Huffman
a48c428f42 Update highlighted handle color 2015-02-27 15:29:00 -08:00
Ryan Huffman
dc2cb93cce Add degrees symbol to rotation degrees text 2015-02-27 15:11:43 -08:00
Ryan Huffman
a0d9e92c64 Update size of rotation overlay 2015-02-27 15:11:23 -08:00
Ryan Huffman
4f4ab144b2 Update handle colors and up/down arrow image 2015-02-27 15:10:56 -08:00
Ryan Huffman
cd3281521c Update size of rotation degrees text 2015-02-27 15:08:29 -08:00
Ryan Huffman
3ffd47a0b0 Update editEntities rotation arrows 2015-02-27 15:08:13 -08:00
Ryan Huffman
20f3d23ae7 Update editEntities to use new light properties 2015-02-27 13:46:26 -08:00
Brad Hefta-Gaub
addc729654 Merge pull request #4350 from huffman/multi-select 
Multi select properties for edit entities
 2015-02-27 10:54:42 -08:00
Brad Hefta-Gaub
08dc883b0e Merge pull request #4351 from huffman/update-light-properties 
Update light properties (primarily for editEntities.js)
 2015-02-27 10:54:19 -08:00
Brad Hefta-Gaub
e78b2ced4a Merge pull request #4349 from huffman/no-nearby-entities-msg 
Add message to edit entities list for when no entities are nearby
 2015-02-27 10:53:17 -08:00
Sam Gateau
c7eeebe52c and fixing a bug with shadowing of lightmapped surface 2015-02-26 18:07:43 -08:00
Sam Gateau
74f0d98fd6 REfining the naming and introducing an orientation offset 2015-02-26 17:44:04 -08:00
Sam Gateau
f6a9bd1870 REfining the naming and introducing an orientation offset 2015-02-26 17:26:41 -08:00
Ryan Huffman
74bc48ce55 Add message to edit entities list for when no entities are nearby 2015-02-26 14:34:32 -08:00
Ryan Huffman
ecc003c5e1 Adjust colors for disabled input elements 2015-02-26 14:23:25 -08:00
Ryan Huffman
3c5f11e6ed Add initial support for multi-selection in properties window 2015-02-26 14:23:11 -08:00
Sam Gateau
96d5a2ab42 fixing tab maybe 2015-02-26 12:10:08 -08:00
Sam Gateau
bc8d688cde fixing tab maybe 2015-02-26 12:04:33 -08:00
Ryan Huffman
c3a7257439 Remove unused light properties from entity properties window 2015-02-26 11:03:06 -08:00
Sam Gateau
fcb293d0b2 CLean up before pr 2015-02-26 10:45:00 -08:00
Sam Gateau
a757229c0e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-25 19:18:01 -08:00
Sam Gateau
b4cb5ca9d1 add an example script to control the sun light 2015-02-25 19:09:18 -08:00
Brad Hefta-Gaub
8c26be49d7 Merge pull request #4330 from huffman/edit-off-on-domain-change 
Turn editEntities off on domain change
 2015-02-24 20:11:39 -08:00
Brad Hefta-Gaub
9ded2699e2 Merge pull request #4327 from thoys/20364 
CR for Job #20364 - Add toggle to turn off sounds in notifications.js
 2015-02-24 20:06:57 -08:00
Philip Rosedale
573390b429 fix dice for collision shapes, add angular velocity 2015-02-24 11:55:41 -08:00
Philip Rosedale
9d021a1a1e remove unused line 2015-02-24 11:49:12 -08:00
Philip Rosedale
7489b468f3 give angular velocity to the thrown ball 2015-02-24 11:48:35 -08:00
Ryan Huffman
c9818c184a Update editEntities to turn off when switching domains 2015-02-24 10:47:55 -08:00
Thijs Wenker
793116b90c ability to mute all notifications or just certain types 2015-02-23 21:00:26 +01:00
Andrew Meadows
f2fc781523 change shapeType to use strings in billiards.js 2015-02-23 11:42:36 -08:00
Andrew Meadows
456acd8833 merge upstream/master into andrew/bispinor 2015-02-23 11:41:40 -08:00
Andrew Meadows
d5733f3782 Merge pull request #4318 from PhilipRosedale/master 
Billiard balls are now textured models
 2015-02-20 17:59:33 -08:00
Andrew Meadows
27e6f99deb use strings for shapeType for JS Entity properties 2015-02-20 16:54:58 -08:00
Ryan Huffman
cf0b13f869 Update notifications.js audio to be local-only 2015-02-20 14:22:59 -08:00
Brad Hefta-Gaub
5d6d9bb1d4 Merge pull request #4320 from huffman/fix-camera-move-on-mirror 
Fix entity camera tool from taking over in mirror mode
 2015-02-20 10:40:03 -08:00
Brad Hefta-Gaub
32bbc8d551 Merge pull request #4317 from birarda/master 
dynamically grab animation URL as model URL from model
 2015-02-20 10:39:30 -08:00
Ryan Huffman
c665a3873d Fix entity camera tool from taking over in mirror mode 2015-02-20 10:11:55 -08:00