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

296 commits

Author SHA1 Message Date
Brad Hefta-Gaub
63f3156a61 add Controler.Actions 2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub
d3ee9b0f39 more work on exposing device inputs as JavaScript named constants 2015-10-09 20:58:23 -07:00
David Rowe
131b4ed004 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
	libraries/entities/src/ParticleEffectEntityItem.cpp
 2015-10-07 15:08:07 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
David Rowe
4624649b1b Sanitize particle properties, fix crashes 2015-10-07 08:57:55 -07:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
Brad Hefta-Gaub
016bf4011d cleanup 2015-10-06 16:07:36 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
Brad Hefta-Gaub
02536a5ab9 remove animationSettings from particles, add isEmitting 2015-10-02 14:17:01 -07:00
Brad Hefta-Gaub
aca25bd76e connect up AnimationPropertyGroup to AnimationLoop 2015-10-01 11:05:16 -07:00
Brad Hefta-Gaub
00c32fc7cd Merge pull request #5924 from jherico/marge 
Support for accessing IPD in scripts
 2015-09-29 14:24:53 -07:00
Brad Davis
9b13aac37d PR comments 2015-09-29 14:23:56 -07:00
Eric Levin
e8e9957846 Merge pull request #5911 from ZappoMan/rayIntersectionWork 
adding surface normals to ray intersection
 2015-09-28 17:21:40 -07:00
Brad Davis
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -07:00
Brad Hefta-Gaub
3e758f3c6b fix Triangle::getNormal, add normal display to rayPickExample 2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub
ce3da099f6 normalize the surface normal from the triangle, coding standard fix, update example 2015-09-28 08:30:49 -07:00
James B. Pollack
b254353b38 Update collectHifiStats.js 
Clears the current batch after we send it to the endpoint.
 2015-09-26 07:09:41 -07:00
James Pollack
1051416ed7 Change stat collection to batch stats together to make fewer network calls 2015-09-25 10:33:16 -07:00
James Pollack
54419301f3 Merge branch '20672' of https://github.com/thoys/hifi into thoys-20672 2015-09-25 10:01:33 -07:00
Thijs Wenker
6d4e4af0a5 ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer 2015-09-24 22:02:22 +02:00
David Rowe
eb01ba9812 Merge branch 'master' into 20681 2015-09-23 09:42:56 -07:00
David Rowe
60ba6e174f Typo 2015-09-18 16:44:20 -07:00
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
David Rowe
8634b59914 Make able to emit from within portion of ellipsoid volume 2015-09-17 23:49:57 -07:00
David Rowe
9e2b5b75b6 Make able to emit in specified range of directions 
Controlled by polar and azimuth start and finish angles, around point or
from specified part of spheroid surface.
 2015-09-17 22:40:49 -07:00
David Rowe
f647dcf147 Change emitter radiuses to dimensions to match sphere properties 2015-09-17 21:06:40 -07:00
David Rowe
12e2cf3ce9 Emit in all directions from a point or the surface of a spheroid 2015-09-17 17:14:35 -07:00
David Rowe
d51cab3e3d Replace particle velocity with speed and orientation 2015-09-16 14:51:08 -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
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
Zander Otavka
37a1ad7626 Improve floatingUIExample.js. 
Demonstrates overlayManager.js functionality.
 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
Zander Otavka
173a79867c Extend Overlays API to allow for 3D UI panels. 
Currently, only BillboardOverlays can be added to a panel, but more
types of overlays will be supported in the future.
 2015-07-31 11:26:03 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
ericrius1
697cb4c9d0 fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine 2015-07-29 10:02:06 -07:00
Brad Davis
bb29127eff Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 23:14:41 -07:00
bwent
1107742188 Clean up formatting for satellite.js 2015-07-28 13:01:20 -07:00
bwent
5272a1d6e7 refactoring variables and constants, fix update loop to continue over unlaunched satellites 2015-07-28 13:01:20 -07:00