Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 12:36:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41961 commits 71 branches 56 tags 1.2 GiB
Commit graph

148 commits

Author SHA1 Message Date
Thijs Wenker
d60661ff8a preview camera button in edit.js script 2015-11-04 03:24:32 +01:00
Thijs Wenker
d7279e4c88 Support for Camera Entities. 
- New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.).
- New CameraMode: CameraEntity
- Example script using the new cameraEntity
- Updated edit.js to use the CameraEntities (with button to preview the camera)
 2015-11-04 02:51:23 +01:00
Atlante45
8b46ed7dff Check keyLight is defined 2015-10-29 16:42:48 -07:00
Atlante45
c237072195 edit.js fix 2015-10-29 15:29:12 -07:00
samcake
517387621a Fixing the keyLIght Direction ui for edit.js and fix the case for D to d 2015-10-29 10:40:28 -07:00
samcake
025422792d Fixing the keyLIght Direction ui for edit.js 2015-10-29 10:13:28 -07:00
James B. Pollack
84f0c404ad fix bug related to camera lock for entity orbit and pan 2015-10-12 14:55:52 -07:00
Atlante45
75f0a6442f ModelEntities spawned with no dimension autoresize 2015-10-09 12:23:19 -07:00
Howard Stearns
a5a7c16466 Merge pull request #5789 from highfidelity/revert-5777-revert-5769-edit-js-adjustment 
edit.js adjustment
 2015-10-02 16:28:54 -07:00
Ryan Huffman
42c33ba699 Fix edit.js import on Windows 
Forcefully prepend "file:///" to the local file url used for importing
 2015-09-28 15:40:37 -07:00
Brad Hefta-Gaub
efda121619 fix a bunch of warnings on windows 2015-09-22 16:40:17 -07:00
David Rowe
52f6fe1d04 Clear entity list when you change domains 2015-09-21 09:59:00 -07:00
Seth Alves
fc68b31b71 Revert "Revert "edit.js adjustment"" 2015-09-12 08:23:50 -07:00
Seth Alves
94dc86833f Revert "edit.js adjustment" 2015-09-10 17:01:11 -07:00
Seth Alves
698ccc6fb0 don't change camera when edit.js is activated. don't highlight entites I mouse-hover over. 2015-09-10 13:48:36 -07:00
Seth Alves
105470bf26 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-21 11:02:16 -07:00
Seth Alves
2c840ae0cc change default polyvox surface to edged-cubic and turn some voxels on when a polyvox is first rezzed 2015-08-21 11:02:11 -07:00
Ryan Huffman
f834418384 Fix edit.js to warn when creating entities outside of world bounds 2015-08-20 11:23:16 -07:00
Seth Alves
ef6116465d make edged-cubic be the default polyvox surface style 2015-08-19 19:15:36 -07:00
ZappoMan
010a3d8220 fix create in negative space bug 2015-08-19 17:12:03 -07:00
ZappoMan
5715042102 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-17 21:53:45 -07:00
ZappoMan
44fcf71f07 change domain to be 32k and still have origin centered at 0 2015-08-14 15:26:49 -07:00
Ryan Huffman
ee11b74c8b Update click move distance threshold 2015-08-14 10:13:05 -07:00
Ryan Huffman
56501490a1 Update edit.js mouse click code to be more lenient to micro movements 2015-08-14 10:09:16 -07:00
ZappoMan
4fe8f49d4c move origin to center of domain 2015-08-11 23:47:40 -07:00
Ryan Huffman
0b25fc335e Cleanup edit.js entity creation 2015-07-28 13:21:29 -07:00
Ryan Huffman
81e80996f7 Fix large marketplace imports not working 2015-07-28 11:24:33 -07:00
Ryan Huffman
ceffbb6383 Update edit.js to show an alert window when new objects would be out of bounds 2015-07-27 11:41:53 -07:00
Ryan Huffman
c17a603714 Fix model entity not showing up in list on creation 2015-07-23 08:42:29 -07:00
bwent
5a8106a049 fixes in edit.js UI 2015-07-21 13:15:24 -07:00
bwent
89eed589e2 Add Vec3 function to convert vec3 to/from euler angles 2015-07-21 11:08:53 -07:00
bwent
5ba82faa4b keyLightDirection displays in degrees in edit.js UI 2015-07-17 13:52:00 -07:00
Ryan Huffman
cf0940a65d Fix edit.js highlighting an object after being turned off 2015-07-16 11:07:01 -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
5114f82dca Fix https://app.asana.com/0/32622044445063/38213714069516 2015-06-23 12:07:01 -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
Howard Stearns
e6bafb9bf1 Draggable toolBar.js, with persistence, and update some scripts for it. 2015-06-11 16:19:54 -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
ad71d7b7a2 allow changing of voxel-volume-size with edit.js 2015-05-30 18:14:36 -07:00
Seth Alves
85171f033e fallout from no-swap-id merge 2015-05-21 16:30:16 -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
Howard Stearns
adfe21b743 Fix (long-standing?) typo in edit.js file reference. 2015-05-18 10:28:47 -07:00
Ryan Huffman
a0369d243a Update web icon 2015-05-15 15:58:02 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -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
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
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
Atlante45
94765f0c53 Add print type 2015-05-11 15:54:14 +02:00
Ryan Huffman
ddec694393 Update add-zone icon in edit.js 2015-05-01 15:38:06 -07:00
Ryan Huffman
e7a8255af2 Replace zoneOverlayManager with internal drawZoneBoundaries 2015-05-01 13:02:28 -07:00
Ryan Huffman
73a5b8c4e2 Add support for 'name' to edit.js 2015-05-01 08:42:23 -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
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
d45e935b93 Add show zone overlay option to menu 2015-04-23 09:52:01 -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
5654e3abed Add zone overlay manager 2015-04-23 09:32:15 -07:00
Ryan Huffman
3dfbd70d41 Add new zone button 2015-04-21 13:16:55 -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
Ryan Huffman
e2a7072270 Update new entity positioning to be in front of camera 2015-04-08 12:50:02 -07:00
David Rowe
edaa4cdc65 Remove local file reading from scripts 2015-03-31 16:57:15 -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
Ryan Huffman
1bdfa3abb5 Update right-click menu to look for marketplaceID 2015-03-27 13:36:22 -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
Ryan Huffman
28e2e65da9 Fix marketplace showing for all edit properties buttons 2015-03-26 16:23:36 -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
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
a901bc4b11 Update edit.js to export as .svo.json 2015-03-24 10:28:12 -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
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
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
504dceda6b Update edit.js icons 2015-03-13 10:07:12 -07:00
Ryan Huffman
2bedd1cfc7 Move editEntities.js to edit.js 2015-03-12 12:39:06 -07:00
Renamed from examples/editEntities.js (Browse further)