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

379 commits

Author SHA1 Message Date
Zander Otavka
b94be926f8 Mass renaming to be more logical/concise. 
FloatingUIPanel -> OverlayPanel
anchorPosition -> position
offsetRotation -> rotation
facingRotation -> offsetRotation
floatingUIExample.js -> overlayPanelExample.js
 2015-08-06 14:23:04 -07:00
Zander Otavka
6165e7e6ca Improve cross-thread support for panel children. 2015-08-06 11:40:49 -07:00
Zander Otavka
021dff63b4 Visibility now cascades down panel children. 
For an overlay to render, it, and all of its ancestor panels, must be
set visible.
 2015-08-05 16:57:03 -07:00
Zander Otavka
481624b48c Re-work panel position and rotation binding. 2015-08-05 14:21:23 -07:00
Zander Otavka
5778502c54 Improve child removal logic for FloatingUIPanels. 2015-08-05 10:25:33 -07:00
Zander Otavka
90bfce25e5 Add anchorPosition as a field for FloatingUIPanel. 2015-08-04 17:10:56 -07:00
Seth Alves
b318c1122c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-04 16:00:27 -07:00
Zander Otavka
22453aa3ce Improve inner workings of overlay API. 
More stuff is known to the C++, and a panel object in JavaScript can be
gotten by ID from another thread.
 2015-08-04 14:22:21 -07:00
Zander Otavka
055133b82e Refactor inheritance for billboard overlays. 
BillboardOverlays is now Image3DOverlay.  Billboard3DOverlay is the base
class for both Image3DOverlay and Text3DOverlay, and it is
PanelAttachable.
 2015-08-04 14:22:21 -07:00
Zander Otavka
28050a2ac9 Fix PanelAttachable transformations. 
Apply the offsetPosition of the PanelAttachable after the facingRotation
of the FloatingUIPanel, not before.
 2015-08-04 14:22:21 -07:00
Zander Otavka
055c9dc59b Fix image URLs in controlPanel.js. 2015-08-03 10:41:35 -07:00
Zander Otavka
ba190b4b34 Improve JavaScript abstraction layer for overlays. 
Also move it to it's own file.
 2015-07-31 11:26:04 -07:00
Zander Otavka
377a1a54ae Add abstraction layer for Overlays.h. 
`examples/libraries/overlayUtils.js` allows you to manage overlays in an
object oriented manner.  Instead of:

    var billboard = Overlays.addOverlay("billboard", { visible: false });
    ...
    Overlays.editOverlay(billboard, { visible: true });
    ...
    Overlays.deleteOverlay(billboard);

You can now do:

    var billboard = new BillboardOverlay({ visible: false });
    ...
    billboard.visible = true;
    ...
    billboard.destroy();
 2015-07-31 11:26:03 -07:00
Seth Alves
52ee9526ce add 3 new texture-url properties for polyvox 2015-07-30 13:20:19 -07:00
Ryan Huffman
eb48aa1018 Update edit.js to swing up on activate 2015-07-19 12:10:37 -07:00
Stephen Birarda
812b18c74e Merge pull request #5205 from SeijiEmery/unit-tests 
Unit tests
 2015-07-02 20:58:09 -04:00
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
DaveDubUK
bb2c640a6d walk.js disable audio by default 2015-06-27 09:23:18 +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
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
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
c2287e9953 code review changes for walk.js 1.25 2015-06-24 19:24:57 +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
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
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
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
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
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -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
Howard Stearns
b79a58c0c8 Whitespace. 2015-05-13 18:07:51 -07:00
Howard Stearns
1a87ca04da Entity sound. 2015-05-13 13:18:02 -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
Howard Stearns
abc99267af Typo was making edit.js fail and impossible to debug. 2015-05-08 16:19:39 -07:00
Atlante45
01e3c33bf1 Add some debug to edit.js 2015-05-08 16:13:04 +02:00
Atlante45
50ba154615 Correctly wire setDrawZones 2015-05-06 17:04:01 +02: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
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
32b78f02b4 Group ShapeType and CompoundShapeURL + add it to Zones 2015-04-24 16:52:51 +02:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Ryan Huffman
30b9e16c1a Remove unused findRayIntersection from zoneOverlayManager 2015-04-23 09:52:21 -07:00
Ryan Huffman
4a99c21e7b Add zoneOverlayManager.js 2015-04-23 09:36:53 -07:00
Ryan Huffman
5654e3abed Add zone overlay manager 2015-04-23 09:32:15 -07:00
Atlante45
837a0d3ba8 rename collision model in edit.js 2015-04-23 12:13:52 +02:00
Philip Rosedale
4ad5a6c138 Merge pull request #4630 from Atlante45/fix_quick_turn 
Fix quick turn
 2015-04-10 13:43:36 -07:00
Atlante45
176f1beb08 Fix camera quick turn 2015-04-10 17:50:41 +02: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
f311cc5f07 Add light overlays 2015-04-03 16:27:42 -07:00
David Rowe
edaa4cdc65 Remove local file reading from scripts 2015-03-31 16:57:15 -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
Leonardo Murillo
d1d183e190 More .com changes 2015-03-25 13:05:10 -06:00
Ryan Huffman
dec89ba96f Disable duplicating locked entities 2015-03-25 11:22:07 -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
d512a67c8a Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays 2015-03-13 14:13:56 -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
Ryan Huffman
e94bac1971 Fix subimage indexing in toolBars.js 2015-03-13 10:07:31 -07:00
Ryan Huffman
165199c69d Update light overlay size 2015-03-12 15:55:31 -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
c13ba4a318 Add toggling of light visibility 2015-03-12 11:38:29 -07:00
Ryan Huffman
d82598327b Add light overlays 2015-03-12 11:18:32 -07:00
Ryan Huffman
e4f7e35587 Hide edit tools when inactive 2015-03-11 10:10:11 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -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
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
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
a2617b2c96 Update editEntities import/export 2015-03-05 13:52:59 -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
c665a3873d Fix entity camera tool from taking over in mirror mode 2015-02-20 10:11:55 -08:00
Thijs Wenker
d10f37291b check if sounds are downloaded before play thanks @Atlante45 2015-02-18 18:25:16 +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
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
Thijs Wenker
cb09656624 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-11 22:58:27 +01:00
Stephen Birarda
fe79d8902e replace data with metaverse for highfidelity urls 2015-02-10 10:05:38 -08: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
Thijs Wenker
e3ca1efe6b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-07 00:34:38 +01:00
Ryan Huffman
0e28f66906 Fix rotation of selection shadow for editEntities 2015-02-04 13:45:06 -08: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
Thijs Wenker
d695e8b251 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-02 00:18:18 +01:00