Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 03:58:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33636 commits 25 branches 0 tags 1.1 GiB
Commit graph

253 commits

Author SHA1 Message Date
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
bwent
e0d6609a99 resolve file path issue 2015-07-28 13:01:20 -07:00
bwent
ccb3d433af Example script solarsystem.js with orbiting satellite game 2015-07-28 13:01:20 -07:00
Brad Davis
a049b14d13 Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 10:04:19 -07:00
Brad Hefta-Gaub
d8c2b41655 Merge pull request #5428 from kevinmthomas-carpool/20628 
CR for Job #20628 - JS Stream Player For Domain-Zone
 2015-07-28 09:58:04 -07:00
Brad Hefta-Gaub
ee641335fa Merge pull request #5421 from thoys/20552 
CR for Job #20552 - Add the ability to modify the parameters of planky from a popup dialog
 2015-07-28 09:57:22 -07:00
Kevin M. Thomas
d17ddae537 Added .js file to examples/example/audio and added public bucket url functionality. 2015-07-27 12:14:50 -04:00
Kevin M. Thomas
d4d5c9f935 Created a folder in examples called "zones" then moved files to location. 2015-07-24 15:43:50 -04:00
Thijs Wenker
00fbe17b3c Merge branch 'master' of https://github.com/worklist/hifi into 20552 2015-07-22 10:21:47 +02:00
Thijs Wenker
de116c4e3b editMode on and off switch by clicking the COG, proper removal of planks when rows/columns removed 2015-07-22 10:21:13 +02:00
Kevin M. Thomas
75fa789b79 Changeable zone var declaration. 2015-07-21 18:13:26 -04:00
Kevin M. Thomas
cd58dc11ce Initial file placement into job. 2015-07-21 18:10:13 -04:00
Thijs Wenker
0d0f12164a planky, enabling properties button 2015-07-21 16:57:02 +02:00
Anthony J. Thibault
17220542d8 Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 
Conflicts:
	examples/example/games/sword.js
 2015-07-20 15:22:19 -07:00
SamGondelman
4d3b08b5e3 modified sword.js to work with vive controllers 2015-07-20 14:52:49 -07:00
ericrius1
dcb2012070 can toggle hit effect on and off from a script 2015-07-20 12:02:01 -07:00
ericrius1
220b54e5f7 added reference to correct zombie game script 2015-07-16 18:30:24 -07:00
ericrius1
66154d20e0 deleted unnessary log message 2015-07-16 13:38:39 -07:00
ericrius1
f7108ccff8 modified collision-hull model to not include the handle. This prevents the sword handle from pushing the brandishing avatar around, while still letting the sword sit in said avatar's hand in a more aesthetically pleasing manner than floating off in space 2015-07-16 13:27:59 -07:00
ericrius1
adbd995695 updated sword script so users can grab sword with hydra to adjust relative rotation of sword 2015-07-16 11:18:37 -07:00
Thijs Wenker
4596711005 Merge branch 'master' of https://github.com/worklist/hifi into 20552 2015-07-15 19:17:28 +02:00
Thijs Wenker
6926ae9aa3 small planky improvements 2015-07-14 20:27:51 +02:00
Howard Stearns
c49851cf03 Update sword script for current controller/physics behavior. 2015-07-14 09:33:08 -07:00
Thijs Wenker
b711022796 planky: 
- removed workaround for delayed overlay loading
- make buttons functional (reset, cleanup, save-default)
- only show live changes for the visual planky properties: blocksize , numLayers etc. (no physical properties)
 2015-07-14 12:28:49 +02:00
Thijs Wenker
8ed9eb0633 Merge branch 'master' of https://github.com/worklist/hifi into 20552 2015-07-14 12:03:43 +02:00
Thijs Wenker
222234cf1d wild planky changes on value change 2015-07-14 03:40:58 +02:00
Thijs Wenker
6d1df03617 planky: load / save settings 2015-07-14 03:19:23 +02:00
Thijs Wenker
1f453e07e3 connection between planky script and web-window 
-load settings
-include toolbar
 2015-07-14 02:18:17 +02:00
Howard Stearns
c340d336dc Functional sword script: 
Mouse and hydra.
Switchable hands.
Scores above buttons (2d) and above head in-world.
Adds avatar hit sound while sword is brandished.
 2015-07-10 15:43:56 -07:00
Thijs Wenker
12f34a71ab Merge branch 'master' of https://github.com/worklist/hifi into 20552 2015-07-09 20:57:34 +02:00
Thijs Wenker
c6b3801d0b proper block offset calculations 2015-07-09 20:53:09 +02:00
Philip Rosedale
542a5f100a Merge pull request #5280 from BingShearer/airhockey 
Air Hockey UI Fix
 2015-07-09 10:04:21 -07:00
Howard Stearns
c8da325213 Fudge the offset so that operates only when using the mouse. 2015-07-08 16:59:54 -07:00
Bing Shearer
ba4049754a Restored indentatioN 2015-07-08 16:53:55 -07:00
Bing Shearer
6080ec4509 Air Hockey UI now follows window border 2015-07-08 16:29:43 -07:00
Howard Stearns
6813a3afe1 Sword: 
+ init hands.
+ toolbar of brandishToggle/makeTarget/cleanup.
+ initial hit flash using overlays instead of ogl "fade".
 2015-07-08 15:27:45 -07:00
Howard Stearns
ef4620cabb Add a button to create/toggle-away sword. 
When brandished, display hit points (in overlay for this user).
 2015-07-08 11:52:37 -07:00
Howard Stearns
11e52c8ae0 Baseline versions of fight club scripts. 2015-07-07 14:41:03 -07:00
Thijs Wenker
90284b8bb4 fixes mysterious button display bug 2015-07-07 21:33:28 +02:00
Thijs Wenker
da6986f759 Planky refactorings and basic planky settings 2015-07-07 21:06:12 +02:00
Brad Hefta-Gaub
24fda9a733 Merge pull request #5085 from SamGondelman/master 
Exposing Input Key Binding To JavaScript
 2015-06-11 14:41:34 -07:00
Sam Gondelman
b1b2d1f85c ;) (added semicolons to js example) 2015-06-09 09:45:19 -07:00
Eric Levin
6d59518149 added meditative ocean landscape and common utilities file 2015-06-08 14:02:38 -07:00
Sam Gondelman
dd12e4740e example script for controller scripting, input mapping 2015-06-05 10:14:13 -07:00