Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 05:20:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23356 commits 76 branches 59 tags 1.2 GiB
Commit graph

2095 commits

Author SHA1 Message Date
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
Ryan Huffman
bb4417acc6 Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url 2015-03-25 10:49:24 -07: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
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