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
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
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
