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

1152 commits

Author SHA1 Message Date
Chris Collins
414a79d986 Merge pull request #8868 from huffman/fix/away-overlays 
Remove showing of overlays in away.js
 2016-10-20 16:42:05 -07:00
David Rowe
c6558ebebd Reinstate "reload" button for entity scripts in entities editor 2016-10-21 11:14:57 +13:00
Seth Alves
96445f4dee Merge pull request #8861 from hyperlogic/feature/crowd-agent-attachment 
Added attachment support to crowd-agent
 2016-10-20 13:44:25 -07:00
Anthony J. Thibault
53864abaf2 edit.js: Fix for picking and manipulating objects via hand controllers. 
The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.
 2016-10-20 13:37:31 -07:00
Brad Davis
9523660027 Fix offscreen QML texture leak, improve texture sharing for same size surfaces 2016-10-20 11:55:25 -07:00
Ryan Huffman
fad0607bf6 Remove showing of overlays in away.js 2016-10-20 11:49:23 -07:00
Brad Hefta-Gaub
1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
 2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
9008de72e0 Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments 
Adjustment to position and visibility of grab sphere.
 2016-10-19 21:51:02 -07:00
Brad Hefta-Gaub
e6e988c1a1 Merge pull request #8857 from howard-stearns/fix-crowd-animation-again 
fix crowd animation again
 2016-10-19 17:41:52 -07:00
Anthony J. Thibault
55c062098a Adjustment to position and visibility of grab sphere. 
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
 2016-10-19 17:33:05 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers. 
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
 2016-10-19 15:59:26 -07:00
Anthony J. Thibault
c3b05d6477 Added attachment support to crowd-agent 2016-10-19 15:02:55 -07:00
Ryan Huffman
f42683cf8b Update users.js to be minimizable when logged out, and by default 2016-10-19 13:19:29 -07:00
howard-stearns
69a1415873 specify avatar skeleton 2016-10-19 12:29:18 -07:00
Seth Alves
7e4964db3e Merge pull request #8684 from Menithal/controller-grab-unequip 
Fixed HandcontrollerGrab distance unequip
 2016-10-19 09:53:04 -07:00
Brad Hefta-Gaub
c082c74cc0 use head pose for controller in case there are no hand controllers available 2016-10-18 10:01:00 -07:00
Ryan Huffman
5f5dedaa40 Fix equip sphere not showing up 2016-10-17 10:53:02 -07:00
howard-stearns
140caf84d8 never interact with hud elements while holding something 2016-10-14 18:30:52 -07:00
Chris Collins
d70b58555e Merge pull request #8794 from howard-stearns/clientOnly-tablet 
make marketplace tablet be clientOnly
 2016-10-14 10:54:54 -07:00
Howard Stearns
fc8bbde60a Merge pull request #8810 from ZappoMan/handControlsWhileLoading 
make laser pointers work even while content is loading
 2016-10-14 10:01:46 -07:00
Brad Hefta-Gaub
ef3c9ba78a better handling of the teleport target overlays to prevent flashing and thrashing 2016-10-13 18:24:38 -07:00
Brad Hefta-Gaub
ddce0ef74a make laser pointers work even while content is loading 2016-10-13 17:50:20 -07:00
howard-stearns
d232d115d5 persist tablet data, and clean it up on startup 2016-10-13 16:53:44 -07:00
Brad Hefta-Gaub
4a318e5498 Merge pull request #8784 from howard-stearns/crowd-animation 
make agent avatar animations work again, and use them in crowds
 2016-10-13 16:02:41 -07:00
Brad Hefta-Gaub
5638f6228b Merge pull request #8792 from howard-stearns/allow-hmd-hand-controllers-without-interface-focus 
allow hand controller operations when Interface doesn't have focus, but ONLY when in hmd
 2016-10-13 13:48:44 -07:00
Ryan Huffman
55d4695489 Fix edit.js not allowing imports when you only have temp rez permissions 2016-10-13 11:51:54 -07:00
howard-stearns
78f96a80bd oops 2016-10-12 16:31:12 -07:00
howard-stearns
b377127fc1 make marketplace tablet be clientOnly 2016-10-12 14:46:04 -07:00
howard-stearns
579c95b5dd pr feedback 2016-10-12 14:42:41 -07:00
howard-stearns
055e2ffcb0 Merge branch 'master' of https://github.com/highfidelity/hifi into crowd-animation 2016-10-12 14:38:07 -07:00
howard-stearns
0099a4e549 allow hand controller operations when Interface doesn't have focus, but 
ONLY when in hmd.
 2016-10-12 11:23:06 -07:00
samcake
8784f70a1a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-12 09:57:27 -07:00
Seth Alves
16af14d1f6 Merge pull request #8758 from hyperlogic/bug-fix/allow-ignoreik-false 
allow equipped object to follow hand and not controller
 2016-10-12 09:52:57 -07:00
samcake
5f9c713d44 Merging with upstream after resolving some conflicts 2016-10-12 09:22:12 -07:00
Brad Hefta-Gaub
0f1e61e240 Merge pull request #8781 from ZappoMan/tweakGrabPoint 
adjust grab indicators
 2016-10-12 07:08:16 -07:00
Brad Hefta-Gaub
6630ec3208 Merge pull request #8746 from ctrlaltdavid/21033 
Send High Fidelity user's visibility when users.js starts up
 2016-10-11 21:36:22 -07:00
Brad Hefta-Gaub
8ac31a041d Merge pull request #8654 from ZappoMan/betterAway 
fix away HMD unmouted logic
 2016-10-11 20:35:08 -07:00
Anthony J. Thibault
f76dbeeffd Edit.js now works with new ignoreIK default 2016-10-11 17:12:02 -07:00
Brad Hefta-Gaub
e1a3bc7d55 hide/show grab point sphere only when in a grabbable entity 2016-10-11 16:22:42 -07:00
samcake
eea5118eab Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-11 16:19:00 -07:00
howard-stearns
884d22a59b make agent avatar animations work again, and use them in crowds 2016-10-11 16:06:55 -07:00
Brad Hefta-Gaub
93d9cf7917 adjust grab indicators 2016-10-11 12:42:26 -07:00
Andrew Meadows
abb05bc686 Merge pull request #8753 from ctrlaltdavid/21068 
Improve indication of user not being logged in
 2016-10-11 10:40:37 -07:00
David Kelly
c664c7192e Merge pull request #8759 from howard-stearns/crowd-update 
update for sound
 2016-10-10 16:03:10 -07:00
samcake
5bb26fdb7f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-10 15:56:37 -07:00
Brad Hefta-Gaub
774d87a7a7 Merge pull request #8773 from howard-stearns/marketplace-button-state 
make marketplace button state match whether tablet is being shown
 2016-10-10 15:50:07 -07:00
Brad Hefta-Gaub
a877f182f7 Merge pull request #8771 from howard-stearns/kick-by-laser 
fix kick by laser
 2016-10-10 15:36:16 -07:00
howard-stearns
333ec388a8 make marketplace button state match whether tablet being shown 2016-10-10 14:30:47 -07:00
howard-stearns
1051c068e1 kick by hand controller 2016-10-10 13:47:08 -07:00
Brad Hefta-Gaub
4ec9299930 fix reticle depth when not moving mouse, but moving head relative to HUD 2016-10-08 14:31:30 -07:00
Brad Hefta-Gaub
20c522a9bc fix more bugs in away 2016-10-08 13:45:18 -07:00
Brad Hefta-Gaub
3aa1c36f53 Merge branch 'master' of https://github.com/highfidelity/hifi into betterAway 2016-10-08 11:50:10 -07:00
samcake
5def24a5ac Merging... 2016-10-07 17:09:00 -07:00
Menithal
4bed3ee036 Adjusted theoretical Unequip time to 250 ms 2016-10-08 01:36:57 +03:00
howard-stearns
7c5dd89372 typo 2016-10-07 15:27:58 -07:00
howard-stearns
c5f889a34d update for sound 2016-10-07 15:13:37 -07:00
Anthony J. Thibault
7c7a9055d1 Allow grabbed objects to override the ignoreIK = true default. 
They can do this by adding the following to their userData.

    grabbableKey: {
        ignoreIK: false
    }

When this is present and false, the object will follow the hand joint, otherwise it will follow the hand controller.
 2016-10-07 14:50:00 -07:00
Anthony J. Thibault
0c2ebc27cb Fix for exception in handControllerGrab.js 
Specifically this:
    [UncaughtException] TypeError: Result of expression 'this.handToController' [undefined] is not a function. in file:///C:/msys64/home/anthony/code/hifi/build/interface/Release/scripts/defaultScripts.js:1388
 2016-10-07 14:48:55 -07:00
Ryan Huffman
a5e3fa45c3 Fix advanced movement being disabled 2016-10-07 10:30:18 -07:00
Ryan Huffman
c74df965ba Fix misnamed function and duplicate onFinish in tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
fec8049226 Add proper disabling to advanced movement script 2016-10-07 10:30:18 -07:00
Ryan Huffman
827506e929 Disable 180 spin in tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
a4ffa7b23f Add disabling of right click menu with vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
14323a06b3 Add interface to disable hand controller grab functionality 2016-10-07 10:30:18 -07:00
samcake
92d71a2e37 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-07 10:13:24 -07:00
Ryan Downe Karpf
ed2571704f Merge pull request #8735 from huffman/feat/teleport-improvements 
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to  certain surfaces
 2016-10-07 09:56:30 -07:00
sam
567adf651a FOund 2 bugs causing the empty clusters. now back to working 2016-10-07 05:02:04 -07:00
David Rowe
52fbb654fa Tweak location of users online minimize/maximize button 2016-10-07 15:43:54 +13:00
David Rowe
c637649805 Make users online title say to login to view 2016-10-07 15:25:47 +13:00
David Rowe
4ca0048ec9 Display minimized users list when not logged in 2016-10-07 15:21:24 +13:00
samcake
ac54533433 Adding more counters to understand the cullign bug 2016-10-06 18:15:32 -07:00
David Rowe
e2e762f9e7 Merge branch 'master' into 21055 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-07 11:27:35 +13:00
samcake
56eb322b7d Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-06 15:14:31 -07:00
Chris Collins
73e29c03ab Merge pull request #8728 from huffman/feat/unequip-using-grab 
Trigger unequip at a more lenient angle and with the secondary trigger
 2016-10-06 10:30:54 -07:00
samcake
ba88db1b14 Tried many different things to narrow down the issue of the corrupted memory, it seems to be linked to the grid dimendsions somehow, i m now forcing to reassign the frustum grid dimension on the 10th iteration which seems to fix the issue.... 2016-10-05 18:28:19 -07:00
David Rowe
b2f3b47db9 Send High Fidelity user's visibility when users.js starts up 2016-10-06 12:16:57 +13:00
David Rowe
1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-06 09:29:09 +13:00
samcake
e6572a42e3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-05 09:31:55 -07:00
Ryan Huffman
d50689b795 Remove disabling of teleport in hand grab 2016-10-04 20:25:46 -07:00
Ryan Huffman
d0ba53a069 Change name of isTooCloseToTeleport to be more descriptive 2016-10-04 20:22:22 -07:00
Ryan Huffman
1e6aba1928 Fix teleport not removing overlay on teleport 2016-10-04 20:21:32 -07:00
Ryan Huffman
2ef7c9a57a Disable smooth movement in teleport.js 2016-10-04 20:21:32 -07:00
Ryan Huffman
53623f7583 Make teleport.js normal rejection more lenient 2016-10-04 20:21:30 -07:00
Ryan Huffman
813ed59f00 Update teleport to not collide with non collidable entities 2016-10-04 20:19:54 -07:00
Ryan Huffman
75265cff6e Update teleport to not let you teleport into walls 2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737 Disable ray picking against invisible objects in far grab and teleport 2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722 Add the ability to ignore invisible entities in findRayIntersection 2016-10-04 20:19:32 -07:00
Ryan Huffman
8343cfd687 Add grip to unequip 2016-10-04 16:34:18 -07:00
Ryan Huffman
289cd6ba2b Adjust hand controller unequip rotation threshold 2016-10-04 16:34:18 -07:00
howard-stearns
cdd658d4dd report results 2016-10-04 11:31:49 -07:00
howard-stearns
1c73b3c043 Merge branch 'domain-check' of https://github.com/highfidelity/hifi into summon-crowd 2016-10-04 10:40:48 -07:00
howard-stearns
5ea4d48e36 poll for ready, and include physics in definition of ready, based on #8723 2016-10-04 10:23:10 -07:00
David Rowe
caf1a93354 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-10-04 10:51:14 +13:00
howard-stearns
8388e1044a cleanup to use script-driven cache cleaning 2016-10-03 14:09:52 -07:00
howard-stearns
e55d4f97b3 Merge branch 'davidkelly-dk/testScriptRelocation' into domain-check 2016-10-03 13:10:50 -07:00
howard-stearns
654461e97a Merge branch 'tribble-rez' of https://github.com/howard-stearns/hifi into howard-stearns-tribble-rez 2016-10-03 13:06:50 -07:00
howard-stearns
43c29500bf ac script to provide an on-demand crowd, and an interface script to summon 
it
 2016-10-03 12:03:23 -07:00
samcake
002d58d607 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-03 11:47:01 -07:00
David Kelly
70a63417cf point to tribbles.js on aws 
For now, anyways. Just temporary until dev is complete.
 2016-10-03 11:40:50 -07:00
Howard Stearns
ee801f4cc2 initial domain-check script 2016-10-03 10:29:33 -07:00
Howard Stearns
76d9d4c635 fix canRez logic in tribble script: only need canRezTemp, and fail hard rather than retry 2016-10-03 10:16:06 -07:00
Brad Hefta-Gaub
546d4ff986 remove mic and window resize notifications 2016-10-02 09:10:12 -07:00
David Rowe
ad5d525340 Fix keyboard status when switching between entities editor tabs 2016-09-30 14:13:35 +13:00
David Rowe
5e842843c6 Set alphabetic/numeric keyboard per field entered 2016-09-30 11:54:32 +13:00
Menithal
a6040197eb Fixed HandcontrollerGrab unequip. 
Will now use deltaTime and a second instead of instantly disconnecting on
if more than 0.1 off. This is to avoid accidental disconnection due to
acceleration and latency
 2016-09-29 22:24:07 +03:00
David Rowe
e3be34528f Fix keyboard flickering when select entities 
Fix entities list footer count of selected entities in the process.
 2016-09-29 16:53:20 +13:00
David Rowe
8e44096981 Fix last entities properties not scrolling when keyboard raised 2016-09-29 15:59:24 +13:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
David Rowe
b60f649e0a Scroll HTML window if necessary when raise keyboard 2016-09-28 19:27:16 +13:00
David Rowe
a94d77ee12 Raise and lower keyboard in entities editor 2016-09-28 17:57:53 +13:00
Zach Pomerantz
247fad5bfe clean up jitter stats 2016-09-27 17:24:34 -07:00
Zach Pomerantz
c391c26805 improve contrast by changing plotperf opacity 2016-09-27 10:29:35 -07:00
Zach Pomerantz
6cee473376 format and color audio stats 2016-09-27 10:22:32 -07:00
Zach Pomerantz
239b0c2181 fix PlotPerf reset 2016-09-26 19:27:03 -07:00
Zach Pomerantz
f40e46ac92 limit percentages to two decimals 2016-09-26 19:26:54 -07:00
samcake
9b94a025fc Refining the voxelization of the sphere in the view frustum grid 2016-09-26 18:41:53 -07:00
Brad Hefta-Gaub
f7228993a5 go into away if the application starts in HMD mode but it's not mounted 2016-09-26 17:29:37 -07:00
Zach Pomerantz
6035374004 add graphs to audio stats 2016-09-26 16:37:11 -07:00
Zach Pomerantz
e6c0baa1ff remake audio stats in qml 2016-09-26 15:35:45 -07:00
Brad Hefta-Gaub
c4a80996d5 fix away HMD unmouted logic 2016-09-23 16:17:28 -07:00
Seth Alves
785e187a27 edit.js uses notification.js to indicate errors instead of a modal dialog. in HMD, notification messages no longer jitter around 2016-09-21 11:39:25 -07:00
Brad Hefta-Gaub
2b01c60a55 Merge pull request #8615 from davidkelly/dk/1264 
Make the equip sphere emissive
 2016-09-19 16:33:55 -07:00
Anthony J. Thibault
aefe224215 Fix for jittery far-grab at low update rates 
Clamp the blendFactor used to smooth out the motion of the far-grabbed object.
This prevents the newTargetPosition from over shooting it's goal.
 2016-09-19 10:51:46 -07:00
David Kelly
22d80914e2 whitespace 2016-09-16 14:17:44 -07:00
David Kelly
ade17e6456 PR feedback 2016-09-16 14:15:14 -07:00
David Kelly
2ddd46f30b Switch to the cool looking model instead 2016-09-16 10:56:59 -07:00
David Kelly
1acfe017e1 Make the equip sphere emissive 
maybe this will make it visible in low ambient light situations?
 2016-09-15 17:12:35 -07:00
Chris Collins
84ffda5281 Merge pull request #8608 from huffman/fix/particle_explorer 
Fix eventBridgeLoader path in particle explorer
 2016-09-15 16:51:41 -07:00
Ryan Huffman
6a32ef29dc Fix eventBridgeLoader path in particle explorer 2016-09-15 13:07:00 -07:00
howard-stearns
03a8af76e3 don't do hand-controller edit object-selection when pointed at a HUD 
element
 2016-09-14 12:02:33 -07:00
Seth Alves
e5e9bb0052 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-14 11:28:10 -07:00
samcake
11c6bb7d80 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-13 17:44:42 -07:00
samcake
124060d31a Cleaning up a bit 2016-09-13 17:44:19 -07:00
samcake
e8c2dc10f1 best state for now 2016-09-13 14:59:23 -07:00
David Rowe
fa0aeb4563 Display render info values only when valid provided 2016-09-13 13:03:47 +12:00
David Rowe
d61e4c5c11 Display textures size in MB 2016-09-13 10:52:19 +12:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
samcake
821072bb76 REarrange the light stage construction and light frame usage to produce the light clusters 2016-09-12 11:07:55 -07:00
samcake
7a7a60a5c4 INtroducing a true stage for updating the light cluster and ui to debug 2016-09-11 00:17:34 -07:00
David Rowe
44282499c5 New glyph for "has transparent" 2016-09-10 14:37:09 +12:00
David Rowe
a06f49f791 Fix footer entities count not being updated when change filter value 2016-09-10 11:14:23 +12:00
David Rowe
487cb7d893 Use findInFrustum in entities list and filter results per search radius 2016-09-09 18:58:38 +12:00
Brad Hefta-Gaub
b56ad737d4 Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation 
Web Entities Virtual Keyboard + Event Bridge support
 2016-09-08 18:36:46 -07:00
Seth Alves
8c45c115b8 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-08 17:02:40 -07:00
Seth Alves
ecb0669972 try to keep far grab from getting stuck if the entity is brought very near to the grab-point 2016-09-08 17:02:29 -07:00
Seth Alves
0f98c51d89 distance-grabbed things collide with static entities 2016-09-08 16:13:22 -07:00
Clément Brisset
4437b1b5d6 Merge pull request #8573 from Atlante45/master 
Fix toolBar.js relative path
 2016-09-08 14:22:18 -07:00
Seth Alves
9e99cc1f78 fix mod.js 2016-09-08 07:35:52 -07:00
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00
David Rowe
a4b5f5395d Add "in view" button 2016-09-08 12:56:41 +12:00