Brad Davis
c8069ba73c
Working on magballs polish
2015-09-03 20:09:54 -07:00
Brad Hefta-Gaub
44c554895d
next wave of breakdance work
2015-09-03 14:33:25 -07:00
Brad Davis
5717b77837
Updating magballs to omnitool
2015-09-02 18:14:21 -07:00
Brad Davis
ea415071b4
OmniTool first pass
2015-09-02 18:14:13 -07:00
Brad Davis
849249d7fe
Fixing colors
...
Conflicts:
examples/toys/magBalls/handController.js
2015-09-02 15:56:38 -07:00
Ryan Downe Karpf
f0d69b1cdd
Merge pull request #5665 from ctrlaltdavid/20664
...
Add search radius field to entities list
2015-09-01 14:39:53 -07:00
David Rowe
e2ee074b7a
Entity search uses radius, not diameter
2015-08-31 13:51:03 -07:00
Seth Alves
752c787f0b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-28 12:50:31 -07:00
David Rowe
c9d799f5e0
Auto refresh entities list upon display of Entities tab
2015-08-27 13:32:00 -07:00
David Rowe
005851a74a
Increase default entity search radius to 100m
2015-08-27 12:13:04 -07:00
David Rowe
a553022adf
Update entities list as search radius value is changed
2015-08-27 11:11:05 -07:00
Seth Alves
d2cfca0424
fix comment typo
2015-08-25 16:41:10 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Howard Stearns
bb91b17314
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
...
Fix for animation resources
2015-08-24 08:13:33 -07:00
Anthony J. Thibault
b7009b4631
Fix for animation resources
...
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.
So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
2015-08-21 16:09:06 -07:00
Thijs Wenker
55fd847636
removed unused code, renamed UnitTest.ready() to UnitTest.done()
2015-08-21 19:07:33 +02:00
Thijs Wenker
9af7205672
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-19 16:49:39 +02:00
David Rowe
f6815c215a
Fix edit toolbar moving to top left of screen
2015-08-18 10:59:49 -07:00
Thijs Wenker
29c857f1fa
- unitTests for WebSockets + WebSocketServer (added some asynchronous functionality to the unitTest.js library , previous functionality intact)
2015-08-18 03:24:26 +02:00
Brad Hefta-Gaub
53c5c75071
Merge pull request #5574 from bwent/solar-system
...
Updates to solarsystem.js
2015-08-15 11:25:40 -07:00
bwent
8c47bcc141
implement new UI
2015-08-13 16:00:55 -07:00
Zander Otavka
b84b8b6119
Restructure overlayManager.js to be more readable.
2015-08-12 23:30:07 -07:00
Zander Otavka
dc68e12963
Improve documentation for overlay changes.
2015-08-12 22:04:06 -07:00
Seiji Emery
fdacb894a5
tabs to spaces
2015-08-12 16:28:06 -07:00
Seiji Emery
81588f7db0
renamed Icon to Image
2015-08-12 16:26:47 -07:00
Seiji Emery
10ca3f7a8f
fixes
2015-08-12 15:39:34 -07:00
Seiji Emery
293f146cfc
added debug ui, fixed non-targetable ui boxes/labels
2015-08-12 10:44:46 -07:00
Seiji Emery
f45afe050b
Added drag actions
2015-08-12 00:19:11 -07:00
Seiji Emery
986a821c91
cleanup
2015-08-11 22:00:53 -07:00
Seiji Emery
f247f0390c
Cleanup + refactoring
2015-08-11 21:56:00 -07:00
Seiji Emery
8c47c7b989
Added attachment
2015-08-11 20:12:21 -07:00
Seiji Emery
bb205294b9
uiwidgets.js
2015-08-11 16:33:30 -07:00
Andrew Meadows
5acd1e7d58
Merge pull request #5467 from sethalves/polyvox
...
Polyvox improvements (Warning: protocol change)
2015-08-10 11:12:10 -07:00
Zander Otavka
743e73874f
Add back the anchor to panel transform names.
...
position -> anchorPosition
rotation -> anchorRotation
scale -> anchorScale
2015-08-07 11:38:33 -07:00
Zander Otavka
3356bf31ac
Refactor billboarding into Billboardable class.
2015-08-07 02:34:56 -07:00
Zander Otavka
3dcfa84a87
Fix billboarding behavior.
...
Billboards now always face the camera position. Also, OverlayPanels can
be set to face the avatar.
2015-08-07 01:38:33 -07:00
Zander Otavka
0b4be8fca2
Improve transforms for panels and attachables.
...
Add offsetScale to PanelAttachable for scaling all the contents of a
panel properly. Also reduce the number of transform operations per
second while rendering a PanelAttachable Overlay.
2015-08-06 21:46:55 -07:00
Zander Otavka
497713b020
Rename a few more confusing names.
...
setTransforms -> applyTransformTo
attachedPanel -> parentPanel
2015-08-06 15:45:07 -07:00
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