Seiji Emery
e723a5c0fd
whitespace + "waiting for entity server"
...
No functionality changes, but now prints "waiting for entity server"
once if waiting for more than X seconds in startup().
2015-09-18 11:18:33 -07:00
Seiji Emery
c25d8857d9
Merge branch 'master' of https://github.com/highfidelity/hifi into platform-js
2015-09-18 11:14:49 -07:00
Brad Hefta-Gaub
f45e182d33
fix CR feedback, add examples
2015-09-10 09:06:56 -07:00
David Rowe
cdd5e68815
Add colorStart and colorFinish entity particle properties
2015-09-08 11:28:53 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
David Rowe
47b27a3280
Add alphaStart and alphaFinish entity particle properties
2015-09-05 16:30:01 -07:00
David Rowe
1b3d125cb3
Add alphaSpread entity particle property
2015-09-05 14:39:10 -07:00
David Rowe
12b8a5a1d5
Add alpha property support to ParticleEffect entities
...
Add at same "level" as color so that it's available for other entity
types to use in the future.
2015-09-05 10:23:27 -07:00
David Rowe
e86581ab64
Update scripts to use HiFi smoke particle
2015-09-04 13:51:25 -07:00
David Rowe
c910da7179
Add radiusStart and radiusFinish entity particle properties
2015-09-04 12:27:18 -07:00
David Rowe
341e1dcf68
Add particleTest.js script to demo / test entity particle properties
2015-09-03 14:55:09 -07:00
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
