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

3057 commits

Author SHA1 Message Date
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