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

2639 commits

Author SHA1 Message Date
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
Philip Rosedale
66d1eeb327 Add textured models as balls 2015-02-19 21:11:51 -08:00
Stephen Birarda
51ad631c54 dynamically grab animation URL as model URL from model 2015-02-19 13:14:46 -08:00
David Rowe
a947cda0b2 Update SVG URL to Amazon S3 2015-02-18 13:02:37 -08:00
Clément Brisset
87f4ae2425 Merge pull request #4304 from thoys/20245 
CR for Job #20245 - Implement UI sounds for virtualKeyboard & notifications
 2015-02-18 09:55:34 -08:00
Thijs Wenker
d10f37291b check if sounds are downloaded before play thanks @Atlante45 2015-02-18 18:25:16 +01:00
Clément Brisset
7183400e43 Merge pull request #4305 from ctrlaltdavid/20308 
CR for Job #20308 - Refine progress.js
 2015-02-18 08:10:57 -08:00
Andrew Meadows
1c8f1bbcdd Merge pull request #4299 from talentraspel/20338 
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMou…
 2015-02-17 17:47:47 -08:00
Thijs Wenker
96b3114a36 style 2015-02-17 23:37:37 +01:00
Thijs Wenker
4d12a6d81c Merge branch 'master' of https://github.com/worklist/hifi into 20245 
Conflicts:
	examples/notifications.js
 2015-02-17 23:30:58 +01:00
Kai Ludwig
4048627de7 2n try: removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script. 2015-02-17 18:50:20 +01:00
Kai Ludwig
fa1bcc43e6 removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script. 2015-02-17 18:40:20 +01:00
Andrew Meadows
5cd1950bed Merge pull request #4297 from huffman/fix-mouse-look-clash 
Fix mouse look clash
 2015-02-17 09:33:50 -08:00
Andrew Meadows
d896f3a811 Merge pull request #4252 from thoys/20224 
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
 2015-02-17 09:03:17 -08:00
Ryan Huffman
97e70920ce Move handling of add model buttons to mouseRelease 2015-02-17 08:23:39 -08:00
Ryan Huffman
d1f7a730ad Make add-model button non-selectable 2015-02-17 08:23:11 -08:00
Brad Hefta-Gaub
f6ff0665ca Merge pull request #4286 from huffman/fix-nat-dims 
Fix "reset to natural dimensions" when dimensions not known
 2015-02-13 16:31:34 -08:00
Ryan Huffman
2df850eb8d Fix natural dimensions check 2015-02-13 15:02:16 -08:00
Ryan Huffman
0495833ca6 Disallow entity models to be reset to natural dimensions if unknown 2015-02-13 15:00:37 -08:00
Brad Hefta-Gaub
5c048db5f5 Merge pull request #4284 from sethalves/fix-butterflies 
if butterflies stop moving, they are no longer kinematic, so give them a velocity
 2015-02-13 12:45:08 -08:00
Seth Alves
6ff4f8c2c0 give butterflies an initial velocity so that they are on the kinematics list 2015-02-13 11:52:23 -08:00
Brad Hefta-Gaub
59b2c38eb1 Merge pull request #4277 from huffman/fix-select-box 
Update editEntities to not select new entity when edit tools are off
 2015-02-13 10:50:11 -08:00
Andrew Meadows
d69efa03d8 Merge pull request #4276 from birarda/master 
repairs to memory management for AudioInjectors
 2015-02-13 10:15:07 -08:00
Thijs Wenker
062c2cbcee HUD LookAt positions could be NULL now if whenever they're out of range 
HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D()
HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()
 2015-02-12 22:55:44 +01:00
Ryan Huffman
813673b720 Fix grid tool not showing minor grid width 2015-02-12 13:19:09 -08:00
Ryan Huffman
a3d09e6adc Fix edit grid not showing up 2015-02-12 13:18:58 -08:00
Ryan Huffman
51ce8c7100 Update editEntities to not select new entity when edit tools are off 2015-02-12 13:09:37 -08:00
Stephen Birarda
0154ac9734 final script repairs for new AudioInjector API 2015-02-12 11:52:20 -08:00
Stephen Birarda
1120a5f963 use new injector API in inWorldTestTone 2015-02-12 11:50:48 -08:00
Stephen Birarda
eda7d8ffb1 use new injector APIs in movable script 2015-02-12 11:49:01 -08:00
Stephen Birarda
70e085009b use injector restart in airGuitar script 2015-02-12 11:44:14 -08:00
Stephen Birarda
5715642e04 fix for restart API in lobby script 2015-02-12 11:13:30 -08:00
Stephen Birarda
ea52cea5dd more cleanup for AudioInjector mem management 2015-02-12 10:56:40 -08:00
Stephen Birarda
7becf62ba9 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-12 10:28:04 -08:00
Brad Hefta-Gaub
fa5eebd93e Merge pull request #4269 from AndrewMeadows/thermonuclear 
ModelEntityItem gets _shapeType
 2015-02-12 10:06:01 -08:00
Andrew Meadows
5bb504ad55 Merge pull request #4268 from huffman/remove-upload-model 
Remove upload from file from editEntities.js
 2015-02-12 08:57:22 -08:00
Stephen Birarda
e3c4ead323 remove unecessary injector stops 2015-02-11 16:23:57 -08:00
Stephen Birarda
05b7cd819e use isPlaying property instead of getter 2015-02-11 16:21:45 -08:00
Stephen Birarda
f9174366dc fixes for new injector API in other scripts 2015-02-11 16:20:48 -08:00
Stephen Birarda
d8646f6ea0 repairs for new injector API in air guitar script 2015-02-11 16:17:10 -08:00
Stephen Birarda
6a5c0fd9f2 repairs for new injector API in lobby script 2015-02-11 16:16:01 -08:00
Thijs Wenker
cb09656624 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-11 22:58:27 +01:00
Thijs Wenker
2c52c9c3c0 fixes for the virtualKeyboardTextEntityExample 2015-02-11 22:57:59 +01:00
Andrew Meadows
9f59addbc2 merge upstream/master into andrew/thermonuclear 2015-02-11 13:35:28 -08:00
Ryan Huffman
957686e12e Remove upload from file from editEntities.js 2015-02-11 09:04:56 -08:00
Andrew Meadows
13c953494c Merge pull request #4264 from huffman/entity-resize 
Increase entity-resize timeout to 2 minutes
 2015-02-11 09:02:26 -08:00
Andrew Meadows
68c1e9ef71 Merge pull request #4260 from birarda/master 
replace data with metaverse for highfidelity urls, allow optional gvr-interface build
 2015-02-11 09:02:18 -08:00
Andrew Meadows
d9b57de649 merge upstream/master into andrew/thermonuclear 2015-02-11 08:56:34 -08:00
Andrew Meadows
ac8db02029 add ShapeType to UI of entity properties editor 2015-02-11 08:54:35 -08:00
Ryan Huffman
6eca8610b6 Increase entity-resize timeout to 2 minutes 2015-02-10 15:54:04 -08:00
Brad Hefta-Gaub
3e8f7dc3da Merge pull request #4263 from huffman/text-size 
Increase size of text entity
 2015-02-10 15:04:32 -08:00
Ryan Huffman
9997ef1b97 Increase size of text entity 2015-02-10 14:23:00 -08:00
Stephen Birarda
fe79d8902e replace data with metaverse for highfidelity urls 2015-02-10 10:05:38 -08:00
Ryan Huffman
39cc6c86ae Update selected entity color to have more contrast 2015-02-10 09:03:48 -08:00
Ryan Huffman
8d65caaaef Update entity list search input to be full width with margin 2015-02-10 09:03:21 -08:00
Ryan Huffman
7ac3bd3ee8 Add padding to buttons in entity list 2015-02-10 09:02:53 -08:00
Thijs Wenker
1d5afba1fa removed some console noise 2015-02-09 18:40:36 +01:00
Thijs Wenker
e53b38e497 style / make sure the magnifier isn't rendered when we don't want it 2015-02-09 17:16:54 +01:00
Thijs Wenker
d810283d5a just show the instructions the first 2 times 2015-02-09 16:47:00 +01:00
Thijs Wenker
8251542b78 show instructions whenever the first gamepad is plugged since the script is loaded 2015-02-07 14:35:14 +01:00
Thijs Wenker
0a41033c85 - set cursor invisible when virtual-keyboard is shown. 
- get rid of the invisible cursor/magnifier states when cleaning up keyboard.
 2015-02-07 13:58:11 +01:00
David Rowe
334f26c84f Display some progress while waiting at 0% and limit speed of advance 2015-02-06 21:43:21 -08:00
David Rowe
4cd1d54f15 Fix progress bar's SVG dimensions 2015-02-06 21:42:58 -08:00
Thijs Wenker
e3ca1efe6b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-07 00:34:38 +01:00
Brad Hefta-Gaub
390d2be48f Merge pull request #4189 from birarda/android 
add the gvr-interface target for GearVR
 2015-02-06 14:07:28 -08:00
Stephen Birarda
0b10d0d1dc add an example script for the portal 2015-02-06 10:38:23 -08:00
Stephen Birarda
65418b8b67 remove the text comparisons from images dir 2015-02-06 10:02:44 -08:00
Brad Hefta-Gaub
f8d62d332a Merge pull request #4222 from jherico/text-renderer 
Text renderer refactor to use signed distance field font rendering
 2015-02-05 21:58:41 -08:00
Brad Hefta-Gaub
9058e9116a Merge pull request #4233 from ctrlaltdavid/fix-lookwithmouse 
Don't hide mouse events from C++ GUI
 2015-02-05 11:38:04 -08:00
Brad Hefta-Gaub
16717b322e Merge pull request #4237 from huffman/edit-user-data 
Edit user data
 2015-02-05 11:37:30 -08:00
Ryan Huffman
6863895533 Remove value from animation settings textarea 2015-02-05 11:19:18 -08:00
Ryan Huffman
850de6e67e Add User Data to entity properties panel 2015-02-05 11:19:01 -08:00
Ryan Huffman
1e11e658a8 Update drag/drop distance to be based on cameraManager.enabled rather than camera mode 2015-02-05 10:18:34 -08:00
Ryan Huffman
2343da0a8a Update drag/drop distance while in non-independent mode 2015-02-05 10:16:51 -08:00
Ryan Huffman
41720dbc4b Add drag-drop functionality for placing entities 2015-02-05 10:07:31 -08:00
David Rowe
c0ac9333e9 Don't hide mouse events from C++ GUI 2015-02-04 23:04:06 -08:00
Brad Davis
e1af9f8126 Merge remote-tracking branch 'upstream/master' into text-renderer 2015-02-04 21:04:47 -08:00
Thijs Wenker
d270979f95 Instructions initial 2015-02-04 23:19:56 +01:00
Brad Hefta-Gaub
8b1a226d8e Merge pull request #4230 from huffman/fix-select-shadow 
Fix rotation of selection shadow for editEntities
 2015-02-04 14:03:19 -08:00
Brad Hefta-Gaub
18f67aabec Merge pull request #4229 from huffman/fix-text-default-props 
Update the default properties for text entities
 2015-02-04 13:58:52 -08:00
Ryan Huffman
0e28f66906 Fix rotation of selection shadow for editEntities 2015-02-04 13:45:06 -08:00
Ryan Huffman
efed79d76c Update the default properties for text entities 2015-02-04 13:37:11 -08:00
Brad Hefta-Gaub
83d397ed98 Merge pull request #4223 from cozza13/20299 
CR for Job #20299 - Add lookwithmouse.js to default scripts.
 2015-02-04 13:33:14 -08:00
Thijs Wenker
38aab9570b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-04 19:55:12 +01:00
Ryan Huffman
3af025574f Decrease distance from object when focusing 2015-02-04 10:45:24 -08:00
Ryan Huffman
02d828443b Update zoom sensitivity when using keys 2015-02-04 10:44:54 -08:00
Ryan Huffman
36238bb5df Update editEntities to use left click for select 2015-02-04 10:43:55 -08:00
Ryan Huffman
09752589b8 Reenable on/off button 2015-02-04 10:43:28 -08:00
Ryan Huffman
4fbc7a5dcd Add focus easing and auto-focus to menu and settings 2015-02-04 10:42:01 -08:00
Ryan Huffman
01a00b5127 Disable editEntities always-on 2015-02-04 10:40:50 -08:00
Chris Collins
ee49ce08cb Added the script look with mouse to default script 
Look with touch does not work on PC’s or any mouse that does not accept
two finger touch. I have therefore added look with mouse to default
scripts.
 2015-02-04 09:53:38 -08:00
Brad Davis
f471597a73 Merge branch 'develop' into text-renderer 2015-02-03 23:07:19 -08:00
Brad Davis
3ead8fc8a2 Adding some more example images 2015-02-03 22:32:03 -08:00
Brad Davis
d64e7c464a Merge branch 'develop' into text-renderer 2015-02-03 18:44:06 -08:00
David Rowe
ca302e305b Add progress.js to defaultScripts.js 2015-02-03 16:17:06 -08:00
David Rowe
78bcf3ddcb Update SVG URLs to use S3 files 2015-02-03 16:15:10 -08:00
David Rowe
8dd87aff16 Adjust size of 2D progress bar 2015-02-03 14:27:43 -08:00
David Rowe
46352d34ce Make 3D progress bar match up with notifications 2015-02-03 14:27:43 -08:00
David Rowe
fdf4aeaeab Display 3D progress bar 2015-02-03 14:27:42 -08:00
David Rowe
7beb5bf25f Show and hide progress bar per downloads status 2015-02-03 14:27:41 -08:00
David Rowe
9b6a81cfb0 Display 2D progress bar 2015-02-03 14:27:41 -08:00
David Rowe
1fdebf63a4 Add progress.js; calculate download percent complete value 2015-02-03 14:27:40 -08:00
Brad Hefta-Gaub
b5e62922a2 Merge pull request #4215 from huffman/edit-changes 
A few improvements to editEntities.js
 2015-02-03 13:55:59 -08:00
Ryan Huffman
e2b6be2a92 Fix focus behavior when selecting an item without shift 2015-02-03 11:58:39 -08:00
Ryan Huffman
7f0fdbe23e Make auto-focus in editEntities always use ease-on-focus 2015-02-03 11:50:58 -08:00
Ryan Huffman
814d585086 Make the entity list always visible 2015-02-03 11:44:38 -08:00
Ryan Huffman
ba5a96f541 Add Window.setFocus 2015-02-03 11:44:22 -08:00
Ryan Huffman
74dfd29708 Remove Mass from entity properties window 2015-02-03 11:44:01 -08:00
Philip Rosedale
35aeb86acc First version, dice script 2015-02-02 23:15:18 -08:00
Philip Rosedale
2ae6514c87 Merge pull request #4200 from PhilipRosedale/master 
Planet simulation script
 2015-02-02 21:31:47 -08:00
Philip Rosedale
aa86db202c Merge branch 'master' of https://github.com/worklist/hifi 2015-02-02 07:05:04 -08:00
Brad Davis
0726f7cd21 Example images from text rendering test 2015-02-01 19:49:01 -08:00
Thijs Wenker
d695e8b251 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-02 00:18:18 +01:00
Brad Davis
acf0b292e9 Adding example images 2015-01-31 21:53:34 -08:00
Ryan Huffman
a98829ed8a Fix editEntities.js automatically turning on 2015-01-30 13:12:00 -08:00
Philip Rosedale
dfb1cffbd7 Add planet simulation 2015-01-30 10:24:26 -08:00
Ryan Huffman
0d1488e44f Fix editEntities.js includes 2015-01-30 10:03:37 -08:00
Thijs Wenker
8f5f53c14b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-30 18:50:01 +01:00
Ryan Huffman
77c78689d1 Merge branch 'master' of github.com:highfidelity/hifi into edit-always-on 2015-01-30 09:28:09 -08:00
Ryan Huffman
018a4af9d6 Update camera tool to wrap cursor to window bounds rather than keep at center 2015-01-30 09:22:39 -08:00
Ryan Huffman
cddce8f795 Update editEntities to always be on + use right click for select 2015-01-30 09:21:27 -08:00
Ryan Huffman
5d8825f5eb Remove call to gridTool.mousePressEvent 2015-01-30 08:56:37 -08:00
Thijs Wenker
adc7ed5f72 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-30 02:37:00 +01:00
Ryan Huffman
d06d8b8f01 Merge branch 'master' of github.com:highfidelity/hifi into revert-grid 
Conflicts:
	examples/libraries/gridTool.js
 2015-01-29 17:27:58 -08:00
Ryan Huffman
7017fdbac0 Update style of grid tools 2015-01-29 16:59:58 -08:00
Ryan Huffman
0307448ec3 Fix color index for entity grid tool 2015-01-29 16:59:37 -08:00
Ryan Huffman
eb69720af4 Update when grid tool window is shown 2015-01-29 16:58:48 -08:00
Ryan Huffman
c00346e8cb Revert "Remove gridControls.html" 
This reverts commit a0cb40597b.
 2015-01-29 16:45:19 -08:00
Brad Hefta-Gaub
8a32bd2eed Merge pull request #4164 from ctrlaltdavid/20183 
CR for 20183 Add Oculus support to notifications.js
 2015-01-29 13:38:49 -08:00
Thijs Wenker
34fd44c081 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-29 22:32:26 +01:00
Brad Hefta-Gaub
f5e092c0d2 Merge pull request #4187 from huffman/parallel-script-loading 
Parallel script loading
 2015-01-29 13:26:37 -08:00
Brad Hefta-Gaub
07d049ef2b Merge pull request #4188 from PhilipRosedale/master 
Add menu to paddleBall for hand choice
 2015-01-29 10:56:57 -08:00
Philip Rosedale
0c3f4b894c Menu for handedness, that really works. 2015-01-29 10:53:50 -08:00
Brad Hefta-Gaub
838cb41646 Merge pull request #4163 from PhilipRosedale/master 
Popcorn & building blocks scripts, some fixes
 2015-01-29 09:28:23 -08:00
Ryan Huffman
3447fea1db Revert "Update grid tool to be an overlay" 
This reverts commit 552a421f24.

Conflicts:
	examples/libraries/gridTool.js
 2015-01-28 16:01:04 -08:00
Ryan Huffman
1b81ee17ab Update how orbit-by-key is appleid 2015-01-28 12:23:58 -08:00
Ryan Huffman
09af7ed10f Remove extra print statement 2015-01-28 12:21:58 -08:00
Ryan Huffman
a775476cfa Remove editEntities move-by-arrow-key completely 2015-01-28 12:21:50 -08:00
Ryan Huffman
55f41eb452 Update gridTool to not use clone 2015-01-28 12:20:08 -08:00
Ryan Huffman
135c8c1bdf Disable move entity by arrows 2015-01-28 12:19:54 -08:00
Ryan Huffman
5633be0e92 Add ability to move orbit camera using keys 2015-01-28 12:19:42 -08:00
Ryan Huffman
e1ca6d5048 Disable editentities auto-off when moving avatar 2015-01-28 12:16:28 -08:00
Thijs Wenker
46618db697 Merge branch 'master' of https://github.com/worklist/hifi into 20224 
Conflicts:
	interface/src/ui/ApplicationOverlay.h
 2015-01-28 19:35:17 +01:00
Philip Rosedale
a85c6aa956 fix tabs? 2015-01-28 09:49:45 -08:00
Philip Rosedale
b515a0468b Merge branch 'master' of https://github.com/worklist/hifi 2015-01-28 09:35:07 -08:00
Philip Rosedale
117e6abb46 remove debug and PR fixes 2015-01-28 09:34:15 -08:00
David Rowe
7286a9c5fb Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00
David Rowe
2ee1570a40 Merge branch 'master' into 20276 2015-01-27 16:38:41 -08:00