Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-06 16:31:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

3386 commits

Author SHA1 Message Date
David Rowe
d628a88f52 Fix some invalid HTML 2015-08-27 11:10:20 -07:00
David Rowe
1880b263d4 Add entity search radius field to entities list 2015-08-27 11:09:55 -07:00
Brad Hefta-Gaub
7b2f944f48 Merge pull request #5561 from ericrius1/particleExtensions 
Extended Particle entity to allow for more varied effects
 2015-08-27 10:45:03 -07:00
Seth Alves
b09de4ff65 fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there. 2015-08-26 21:51:28 -07:00
Seth Alves
6f46832069 clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct 2015-08-25 21:30:38 -07:00
Seth Alves
405c9828b8 cargo-cult a voxel-editor tool-bar from edit.js 2015-08-25 16:41:38 -07:00
Seth Alves
d2cfca0424 fix comment typo 2015-08-25 16:41:10 -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
Seth Alves
91254245e4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-24 20:21:24 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
ericrius1
13892db866 removed logging 2015-08-24 11:41:03 -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
Thijs Wenker
67e945b884 fix unit test 2015-08-22 03:32:53 +02: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
d89ecc1e42 Move WebSocketServer to be accessable from Assignment-Client:Agent only. 2015-08-21 22:43:49 +02:00
Seth Alves
105470bf26 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-21 11:02:16 -07:00
Seth Alves
2c840ae0cc change default polyvox surface to edged-cubic and turn some voxels on when a polyvox is first rezzed 2015-08-21 11:02:11 -07:00
Thijs Wenker
fd82f05307 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-21 19:29:38 +02:00
Thijs Wenker
55fd847636 removed unused code, renamed UnitTest.ready() to UnitTest.done() 2015-08-21 19:07:33 +02:00
Brad Davis
1e5f9b0442 Merge pull request #5624 from PhilipRosedale/master 
First pass, grenade and basketball toys.
 2015-08-20 23:56:44 -07:00
Philip Rosedale
cee570d2b2 First pass at basketball, just appears in front of you with some reasonable values 2015-08-20 23:06:05 -07:00
Philip Rosedale
7284e3aa3c added a little bit of spin, too. 2015-08-20 22:20:51 -07:00
Philip Rosedale
ef4ad3107e First pass, grenade toy. Needs art. 2015-08-20 22:11:11 -07:00
Brad Hefta-Gaub
6f3b34982e Merge pull request #5614 from samcake/punk 
Script improvments with render Engine debug.js
 2015-08-20 15:00:16 -07:00
Thijs Wenker
7f5fc64f6c Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-20 21:09:22 +02:00
Sam Gateau
84d244ec52 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-08-20 11:33:18 -07:00
Ryan Huffman
f834418384 Fix edit.js to warn when creating entities outside of world bounds 2015-08-20 11:23:16 -07:00
Seth Alves
ef6116465d make edged-cubic be the default polyvox surface style 2015-08-19 19:15:36 -07:00
ZappoMan
010a3d8220 fix create in negative space bug 2015-08-19 17:12:03 -07:00
Andrew Meadows
5a442bdb30 Merge pull request #5555 from ZappoMan/centerOrigin 
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
 2015-08-19 15:59:04 -07:00
Chris Collins
846ca3b86b removed mouselook 
removed mouselook
 2015-08-19 12:58:26 -07:00
Chris Collins
9605294ea8 Removed HMDcontrol.js from default scripts 
Removed HMDcontrol.js from default scripts. Will put back when
HMDcontrol is fixed
 2015-08-19 12:55:52 -07:00
Thijs Wenker
fd7d186ffb Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-19 20:23:45 +02:00
ZappoMan
684ee3bdd0 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-19 11:20:15 -07:00
Andrew Meadows
990dce6795 Merge pull request #5578 from sethalves/polyvox 
Polyvox improvements
 2015-08-19 10:31:13 -07: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
ZappoMan
5715042102 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-17 21:53:45 -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
Seth Alves
c60a8e7dfc minecraft style voxel editing largely works 2015-08-16 12:52:55 -07:00
Seth Alves
a57278ba3c ray-picks against cubic-voxels seem right, now 2015-08-16 11:51:04 -07:00
Seth Alves
4ffb5c9716 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-16 11:05:03 -07:00
Seth Alves
6db115bed5 try to make adding and removing voxels work more like expected 2015-08-16 09:36:13 -07:00
Seth Alves
f6cbeb37f8 put a green sphere at the point being pointed to 2015-08-16 09:35:50 -07:00
Seth Alves
5ecdbaa19d have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords 2015-08-15 15:18:25 -07:00
Seth Alves
79a7755cdb add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style 2015-08-15 12:18:36 -07: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
Brad Hefta-Gaub
b1a4715ce1 Merge pull request #5572 from bwent/particleDance 
Example particle scripts
 2015-08-15 11:24:44 -07:00
Brad Hefta-Gaub
821063f6d2 Merge pull request #5575 from SamGondelman/sam/input-plugins 
Working on toybox script, squeezeHands, and default mappings
 2015-08-15 10:59:04 -07:00
Brad Hefta-Gaub
a0e92e71a5 Merge pull request #5562 from AlexanderOtavka/overlay-docs 
Documentation for overlay changes.
 2015-08-14 18:53:34 -07:00
bwent
8609129228 fix header 2015-08-14 17:07:01 -07:00
bwent
889d9c54a5 add newline at end of file 2015-08-14 16:24:11 -07:00
bwent
45fe6a438c Example particle scripts 2015-08-14 16:18:07 -07:00
ZappoMan
44fcf71f07 change domain to be 32k and still have origin centered at 0 2015-08-14 15:26:49 -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
Ryan Huffman
ee11b74c8b Update click move distance threshold 2015-08-14 10:13:05 -07:00
Ryan Huffman
56501490a1 Update edit.js mouse click code to be more lenient to micro movements 2015-08-14 10:09:16 -07:00
bwent
58713c0d57 more minor bug fixes 2015-08-14 09:55:05 -07:00
ZappoMan
5fdd7304aa Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-14 09:33:53 -07:00
ericrius1
b8a6105a03 Merge branch 'master' into particleExtensions 2015-08-14 08:56:59 -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
ericrius1
9322960c63 updated particle example for new properties 2015-08-13 15:36:13 -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
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
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
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
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
ZappoMan
4fe8f49d4c move origin to center of domain 2015-08-11 23:47:40 -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
Brad Davis
19d31938d3 Merge remote-tracking branch 'upstream/master' into plugins 2015-08-10 21:25:35 -07:00
Seth Alves
74287c3cf5 Merge pull request #5482 from ericrius1/polyLineInProgress 
Added PolyLine Entity and painting scripts to demonstrate its functionality (WARNING: protocol change) Test this please
 2015-08-10 14:57:52 -07:00
Lars Næsbye Christensen
8aa7002ab8 Simple whitespace correction 
Added a space to make the reduced complexity notification look better.
 2015-08-10 21:07:08 +02: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
59dc6c9cca Merge remote-tracking branch 'upstream/master' into plugins 2015-08-10 11:47:54 -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
samcake
f9cbafdd39 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-08-08 16:44:19 -07:00
samcake
881cfb86dd Updating the render engine dashboard 2015-08-08 16:43:55 -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
SamGondelman
b77de1b598 added fists to toybox 2015-08-07 18:07:14 -07:00
SamGondelman
23fea1f221 working on toybox script, squeezeHands, and default mappings 2015-08-07 16:59:50 -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
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -07:00
Zander Otavka
f9630942aa Small tweaks to improve code readability. 2015-08-07 09:31:21 -07:00
Seth Alves
c07119c30b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-07 07:37:25 -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
be4e827281 Merge: master -> panel-attachable-improvements. 2015-08-06 16:29:38 -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
Sam Gondelman
54f64b62eb Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-08-06 14:45:26 -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
Sam Gondelman
3256e30f02 toybox script 2015-08-05 18:54:08 -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
eab35d03d4 Improve vector operations in floatingUIExample.js. 2015-08-05 10:24:03 -07:00
Howard Stearns
5f895e8aff Merge pull request #5448 from PhilipRosedale/master 
test script to load test with lots of entities
 2015-08-05 10:08:03 -07:00
Philip Rosedale
f1a4e185cd Added lifetime and better notes, per PR 2015-08-05 10:04:59 -07:00
Zander Otavka
90bfce25e5 Add anchorPosition as a field for FloatingUIPanel. 2015-08-04 17:10:56 -07:00
Zander Otavka
cb5b5fcfc4 Increase right click move threshold. 2015-08-04 17:10:36 -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
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
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
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
Eric Levin
3f5f75d6d2 Merge pull request #5430 from AlexanderOtavka/floating-ui 
Improvements to overlays.
 2015-08-03 14:35:52 -07:00
David Rowe
5e7cb72843 Reduce the speed of movement when in HMD view 
When using hmdControls.js.
 2015-08-03 13:02:12 -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
d24006e715 Improve logic around handling click and drag. 2015-08-03 11:14:55 -07:00
Zander Otavka
055c9dc59b Fix image URLs in controlPanel.js. 2015-08-03 10:41:35 -07:00
ericrius1
f50c482451 Merge branch 'master' into polyLineInProgress 2015-08-03 08:46:01 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
Brad Davis
5c07a7d85b Merge remote-tracking branch 'upstream/master' into plugins 2015-08-01 21:58:05 -07:00
David Rowe
c88e0360b3 Change the inspect.js pan direction and rate 
This makes camera zoom, orbit, and panning more similar to Second Life.
 2015-07-31 14:46:43 -07:00
Zander Otavka
c37c3ec2d2 Use images off the amazon bucket, not file://. 2015-07-31 11:26:04 -07:00
Zander Otavka
3983c31219 Add controlPanel.js script. 
Right click to open a control panel.  Control panel allows toggling of
face mute, mic mute, and address bar.
 2015-07-31 11:26:04 -07:00
Zander Otavka
37a1ad7626 Improve floatingUIExample.js. 
Demonstrates overlayManager.js functionality.
 2015-07-31 11:26:04 -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
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
Seth Alves
3b88500735 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-07-30 21:22:52 -07:00
Seth Alves
f2fb156d66 merge from upstream 2015-07-30 21:21:13 -07:00
Seth Alves
8d2aacb46d send X texture to renderer 2015-07-30 15:36:07 -07:00
Seth Alves
52ee9526ce add 3 new texture-url properties for polyvox 2015-07-30 13:20:19 -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
Brad Hefta-Gaub
5a777b17a2 Merge pull request #5444 from huffman/fix-import-large-svo 
Fix issue with skyboxes not being importable from marketplace
 2015-07-29 18:34:55 -07:00
Sam Gondelman
c9ef6d5b26 fixed some scripts to work with plugins branch 2015-07-29 12:09:28 -07:00
samcake
4ebc75da1f Merge pull request #5369 from ericrius1/hitEffect 
Added functionality for displaying a screen-space hit effect
 2015-07-29 11:28:08 -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
samcake
bc941147f4 Merge pull request #5446 from bwent/cookies 
Add cookies.js functionality for collapsable subpanels, key navigation
 2015-07-29 09:53:07 -07:00
bwent
7805cf4e48 Format fixes, UI logos for collapse/expand toggle 2015-07-29 09:19:33 -07:00
Brad Davis
bb29127eff Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 23:14:41 -07:00
Andrew Meadows
fa49342f00 Merge pull request #5420 from bwent/solar-system 
Example script solarsystem.js with orbiting satellite game
 2015-07-28 15:06:23 -07:00
Philip Rosedale
c83bcf77c6 test script to load test with lots of entities 2015-07-28 13:45:42 -07:00
Philip Rosedale
cce6f15de2 Merge pull request #5443 from huffman/edit-camera-up 
Update edit.js to swing up on activate so that it doesn't intersect with the avatar's head
 2015-07-28 13:32:34 -07:00
Ryan Huffman
0b25fc335e Cleanup edit.js entity creation 2015-07-28 13:21:29 -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
bwent
2be95997d1 clean up formatting 2015-07-28 13:00:41 -07:00
bwent
d9693796bc Capture key events 2015-07-28 13:00:40 -07:00
bwent
774b4851c3 Add tab to highlight widgets and update using left and right arrow keys 2015-07-28 13:00:40 -07:00
bwent
b7d195e817 more subpanel fixes 2015-07-28 13:00:40 -07:00
bwent
252780dc5d fix checkbox class, make subpanels collapsable 2015-07-28 13:00:40 -07:00
bwent
4ae03184ec add subpanel functionality 2015-07-28 13:00:40 -07:00
bwent
b46ad0c397 Created subpanel panel item 2015-07-28 13:00:40 -07:00
Bradley Austin Davis
02998d81de Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 12:45:03 -07:00
Ryan Huffman
81e80996f7 Fix large marketplace imports not working 2015-07-28 11:24:33 -07:00
Andrew Meadows
6e41a79551 Merge pull request #5360 from BingShearer/Leaves 
New falling leaf script based on the existing rain.js
 2015-07-28 10:08:16 -07:00
Brad Davis
a049b14d13 Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 10:04:19 -07:00
Brad Hefta-Gaub
26111b9b80 Merge pull request #5365 from kevinmthomas-carpool/20485 
20485
 2015-07-28 09:59:43 -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
Brad Hefta-Gaub
6d1bfd8134 Merge pull request #5427 from kevinmthomas-carpool/20622 
CR for Job #20622 - JS Stream Player
 2015-07-28 09:56:39 -07:00
Bing Shearer
c46e73434c Added small fix to error message code 2015-07-27 11:59:09 -07:00
Brad Hefta-Gaub
9783740b21 Merge pull request #5436 from huffman/edit-oob 
Show an alert window when new objects would be out of bounds
 2015-07-27 11:47:54 -07:00
Ryan Huffman
ceffbb6383 Update edit.js to show an alert window when new objects would be out of bounds 2015-07-27 11:41:53 -07:00
Bing Shearer
d54543e83c Tidied up per Brad's request 2015-07-27 10:19:42 -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
Anthony J. Thibault
5cc0b45850 Improved ParticleEffectEntityItem rendering and updates 
* Created custom pipelines and shaders for untextured and textured
  particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
  new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
  based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
  now we just update all the time.  (super cheap tho, if there are no particles
  animating)
 2015-07-26 17:21:17 -07:00
Kevin M. Thomas
ca8d0d5420 Added files to zone folder and made change to jstreamplayerdomain-zone.js to allow for zone entity data field to load a stream url rather than have it hard coded in the js file. This allows for many zones to be created and simply having to put a new stream url in each data field in each zone to work. 2015-07-25 07:56:57 -04:00
Kevin M. Thomas
7966f8c708 Merge branch 'master' of https://github.com/highfidelity/hifi into 20628 2015-07-24 15:45:02 -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
Kevin M. Thomas
ddada17b08 move jsstreamplayer.html into example/html 
move jssstreamplayer.js script into example/example/audio
 2015-07-24 15:27:16 -04:00
Kevin M. Thomas
a6af80fa5c Merge branch 'master' of https://github.com/highfidelity/hifi into 20622 2015-07-24 15:03:15 -04:00
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
Philip Rosedale
f04291ef65 Merge pull request #5408 from thoys/20626 
CR for Job #20626 - edit.js - entities list html - multi select using shift key / working delete key
 2015-07-24 07:47:30 -07:00
Bradley Austin Davis
901dd77f05 Merge remote-tracking branch 'upstream/master' into plugins 2015-07-23 18:11:25 -04:00
Bradley Austin Davis
1db4162371 Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
Ryan Huffman
c17a603714 Fix model entity not showing up in list on creation 2015-07-23 08:42:29 -07:00
Brad Davis
3407fd48a8 Merge pull request #5363 from PhilipRosedale/master 
Birds will die if abandoned, ability to fly with birds
 2015-07-22 14:13:27 -04:00
Bing Shearer
3cac781cdc Fixed indentation and number formats, as well as streamlining calculation of leaf velocity to make it more readable. 2015-07-22 10:47:27 -07:00
Philip Rosedale
b7a4acaf87 changed to use new Vec3.toPolar() function 2015-07-22 10:06:08 -07:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -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
ebe61b8c09 Merge branch 'master' of https://github.com/highfidelity/hifi into 20628 2015-07-21 18:15:19 -04: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
bwent
5a8106a049 fixes in edit.js UI 2015-07-21 13:15:24 -07:00
Philip Rosedale
6c51c9e950 added ability to follow/fly with the birds 2015-07-21 12:18:52 -07:00
bwent
89eed589e2 Add Vec3 function to convert vec3 to/from euler angles 2015-07-21 11:08:53 -07:00
Thijs Wenker
5d74858500 edit.js - entityList - delete key deletes entities, hold shift to select a group of entities, moved appending single entity to selection to ctrl key 2015-07-21 17:01:54 +02: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
Kevin M. Thomas
2c088ec5a9 Updated overlay clearing functionality. 2015-07-20 14:21:42 -04:00
Kevin M. Thomas
d76d380512 Added jsstreamplayer. 2015-07-20 14:19:16 -04:00
Stephen Birarda
54f618a502 Merge pull request #5361 from huffman/users-setting 
Update users.js to persist isMinimized value
 2015-07-20 09:01:31 -07:00
Philip Rosedale
45a229494b fix to correctly add to lifetime (it is always full lifetime since starting) 2015-07-20 08:40:12 -07:00
Kevin M. Thomas
8ec51f9814 Updated afk.js file based on advise from PR. 2015-07-19 18:24:29 -04:00
samcake
9ee93eb4d7 Merge pull request #5358 from bwent/keyLightDirectionFix 
fix keyLightDirection to display in degrees in edit.js UI
 2015-07-19 14:25:59 -07:00
Ryan Huffman
eb48aa1018 Update edit.js to swing up on activate 2015-07-19 12:10:37 -07:00
Philip Rosedale
32a30c4963 Merge pull request #5344 from ericrius1/newSword 
updated sword script so users can grab sword with hydra to adjust rel…
 2015-07-18 15:45:43 -07:00
Kevin M. Thomas
1d48eeab10 commit 20485 2015-07-18 18:32:39 -04:00
Philip Rosedale
66d61dc587 Add lifetime so that abandoned birds eventually die 2015-07-18 13:34:14 -07:00
Ryan Huffman
5ae1af0d62 Update users.js to persist isMinimized value 2015-07-17 16:33:24 -07:00
Bing Shearer
9c8e01f3ff New falling leaf script based on the existing rain.js 2015-07-17 16:10:34 -07:00
ericrius1
a44e5f949c Merge branch 'master' into polyLineInProgress 2015-07-17 15:01:40 -07:00
bwent
5ba82faa4b keyLightDirection displays in degrees in edit.js UI 2015-07-17 13:52:00 -07:00
Howard Stearns
c9658b2c13 Merge pull request #5354 from PhilipRosedale/master 
Sample script flockOfBirds.js with sounds and flocking behavior
 2015-07-17 13:15:08 -05:00
Philip Rosedale
ee435d9732 remove comment 2015-07-17 09:43:33 -07:00
Philip Rosedale
689b0e2571 Improve to run correctly on startup as AC 2015-07-17 09:41:48 -07:00
Thijs Wenker
9b08e3c85a Merge branch 'master' of https://github.com/worklist/hifi into 20552 2015-07-17 10:55:16 +02:00
Philip Rosedale
db219905f3 re-use audio injectors, don't check if isPlaying immediately after starting play out 2015-07-17 00:30:31 -07:00
Philip Rosedale
5c29eb97ef remove debug 2015-07-16 23:32:40 -07:00
Philip Rosedale
cf9365e616 Add new sample script with flocking 2015-07-16 22:46:41 -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
Philip Rosedale
62fca613a6 Merge pull request #5345 from huffman/fix-edit-highlight 
Fix bug where edit.js highlights an object after being turned off
 2015-07-16 11:34:01 -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
Ryan Huffman
cf0940a65d Fix edit.js highlighting an object after being turned off 2015-07-16 11:07:01 -07:00
Seth Alves
934dcf4a8e Merge pull request #5335 from thoys/chess-fix 
Fixes chess game (pieces were dieing as soon as you dropped them)
 2015-07-15 16:31:11 -07:00
Andrew Meadows
a444d6a2a2 remove hungarian notation 2015-07-15 13:19:59 -07:00
Thijs Wenker
c24c6ad39f Fixes chess game (pieces were dieing as soon as you dropped them) 2015-07-15 19:56:01 +02: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
Seth Alves
9b37b83eb6 Merge pull request #5320 from AndrewMeadows/barium 
fix grab.js when using the spring action
 2015-07-14 11:02:42 -07:00
Howard Stearns
c49851cf03 Update sword script for current controller/physics behavior. 2015-07-14 09:33:08 -07:00
Andrew Meadows
69db9aa01a fix grab transitions between vert and horiz planes 2015-07-14 09:24:37 -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
95948851f1 save, clear and reset button 2015-07-14 04:36:29 +02:00
Thijs Wenker
c8453bec67 planky: fix layer setting, restraints on values 2015-07-14 03:50:06 +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
Seth Alves
d44bb1a0d8 update javascript to use relative-to-entity line-point ends 2015-07-13 11:42:29 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
ericrius1
b3b12bd2dc adding custom shader for flipped normals 2015-07-13 08:54:53 -07:00
Seth Alves
c56b2918a4 allow voxels.js to work on an empty voxel-space 2015-07-12 10:35:44 -07: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
Brad Hefta-Gaub
33016e2797 Merge pull request #5293 from jherico/bart 
More profiling ranges and updated performance testing scripts
 2015-07-09 19:10:45 -07:00
Brad Davis
446f800aee More profiling ranges and updated performance testing scripts 2015-07-09 15:43:30 -07:00
Seth Alves
fa06f50841 fix header comment 2015-07-09 15:34:03 -07:00
Seth Alves
d197bf2a85 use palm rotation data in hold action 2015-07-09 12:18:32 -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
Chris Collins
16e79cc85f Remove lobby.js from the default scripts 
Lobby.js has some bugs that are not going to be fixed in the short
term. Therefore we are removing it from default scripts.
 2015-07-08 11:17:03 -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
96fecd093d Merge pull request #5237 from samcake/yellow 
Introducing the Status to the render::Scene & Engine, a per item information that can be displayed in 3D for debug
 2015-07-06 15:41:58 -07:00
samcake
a8ddc71946 Merge pull request #5262 from bwent/cookies 
Added checkbox functionality, double-click to reset panel
 2015-07-06 15:09:16 -07:00
bwent
8b4398cd5a Update cookies.js 2015-07-06 15:03:21 -07:00
bwent
2bdd2b8c2c Update cookies.js 2015-07-06 15:02:51 -07:00
bwent
5d91f1be83 Removed header comments 2015-07-06 13:26:16 -07:00
bwent
93fbfcbff7 Added checkbox functionality, double-click to reset panel 2015-07-06 12:09:08 -07:00
samcake
f9562bedd9 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 18:14:45 -07:00
Stephen Birarda
812b18c74e Merge pull request #5205 from SeijiEmery/unit-tests 
Unit tests
 2015-07-02 20:58:09 -04:00
samcake
0c55130548 maybe i have solved the passing of the status 2015-07-02 17:31:29 -07:00
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
Sam Gateau
8d8a902328 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 15:06:32 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
ericrius1
f52d9c1293 added paint scripts for polylines 2015-07-02 14:54:09 -07:00
Seth Alves
246861221c rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready. 2015-07-01 20:17:21 -07:00
Sam Gateau
d019ef4373 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 18:12:11 -07:00
Sam Gateau
e8b11f1198 Exposing the display Item Status to js to turn it on/off 2015-07-01 17:27:41 -07:00
Brad Davis
566842389b Animation performance test script 2015-07-01 17:04:48 -07:00
Brad Hefta-Gaub
8ec3f7ea46 Merge pull request #5228 from DaveDubUK/walk-1.25 
walk.js disable audio by default
 2015-07-01 13:19:45 -07:00
Clément Brisset
52d1ae18cc Merge pull request #5233 from SamGondelman/cameraMode 
correct menu shortcut for mouselook
 2015-07-01 11:15:31 -07:00
Seth Alves
33d9dc40f5 name stick 2015-06-29 16:08:50 -07:00
Seth Alves
2e5b25b5d8 include timescale in wire protocol ../../interface/src/avatar/AvatarActionHold.cpp 2015-06-29 14:34:26 -07:00
Sam Gondelman
0bf4c9dda2 correct menu shortcut for mouselook 2015-06-29 09:58:35 -07:00
Seth Alves
b19517ace7 make voxel editing work, even if the voxel-space is empty 2015-06-28 07:53:35 -07:00
Seth Alves
f2d8c78a88 make voxel editing work, even if the voxel-space is empty 2015-06-28 07:53:16 -07:00
Seth Alves
97cd5b8b99 Merge pull request #5223 from SamGondelman/cameraMode 
misc. key binding/camera fixes
 2015-06-27 10:55:34 -07:00
Seth Alves
7f609dca26 Merge branch 'cameraMode' of github.com:SamGondelman/hifi into actions-over-wire 2015-06-27 10:49:12 -07:00
Seth Alves
5ecc39b811 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 20:06:10 -07:00
DaveDubUK
bb2c640a6d walk.js disable audio by default 2015-06-27 09:23:18 +07:00
Atlante45
7aae36d73e Restore jquery 2015-06-26 17:58:53 -07:00
Sam Gondelman
2f0fcba1eb key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode 2015-06-26 17:28:02 -07:00
Seth Alves
7def9c2e28 better handle failure to rez the stick 2015-06-26 17:10:50 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Howard Stearns
ce1e67b55a Merge pull request #5179 from DaveDubUK/walk-1.25 
walk.js version 1.25
 2015-06-26 07:02:09 -07:00
Zander Otavka
803f644edf Make hyperlink its own section in edit.js. 2015-06-25 11:40:09 -07:00
DaveDubUK
ce31e586b0 fixed sounds. fixed constants 2015-06-25 12:40:51 +07:00
DaveDubUK
ececf68f06 Merge branch 'master' of https://github.com/highfidelity/hifi into walk-1.25 2015-06-25 12:15:07 +07:00
Brad Hefta-Gaub
6c4a4866d3 Merge pull request #5202 from Atlante45/overlay 
Overlay have correct bounds
 2015-06-24 19:00:55 -07:00
Niraj Venkat
d89ff2f720 Merge pull request #5188 from AlexanderOtavka/master 
Improve address bar and edit.js entity properties list.
 2015-06-24 16:48:24 -07:00
Atlante45
bc1abbe9b2 Update scripts 2015-06-24 16:45:38 -07:00
Brad Hefta-Gaub
0269e1eff1 Merge pull request #5204 from huffman/toolbar-titlebar 
Add titlebar to toolbar and fix issue with draggable widgets not working (edit.js specifically)
 2015-06-24 16:12:39 -07:00
Ryan Huffman
4df1bea4ec Merge pull request #5167 from SamGondelman/hmdControls 
hmdControls.js for movement when wearing an HMD
 2015-06-24 14:40:31 -07:00
Ryan Huffman
54ee869d9b Fix y position of toolbar 2015-06-24 14:04:53 -07:00
Ryan Huffman
666eaa81fe Cleanup implementation of toolbar titlebar 2015-06-24 14:02:06 -07:00
DaveDubUK
0e71583048 code review changes for walk.js 1.25 2015-06-24 19:41:54 +07:00
DaveDubUK
73e59fe07f code review changes for walk.js 1.25 2015-06-24 19:25:25 +07:00
DaveDubUK
c2287e9953 code review changes for walk.js 1.25 2015-06-24 19:24:57 +07:00
Zander Otavka
8c77fd369b Add subsections to the edit.js properties list. 2015-06-23 17:40:38 -07:00
Ryan Huffman
694a051724 Add titlebars to toolBars.js 2015-06-23 15:32:24 -07:00
Howard Stearns
5114f82dca Fix https://app.asana.com/0/32622044445063/38213714069516 2015-06-23 12:07:01 -07:00
Seth Alves
4bf4e9f5da Merge pull request #5164 from ericrius1/lineBounds 
Line bounds
 2015-06-23 10:47:38 -07:00
Philip Rosedale
1930043329 Merge pull request #5191 from ericrius1/gunFix 
fixed bullet size to be smaller for gun.js script
 2015-06-23 09:53:23 -07:00
ericrius1
cf579ab275 fixed bullet size to be smaller 2015-06-23 09:52:29 -07:00
Zander Otavka
f7cd756796 Improve entity properties list in edit script. 
Add headers to break up logical sections, and reorder/relabel a few
properties.
 2015-06-23 09:17:23 -07:00
ericrius1
9014e8c038 increased dimensions for line entity 2015-06-22 15:34:46 -07:00
Philip Rosedale
fd96c3a280 Merge pull request #5184 from ericrius1/utilities 
Utilities
 2015-06-22 12:14:17 -07:00
ericrius1
6c84e5ad77 actually syncing brush to line color 2015-06-22 11:08:40 -07:00
ericrius1
1b69563b29 changed quad back to line; 2015-06-22 11:06:40 -07:00
Howard Stearns
edf024dff8 Merge pull request #5178 from ctrlaltdavid/20584 
CR for #20584 - Improve legibility of entities editor
 2015-06-22 10:46:15 -07:00
ericrius1
362d9a2481 syncing brush sphere with line color 2015-06-22 10:35:00 -07:00
DaveDubUK
10d981e6d5 walk.js 1.25 comments removal 2015-06-22 17:51:49 +07:00
DaveDubUK
54608b9cb3 walk.js version 1.25 2015-06-22 14:18:07 +07:00
ericrius1
8fcff2d648 changed indent spacing to 4 spaces 2015-06-19 19:03:47 -07:00
ericrius1
18014e968d removed horizontal "line break" style comment blocks 2015-06-19 19:00:42 -07:00
ericrius1
8bc9fc2e1f simplified paint.js script to allow for faster iteration and more thorough testing 2015-06-19 18:58:09 -07:00
David Rowe
bdcf87a3c6 Improve legibility of entities editor 
Increased font sizes.
Improved contrast between values and backgrounds.
 2015-06-19 16:28:45 -07:00
Sam Gondelman
a0d4b7ec7c without script, doesn't limit you to constant degree turns 2015-06-19 16:11:43 -07:00
Sam Gondelman
e78ce8055a hmdControls turns on when you enter VR mode, turns off when you exit, can toggle with CTRL+G 2015-06-19 11:17:36 -07:00
Ryan Huffman
1e69e647bb Remove pointer.js from defaultScripts because it causes crashes 2015-06-19 11:02:00 -07:00
ericrius1
1eaf5ae82a fixed utilities file to be able to be referenced by other files 2015-06-19 10:37:57 -07:00
Sam Gateau
5a2d2485c0 Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque 2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Sam Gondelman
9cfe8ecc01 added hmdControls.js to hmdDefaults.js 2015-06-18 18:59:10 -07:00
Sam Gondelman
decae5c1f1 finished hmdControls.js 2015-06-18 18:43:47 -07:00
ericrius1
7293330ced fixed indentation and lines delete when user exits to help with large model.svo/json file size 2015-06-18 18:17:02 -07:00
ericrius1
830a8b6909 checking for bounds and modified paint script to start a new line entity if user paints outside of line entity's bounding box 2015-06-18 18:14:03 -07:00
Brad Hefta-Gaub
750ce250fa Merge pull request #5150 from SamGondelman/mouseLook 
mouse look script
 2015-06-18 17:41:20 -07:00
Sam Gondelman
012a508eb2 removed extraneous code 2015-06-18 16:25:12 -07:00
Sam Gondelman
c84a6cbf28 added warping 2015-06-18 16:05:58 -07:00
Sam Gondelman
fb7ddde0ca removed magic numbers 2015-06-18 15:29:20 -07:00
Sam Gondelman
fd0efd91ff added shift action, added timers and fast mode to hmdControls.js 2015-06-18 13:59:37 -07:00
Philip Rosedale
61a2196a30 Reduce error tolerances for ballistic prediction that trigger updating the server 2015-06-18 13:21:37 -07:00
Sam Gondelman
3baf6d80ae removed magic numbers from mouseLook.js 2015-06-18 10:10:54 -07:00
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
Sam Gondelman
a37b089b33 merge with master 2015-06-17 12:17:09 -07:00
Sam Gondelman
c0797313a1 added mouseLook.js to default scripts 2015-06-17 12:08:23 -07:00
Andrew Meadows
61f62f96b0 Merge pull request #5129 from SamGondelman/master 
Integrating gamepads/hydras to input mapping system, zooming
 2015-06-17 11:39:38 -07:00
Sam Gondelman
3af0c138dd removed button image, extraneous variables 2015-06-17 11:39:11 -07:00
Sam Gondelman
17322645f2 added mouselook script, reticle and icons need changes 2015-06-17 11:17:38 -07:00
Seth Alves
f5cea57a48 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-17 07:20:15 -07:00
Philip Rosedale
7ead2bc46b Merge pull request #5120 from ctrlaltdavid/20576 
DO NOT MERGE - QA for #20576 - Play sound when mic is muted
 2015-06-16 13:27:01 -07:00
Seth Alves
a5f7ba51b6 only show polyvox property widgets if we are editing a polyvox. 2015-06-16 10:13:47 -07:00
Sam Gondelman
40bd747080 added trigger buttons to hydra, removed hydraMove.js from default scripts 2015-06-15 11:13:07 -07:00
Philip Rosedale
0b4d4c24d4 Merge pull request #5119 from ericrius1/paintingOptimizations 
added lifetime to painted lines to prevent huge model.json files when…
 2015-06-14 21:47:56 -07:00
Philip Rosedale
c113b4620d Merge pull request #5107 from howard-stearns/draggable-toolbar 
Draggable toolbar
 2015-06-14 21:46:49 -07:00
David Rowe
c369e305f8 Include dialTone.js in default scripts 2015-06-12 12:33:30 -07:00
David Rowe
f0b6b0f548 Play sound upon microphone being muted 2015-06-12 12:33:17 -07:00
David Rowe
546442ff9a Fix sound URLs 
Three slashes needed for Windows.
 2015-06-12 12:32:40 -07:00
Eric Levin
7ee609396c added lifetime to painted lines to prevent huge model.json files when lots of people draw in one domain. Got rid of gaps in lines when switching line entities 2015-06-12 11:58:43 -07:00
Howard Stearns
27f40ea881 Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
Howard Stearns
3cb4ee183e Update header. 2015-06-11 16:24:22 -07:00
Howard Stearns
e6bafb9bf1 Draggable toolBar.js, with persistence, and update some scripts for it. 2015-06-11 16:19:54 -07: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
Andrew Meadows
a3c5ea1b58 Merge pull request #5088 from sethalves/actions 
spring action with rotation and position target, rework grab script to use it
 2015-06-11 13:23:57 -07:00
Seth Alves
8ed9a3ca02 add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07:00
Brad Hefta-Gaub
a1ee339765 Merge pull request #5103 from samcake/punk 
TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene
 2015-06-11 10:17:38 -07:00
Andrew Meadows
f77f3f1e1e fix bug where grab.js moves mouse to screen corner 
when CTRL is pressed
 2015-06-11 08:43:19 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Philip Rosedale
b32994b359 Merge pull request #5083 from ctrlaltdavid/20551 
CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace
 2015-06-10 22:32:25 -07:00
Seth Alves
8bd80c511e make stick follow mouse motion 2015-06-10 21:08:00 -07:00
Seth Alves
4216308b9b Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 19:05:25 -07:00
Seth Alves
45c7cd4929 respond to code review, add a simple hold-a-stick script 2015-06-10 18:48:51 -07:00
Niraj Venkat
9ed8daa97c Removing unnecessary functions 2015-06-10 15:33:07 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Niraj Venkat
4617b7331c Working on creating functions to serialize and deserialize properties 2015-06-10 09:50:47 -07:00
Niraj Venkat
d90e43c5aa Adding text boxes for hyperlink href and description 2015-06-09 16:15:47 -07:00
Stephen Birarda
091ed5b514 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 15:51:45 -07:00
Seth Alves
6cce845984 rotate based on initial mouse-position and initial entity rotation rather than doing small deltas as the mouse moves 2015-06-09 14:26:44 -07:00
Seth Alves
23dab530f9 fix some glitchy behavior during rotation 2015-06-09 14:11:01 -07:00
David Rowe
a4885ff38c Close directory window after domain change 2015-06-09 12:33:30 -07:00
Seth Alves
ccb2f17b33 grab.js rotation sort-of works now 2015-06-09 11:21:13 -07:00
Seth Alves
42f94307d5 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-09 09:51:29 -07:00
Sam Gondelman
b1b2d1f85c ;) (added semicolons to js example) 2015-06-09 09:45:19 -07:00
David Rowe
cb6aef16e6 Merge branch 'master' into 20551 2015-06-09 09:36:44 -07:00
David Rowe
9e3ce344fb Display directory button just above edit toobar 2015-06-09 07:26:18 -07:00
Brad Hefta-Gaub
3fb5e47dcc Merge pull request #5064 from ericrius1/paint 
bumped max line points to 80
 2015-06-08 21:20:58 -07:00
Seth Alves
2fb64aad91 fix variable name 2015-06-08 20:31:35 -07:00
Seth Alves
14a45e8349 convert grab.js to use spring action. rotation doesn't work right, yet 2015-06-08 18:25:58 -07:00
Seth Alves
f491a7a786 Merge pull request #5084 from AndrewMeadows/inertia 
rewrite grab.js to follow mouse
 2015-06-08 17:35:03 -07:00
Brad Davis
90c18d0c48 Merge pull request #5080 from ZappoMan/team-teaching 
Merge TEAM-TEACHING into MASTER
 2015-06-08 17:34:42 -07:00
Andrew Meadows
b682a07714 merge upstream/master into andrew/inertia 
Conflicts:
	examples/grab.js
 2015-06-08 17:28:14 -07:00
Andrew Meadows
ef1e3aae00 faster move and max solid angle for distant grabs 2015-06-08 16:59:33 -07:00
Andrew Meadows
ffeac220f9 fix typo in variable name 2015-06-08 16:40:50 -07:00
Andrew Meadows
e70cd9edd9 remove unused variable 2015-06-08 15:11:42 -07:00
Andrew Meadows
4647f84638 rewrite grab.js to follow mouse 2015-06-08 14:58:42 -07:00
Eric Levin
6d59518149 added meditative ocean landscape and common utilities file 2015-06-08 14:02:38 -07:00
ZappoMan
24c8e7d0e6 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 13:50:50 -07:00
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
Stephen Birarda
4e755e304b fix spacing in new JS file 2015-06-08 11:31:24 -07:00
Stephen Birarda
666830c04d add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
David Rowe
f51feca37d Add directory button 2015-06-08 11:29:35 -07:00
Sam Gateau
de61f4ea0b Gettting th ehighlight on transparent to work 2015-06-08 02:52:13 -07:00
Sam Gateau
8d3a3221b0 shuffling the rendering steps to get to render transparent and light it correctly 2015-06-06 09:50:56 -07:00
Seth Alves
037a70b03a undo unneeded/breaky change in grab.js 2015-06-05 13:47:07 -07:00
ZappoMan
7dc0e8a66c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 12:21:29 -07:00
Eric Levin
21aa3b62bc bumped max line points to 80 2015-06-05 12:04:32 -07:00
Seth Alves
b425cc6491 merge from upstream 2015-06-05 11:56:33 -07:00
Philip Rosedale
1f11625db4 Merge pull request #5060 from ericrius1/paint 
moved ball marker closer to hand so painting feels more visceral
 2015-06-05 11:26:22 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Eric Levin
9f974c3b5c moves ball marker closer to avatar for mouse as well 2015-06-05 10:19:39 -07:00
Sam Gondelman
dd12e4740e example script for controller scripting, input mapping 2015-06-05 10:14:13 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Eric Levin
30ba7ffc29 moved ball marker closer to hand so painting feels more visceral 2015-06-05 09:36:12 -07:00
Andrew Meadows
08b64666fe Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume 
Smooth initial crash volume
 2015-06-05 08:40:09 -07:00
Seth Alves
b2db5f7fee update grab.js to use pull-to-point action, various other fixes 2015-06-05 07:10:44 -07:00
Eric Levin
fd8126510d marker ball now stays without mouse whether or not user is drawing 2015-06-04 21:41:19 -07:00
Eric Levin
9264ef980c added redo and undo functionality to mouse component of paint script, and fixed overlay not being deleted on script ending bug 2015-06-04 21:13:16 -07:00
Philip Rosedale
8c32f8f396 Merge pull request #5054 from ericrius1/paint 
added paint.js and line rider script. Users can paint lines with hydr…
 2015-06-04 20:52:23 -07:00
Eric Levin
f276ca30cd refactoring for common functions. Fix for randFloat 2015-06-04 17:55:55 -07:00
Eric Levin
241330442c added paint.js and line rider script. Users can paint lines with hydra or mouse, and then go on a ride over the line they just created. 2015-06-04 17:35:26 -07:00
Eric Levin
1fd0650955 removing overlay on script ending 2015-06-04 16:54:52 -07:00
Eric Levin
a2ae51371b updated pointer.js script to work with new line entity 2015-06-04 15:44:39 -07:00
Howard Stearns
5727400b9a Sound toys script (in examples/soundToys.js) 2015-06-04 14:20:19 -07:00
Sam Gateau
b339aa683a adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items 2015-06-03 11:25:45 -07:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
Sam Gateau
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -07:00
Seth Alves
a85a0b863d icon for create-polyvox button 2015-06-02 16:25:38 -07:00
Seth Alves
20d3814c1b code review 2015-06-02 10:00:07 -07:00
Seth Alves
175926736d Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-01 09:59:01 -07:00
Eric Levin
45331e5a0e removed sounds from grab script 2015-06-01 09:37:54 -07:00
Seth Alves
00af0a4376 trying to make thing behave when voxel-space is resized 2015-06-01 07:15:37 -07:00
Seth Alves
b9202ebfb6 added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look 2015-05-31 09:14:59 -07:00
Seth Alves
a3589788df allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items. 2015-05-30 18:33:35 -07:00
Seth Alves
ad71d7b7a2 allow changing of voxel-volume-size with edit.js 2015-05-30 18:14:36 -07:00
Seth Alves
fe59f8846f recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape 2015-05-30 16:43:11 -07:00
Seth Alves
96a40bd673 basic collisions with cubic polyvoxes 2015-05-29 18:50:26 -07:00
Eric Levin
8dda86f80d added brownianFun script to apply random forces to balls in a pen 2015-05-29 17:02:51 -07:00
Philip Rosedale
11844463d1 Merge pull request #4915 from AndrewMeadows/isothermal 
DO NOT MERGE grabHockey.js script can safely manipulate misc objects again
 2015-05-29 16:07:32 -07:00
Seth Alves
06ffcbf24d Merge pull request #4981 from ericrius1/blockWorld 
tiles and block no longer delete on script end, now user can delete a…
 2015-05-28 11:09:14 -07:00
Andrew Meadows
2a4cd468e4 Merge pull request #4979 from sethalves/polyvox 
initial pass at Polyvox Entity Type
 2015-05-28 10:43:50 -07:00
Eric Levin
03062fccd3 remove whiteboard by default in pointer.js 2015-05-28 10:17:47 -07:00
Seth Alves
4fa6f388b9 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 18:20:59 -07:00
Brad Hefta-Gaub
5da3a9440e Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples 
[REQUIRES #4962] Remove global collision and update examples
 2015-05-27 16:09:14 -07:00
Seth Alves
95c5ed66fc Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 15:37:33 -07:00
Seth Alves
43dd8b3fb1 Merge pull request #4980 from ericrius1/pointer 
Pointer
 2015-05-27 15:37:24 -07:00
Eric Levin
8db8277bf8 tiles and block no longer delete on script end, now user can delete all the stuff with a button click instead. Also blocks now spawn with random angular velocity for spinning fun 2015-05-27 15:20:49 -07:00
Eric Levin
07c8fb6c02 turned pointer and draw funcitonality off be default 2015-05-27 15:11:16 -07:00
Eric Levin
ca85401b77 added button so user can toggle pointer on/off 2015-05-27 15:08:52 -07:00
Seth Alves
7f99f261c2 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 13:59:13 -07:00
Seth Alves
29cb5ed126 Merge pull request #4967 from ericrius1/pointer 
modified pointer script to allow users to draw on surfaces
 2015-05-27 13:56:17 -07:00
Seth Alves
429cc631f3 limit size of polyvox data property to below MTU 2015-05-27 09:48:32 -07:00
Seth Alves
0f81445cee flag for polyvox to select minecraft vs walking-cubes. uppack to unpack 2015-05-27 07:04:44 -07:00
Eric Levin
3fb5476968 added blockWorld script to generate floor of tiles and drop jenga blocks at random points above floor 2015-05-26 16:46:01 -07:00
Eric Levin
579c62420d added header to pointer script 2015-05-26 16:43:34 -07:00
Eric Levin
7194d4a4da modified pointer script to allow users to draw on surfaces 2015-05-26 16:40:47 -07:00
Seth Alves
55028f6cb0 voxel data sent over wire and saved to json 2015-05-26 16:34:35 -07:00
Howard Stearns
ae73e68f7b Update header. 2015-05-26 13:27:37 -07:00
Howard Stearns
d214f128cd Miniumum change for gun to use per-entity collisions. 
I have *not* updated this script for other recent changes (e.g., to entityIDs).
 2015-05-25 17:39:15 -07:00
Howard Stearns
050829e442 typo 2015-05-25 17:23:22 -07:00
Howard Stearns
590ad22d89 Update spaceInvaders to use per-entity collision handlers. 
Also fix bitrot:
* The 'f' key triggers a profile, after which all bets are off regarding time-dependent behavior such as lifetime and update().
 (I'm moving space-invaders "fire" to the space bar as a work-around.)

* You don't get a collision without
 a non-default shapeType property (if the object type is "Model")
 a truthy collisionsWillMove property

* Entity handles (such as returned by Entity.addEntity) no longer have a separate 'id' property, so don't reference that. Just use the handle object itself.

* When an entity's lifetime expires, Entities.getEntityProperties(theEntityHandle) returns default values.
 It looks like the space-invaders script was written at a time when this returned falsey.
 (I'm changing the script to see if the properties.type === 'Unknown'.)

NOT FIXED is that the level of detail is cutting out when showing all the invaders.
 2015-05-25 17:16:35 -07:00
Howard Stearns
09e9d353ea Deprecate globalCollisionsExample.js, and add entityCollisionExample.js 2015-05-25 17:15:55 -07:00
Howard Stearns
706c837886 Use collisionSoundURL for billiards.js, instead of the global collision event. 2015-05-25 17:12:36 -07:00
Atlante45
18812ab25f Fix entityProperties.html undefined ref 2015-05-24 19:21:04 +02:00
Triplelexx
9a29489784 expose particle properties for editing 
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
 2015-05-23 17:57:25 +01:00
Brad Hefta-Gaub
225021671a Merge pull request #4950 from ericrius1/particleScriptName 
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
 2015-05-22 22:17:39 -07:00
Eric Levin
71c0aa4913 renamed ajt-test to particles.js since ajt-test doesn't tell us anything about what the script does 2015-05-22 15:33:38 -07:00
Eric Levin
d40d9cca69 deleted look.js (no longer needed) and removed from default scripts 2015-05-22 10:02:28 -07:00
Brad Hefta-Gaub
9b469226f3 Merge pull request #4934 from sethalves/fix-edit-js 
fix edit.js -- selectionManager.selections holds ids, not properties
 2015-05-21 18:32:05 -07:00
Seth Alves
35b1a6eee4 selectionManager.selections holds ids, not properties 2015-05-21 18:15:05 -07:00
Philip Rosedale
05a73d8a79 Merge pull request #4933 from ericrius1/inspectFix 
added oldMode as global vairable
 2015-05-21 18:14:40 -07:00
Eric Levin
ce1ccf1c40 added oldMode as global vairable 2015-05-21 18:08:04 -07:00
Eric Levin
8a0c1cab1e inspect now uses accurate picking and camera slerps to looks at target. pointer does not show u when user is inspecting 2015-05-21 15:31:30 -07:00
Seth Alves
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -07:00
Seth Alves
d8beed34d6 remove // ? comments 2015-05-20 16:27:28 -07:00
Seth Alves
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub
6955626b77 Merge pull request #4900 from ericrius1/hockey 
added check to airhockey script so entities that have never been crea…
 2015-05-20 14:50:00 -07:00
Brad Hefta-Gaub
6d20fa72db Merge pull request #4899 from Nex-Pro/plankyUpdate 
Planky Game. Added values for friction and restitution in the entity parameters.
 2015-05-20 14:49:39 -07:00
Brad Hefta-Gaub
75f6092023 Merge pull request #4902 from Atlante45/fix_source_url 
Fix sourceUrl box in edit.js
 2015-05-20 14:49:15 -07:00
Ryan Huffman
6f69ed2561 Fix calculated dimensions of spotlight 
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
 2015-05-20 09:11:48 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Andrew Meadows
139ebca258 less bad behavior when dragging across horizon 2015-05-18 23:09:08 -07:00
Andrew Meadows
d486899aad remove unused experimental grab placement 2015-05-18 22:54:00 -07:00
Andrew Meadows
fbd1b7e8b0 grabHockey.js can also rotate objects again 2015-05-18 22:49:23 -07:00
Andrew Meadows
b60907570a safe to use grabHockey.js to grab misc objects 2015-05-18 22:32:20 -07:00