Seiji Emery
d9ea2ae27b
Fixed sliders
2015-08-28 15:43:55 -07:00
Seiji Emery
202f68be58
Fixed sphere entities + renamed user settings
2015-08-28 11:38:59 -07:00
Seiji Emery
c12f192c3a
bugfix...
...
Apparently I didn't test that -_-
2015-08-27 21:44:55 -07:00
Seiji Emery
2bea436e12
Added timeouts
...
if USE_ENTITY_TIMEOUTS is enabled, entities will now clean up after
themselves if not touched within X seconds (ie. if the script and/or
client crashes and scriptEnding isn't called then the entities will
timeout; otherwise, they get cleaned up normally when the script ends).
2015-08-27 18:34:31 -07:00
Seiji Emery
6583ea1791
Reverted default entity type back to spheres
2015-08-27 13:08:19 -07:00
Seiji Emery
fbf6d0efe8
Added failsafe so dependencies don't break
2015-08-27 11:57:53 -07:00
Seiji Emery
62a6a9d45e
Description
2015-08-27 11:54:47 -07:00
Seiji Emery
d57c7de316
Added rebuild + toggle entity type
2015-08-27 11:51:36 -07:00
Seiji Emery
a5d66bea24
Merge branch 'master' of https://github.com/highfidelity/hifi into platform-js
2015-08-25 12:56:17 -07:00
Seiji Emery
753d44cb4c
platform.js
2015-08-25 12:53:46 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
bwent
8609129228
fix header
2015-08-14 17:07:01 -07:00
bwent
7834a18bcf
add untracked changes
2015-08-14 15:11:05 -07:00
bwent
7bd9e2653c
more bug fixes
2015-08-14 15:09:48 -07:00
bwent
68fcf4ec8a
formatting
2015-08-14 11:06:44 -07:00
bwent
2c5c362957
adding rocket and refresh icons
2015-08-14 10:19:57 -07:00
bwent
58713c0d57
more minor bug fixes
2015-08-14 09:55:05 -07:00
bwent
2dbba322fd
bug fixes, ride through system
2015-08-13 18:13:08 -07:00
bwent
8c47bcc141
implement new UI
2015-08-13 16:00:55 -07:00
bwent
c585f24e27
Refining UI, introduce tween functionality for zooming into planets
2015-08-12 20:28:32 -07:00
bwent
e61ba997e5
Fix trail functionality with new classes
2015-08-12 20:28:32 -07:00
bwent
861c9f0ca0
more refactoring
2015-08-12 20:28:32 -07:00
bwent
e27335fc5e
Refactoring to use Planet class, set up framework for UI
2015-08-12 20:28:32 -07:00
Seiji Emery
81588f7db0
renamed Icon to Image
2015-08-12 16:26:47 -07:00
Seiji Emery
778100e075
Merge branch 'master' of https://github.com/highfidelity/hifi into js-widgets
2015-08-12 15:57:04 -07:00
Seiji Emery
c175fe9e04
moved example code to widgets-example.js
2015-08-12 15:48:21 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
Brad Davis
caf93d1aff
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
2015-08-08 13:18:13 -07:00
Zander Otavka
987fb56124
Simplify applied transformations in scripts.
2015-08-07 11:51:22 -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
f9630942aa
Small tweaks to improve code readability.
2015-08-07 09:31:21 -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
13a63a5a3d
Improve mouse click logic in scripts.
...
Also restore behavior of controlPanel.js being hidden on startup.
2015-08-06 16:04:11 -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
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -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
eab35d03d4
Improve vector operations in floatingUIExample.js.
2015-08-05 10:24:03 -07:00
Zander Otavka
cb5b5fcfc4
Increase right click move threshold.
2015-08-04 17:10:36 -07:00
Zander Otavka
a21fa94f14
Fix error in floatingUIExample.js.
...
Script would crash if the user left clicked somewhere not on an overlay.
2015-08-04 15:06:12 -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
e5a429e8a6
Add a Text3DOverlay in floatingUIExample.js.
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
ericrius1
12770edbe1
Merge branch 'master' into polyLineInProgress
2015-08-03 15:52:26 -07:00
Zander Otavka
1b4ba75b5a
Fix click and drag logic for floatingUIExample.js.
2015-08-03 12:01:15 -07:00
ericrius1
dc8fa0beb4
added painting scripts to demonstrate one way to use the PolyLineEntity
2015-08-03 11:15:14 -07:00
