Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-13 17:47:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60909 commits 25 branches 0 tags 1.1 GiB
Commit graph

1719 commits

Author SHA1 Message Date
Andrew Meadows
1137bd1436 pull qApp spaghetti out of Avatar class 
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
 2017-04-18 11:52:21 -07:00
Triplelexx
279997d905 change display plugin to deactivate when window minimized 2017-04-07 06:49:28 +01:00
Lexx
af95741a7e Merge branch 'master' into 21224 2017-04-04 18:24:49 +01:00
Triplelexx
01b13d7032 fix crash when pressing "Bookmark Avatar" button 
also modified LocationBookmarks for consistency
 2017-04-04 18:05:00 +01:00
Triplelexx
aa9a2532a9 fix for displaying "Bookmark Avatar" dialog in tablet ui 2017-03-30 13:54:33 +01:00
Triplelexx
50e35a220b Merge remote-tracking branch 'upstream/master' into 21224 2017-03-30 01:25:27 +01:00
Seth Alves
371df35013 remove code related to tablet being a model rather than an overlay. start on landscape mode 2017-03-29 14:16:14 -07:00
Triplelexx
bda1d54209 create AvatarBookmarks 
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
 2017-03-24 22:58:36 +00:00
Seth Alves
cc4ddd1387 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-21 08:43:35 -08:00
Vladyslav Stelmakhovskyi
fb0adae0b1 Scripts debug window in Tablet UI 2017-03-21 15:04:38 +01:00
Chris Collins
af2748410d Merge pull request #9932 from Triplelexx/21231 
21231 - Remove About Interface from File menu
 2017-03-20 09:55:57 -07:00
Chris Collins
509057c6d8 Merge pull request #9941 from Triplelexx/21232 
21232 - Remove Mini Mirror from View menu
 2017-03-20 09:55:37 -07:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
Triplelexx
a9b1a38665 remove Mini Mirror from View menu 
Avatar inputs only contains the audio meter now.
 2017-03-18 00:53:13 +00:00
Triplelexx
eba6c8de5e remove About Interface from File menu 2017-03-17 17:37:19 +00:00
Vladyslav Stelmakhovskyi
856e15060d Implemented Domain Connection statistics for Tablet UI 2017-03-15 21:05:13 +01:00
Seth Alves
563d59bda9 Merge pull request #9886 from vladest/tablet-ui-entity-statistics 
Tablet ui entity statistics
 2017-03-15 08:40:52 -08:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
Seth Alves
e8a9ff867d merge from upstream 2017-03-13 17:57:01 -07:00
Vladyslav Stelmakhovskyi
9e9c64021c Merge branch 'tablet-ui' into tablet-ui-entity-statistics 2017-03-13 19:54:40 +01:00
Vladyslav Stelmakhovskyi
49055cfa5c Some statistics showed 2017-03-13 16:31:29 +01:00
Vladyslav Stelmakhovskyi
81bc56f124 Fixed slider groove size calculation. Added LOD Tools to Tablet UI 2017-03-11 14:44:33 +01:00
David Rowe
950f91965d Merge branch 'tablet-ui-edit-js' into 21197 2017-03-08 17:35:58 +13:00
Brad Hefta-Gaub
8ae6f2727d add support for double click messages to overlays and entities 2017-03-07 17:52:55 -08:00
David Rowe
51739f2f99 Remove Developer > Network > Bandwith Details dialog 2017-03-07 15:02:26 +13:00
David Rowe
09ecb12510 Merge branch 'tablet-ui-edit-js' into 21197 
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-07 08:59:40 +13:00
Anthony J. Thibault
4f03c06a94 Added General Preference to control stylus vs finger usage 
By default the finger is preferred over the stylus.
 2017-03-01 18:07:53 -08:00
David Rowe
b9869264ba Display avatar settings dialog in tablet 2017-03-02 13:16:23 +13:00
Seth Alves
8110921abf git rid of _mouseToOverlays until I remember why I thought I needed it 2017-02-27 11:11:04 -08:00
Seth Alves
70060eb464 in 2d mode, clicks on tablet don't get used for other things 
Conflicts:
	scripts/system/libraries/entitySelectionTool.js
 2017-02-24 11:37:04 -08:00
Seth Alves
37004e4347 steps toward making mouse work on tablet 2017-02-23 08:11:31 -08:00
Seth Alves
41ef7b8dbb add setting to control if tablet is an entity or overlay 2017-02-22 21:13:42 -08:00
Seth Alves
3b181eb803 code review 2017-02-21 13:56:28 -08:00
Seth Alves
def669364b Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-17 15:45:19 -08:00
Seth Alves
d7bb6f105b make tablet part IDs available through qApp 2017-02-17 15:43:20 -08:00
Seth Alves
c1e41311fc working toward using uuids for overlay IDs 2017-02-16 17:18:09 -08:00
Anthony J. Thibault
8ccca86dee Settings for Tablet Becomes Toolbar 2017-02-16 15:57:36 -08:00
David Rowe
a08347936e Make clicking the tablet mic icon or audio bar toggle the mute state 2017-02-11 15:11:27 +13:00
Atlante45
191121888c Add log window to the ESS log 2017-02-09 13:04:43 -08:00
Seth Alves
9881dd261a Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-02-03 12:57:14 -08:00
Anthony J. Thibault
b44e5b5a1f tablet-ui: preferences for tablet ui scaling 
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
 2017-02-02 14:05:07 -08:00
Seth Alves
541692c5ca start on scripting interface to allow saving polyvox meshes to obj files 2017-01-28 15:38:18 -08:00
Dante Ruiz
2fc76d64fd clean up unused code and files 2017-01-10 09:13:46 -08:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2016-12-20 16:25:12 -08:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
David Rowe
349765ad74 Fix Clara download status message box not auto-closing 2016-12-15 16:00:07 +13:00
David Rowe
23b8bf7aab Fix crashing if manually close Clara download status message box 2016-12-15 13:35:58 +13:00
David Rowe
dbd00e39a8 Handle unzip failure 2016-12-15 11:52:34 +13:00
David Rowe
934f48362a Rework Clara.io download user messaging to have no user interaction 2016-12-14 22:23:25 +13:00
Brad Hefta-Gaub
a7750501c6 first cut at adding view frustum support to avatar mixer 2016-12-13 18:58:11 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
David Rowe
4c236b293e First pass at controller interaction with 3D Web overlay 2016-12-09 01:47:40 +13:00
David Rowe
7eacdb69b5 Auto-resize Clara.io models if larger than 10m as likely in cm or mm 2016-12-08 19:17:26 +13:00
David Rowe
641e47e0c5 Fix build warnings 2016-12-07 10:39:37 +13:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13:00
Anthony J. Thibault
e8b5b56df7 Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode" 
This reverts commit 119653bceb, reversing
changes made to a69d77ffbe.
 2016-12-05 15:16:49 -08:00
Anthony J. Thibault
349f0355ae Fix for reset sensors while in desktop mode. 
Previously hitting ' a.k.a. reset sensors, would teleport you to the last
position you were in before you switched into desktop mode, or the spawn location.

This fixes that behavior but not re-centering the avatar while in desktop mode.
 2016-12-05 10:42:20 -08:00
David Rowe
71de106594 Tidying 2016-12-04 15:14:47 +13:00
David Rowe
b84bcaf629 Highlight Web overlay with focus 2016-12-04 13:42:12 +13:00
David Rowe
38e6c8075c Direct keyboard input to Web overlay when has focus 2016-12-04 12:28:44 +13:00
David Rowe
a75d0b3fe8 Merge branch 'master' into 21089 2016-11-30 14:50:51 +13:00
howard-stearns
5188de924f allow for SnapshotReview dialog to be up during a change of href for all 
media capture
 2016-11-22 11:09:43 -08:00
Zach Fox
2c0cfdf241 Fix build for real? 2016-11-18 14:39:30 -08:00
Zach Fox
a81289a0d7 Huge progress today. Buggy behavior with multiple snapshots remains 2016-11-18 14:39:29 -08:00
Zach Fox
8f9ffd2bc5 Framerate is stable, and GIF duration is correctgit add -A! 2016-11-18 14:39:29 -08:00
Zach Fox
25471d9fae Still unstable, but maybe better? 2016-11-18 14:39:29 -08:00
Zach Fox
fc21cae904 More stable than ever! Uses external GifCreator lib. Still frame timing issues. 2016-11-18 14:39:29 -08:00
Zach Fox
f726ea546f code cleanup; simultaneous gif and still capture 2016-11-18 14:39:29 -08:00
Zach Fox
1158ae8b3d Much more stability. 2016-11-18 14:39:29 -08:00
Zach Fox
045dfff158 It's workinggit add -A! Stack corruption errors? Must fix. 2016-11-18 14:39:29 -08:00
Zach Fox
c39a8da3b8 Getting theregit add -A! 2016-11-18 14:39:29 -08:00
Zach Fox
b6dd795b00 It crashes, but it's the start of a new architecture 2016-11-18 14:39:28 -08:00
Zach Fox
ee21d1ccc7 IT WORKSgit add -A! Mega amounts of cleanup to do now. 2016-11-18 14:39:28 -08:00
Zach Fox
704476c197 Initial progressgit add -A! 2016-11-18 14:39:28 -08:00
David Rowe
76de7bf03c Fix typo 2016-11-08 13:53:37 +13:00
David Rowe
090065ee34 Add user feedback on download process 2016-11-08 13:05:35 +13:00
David Rowe
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13:00
Zach Fox
a12e0325bf Making progress... 2016-11-03 10:39:55 -07:00
David Rowe
427c8008c6 Merge branch 'master' into 21089 2016-11-03 09:18:25 +13:00
David Rowe
cee8b66ce9 Handle duplicate Clara download asset names 2016-11-01 13:26:05 +13:00
David Rowe
8ab56fe871 Automatically download Clara model to ATP and add to world 2016-10-31 16:02:20 +13:00
David Rowe
12747d26e0 Add parameter that enables automatically adding download model to world 2016-10-30 13:58:17 +13:00
Seth Alves
3ad748cfe2 Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 16:41:39 -07:00
Zach Pomerantz
be23668ca8 delete websurfaces on shutdown 2016-10-28 14:29:52 -07:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Brad Hefta-Gaub
d46170bec0 auto shutdown of sandbox when interface quits 2016-10-17 07:55:24 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id 
Add ability to parent overlays to MyAvatar for use across servers
 2016-10-05 12:03:01 -07:00
Zach Pomerantz
277eefafd7 remove the audio stats dialog 2016-09-23 14:39:07 -07:00
Brad Davis
f33d3a3b36 Migrate logging functionality to shared library 2016-09-23 12:04:58 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Ryan Huffman
23450e929b Add special avatar id for attaching overlays 2016-09-13 16:33:58 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
Anthony J. Thibault
9122a33fff only raise the webEntity virtual keyboard in HMD mode 2016-09-02 16:53:40 -07:00
Brad Davis
94210d2e69 Use dynamic count for global thread pool 2016-09-02 15:23:35 -07:00
Howard Stearns
89b00883dd Merge pull request #8428 from highfidelity/discovery 
Snapshot of Snapshot-Discovery to master
 2016-08-23 14:32:10 -07:00
howard-stearns
a3d64dbd9c code cleanup 2016-08-19 14:14:31 -07:00
howard-stearns
f6670a6374 new optional aspect-ratio argument to snapshot chain (javascript through 
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio.  Snapshot button uses 1.91.
 2016-08-18 16:29:42 -07:00
howard-stearns
e75f950ac7 Signal receivedHifiSchemeURL 2016-08-17 16:34:59 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Anthony J. Thibault
c407818d63 send pointer events from handControllerGrab.js to webEntities 2016-08-16 15:26:14 -07:00
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -07:00
samcake
8d12a23efb Merge pull request #8325 from jherico/deferred_batches_threaded 
Threaded rendering
 2016-08-15 09:59:44 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
Anthony J. Thibault
1be434342b Work In Progress snapshot 
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
 2016-08-12 17:11:59 -07:00
Zander Otavka
62f4e3536b Expose showing asset server to script interface 2016-08-12 15:18:30 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
David Kelly
c8f3a898d2 First cut of a snapshot uploader 
Will need to test end-to-end shortly, etc...
 2016-08-08 15:27:27 -07:00
Ryan Huffman
8044910bf2 Add show-address-bar when disconnected from domain 2016-08-04 14:39:53 -07:00
Anthony J. Thibault
6d768d8327 hand controllers send touch events instead of mouse events to web entities 
This gives a much better experience when scrolling web content.
 2016-08-02 15:23:46 -07:00
David Kelly
1d7cdff2bc Snapshot button plus script 
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does).  Added button to do it, saves them to disk.

The plan is for us to add UI to share (or not) the snapshot.  That's
why we are not going through the notifications.  Also, the
script makes sure to hide/unhide hud and overlays.  Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
 2016-08-01 18:21:01 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
Brad Hefta-Gaub
83dc9ea6bb punish slow scripts and don't send updates while physics is still loading 2016-07-25 21:46:30 -07:00
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode. 
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
 2016-07-19 14:42:24 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
Stephen Birarda
43967dc9a6 handle running of non .svo.json JSON files from mp CDN 2016-07-08 15:47:56 -07:00
Stephen Birarda
5bce924eda keep signature for askToLoadScript 2016-07-08 14:34:42 -07:00
Stephen Birarda
216e47b29a hide the long URL prefix of scripts from marketplace 2016-07-08 09:43:11 -07:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Brad Hefta-Gaub
c322317878 rework plugins to not depend on PluginContainer unless they want to 2016-06-21 12:07:05 -07:00
Ryan Huffman
c7955900ab Add new user activity events 2016-06-16 13:17:18 -07:00
Stephen Birarda
4b5a554122 remove check in version downgrading from NodeList 2016-06-09 15:53:19 -07:00
Atlante45
ee62a211ac Remove "Input Devices" menu 2016-06-06 13:28:36 -07:00
Atlante45
d8493f960a Add command line option to enable/disable plugins 2016-06-06 13:28:36 -07:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280 check point with protocol refusal working 2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Zach Pomerantz
7dabce9cff Check throttle before idling/painting 2016-05-23 19:04:35 -07:00
Zach Pomerantz
9a4b30a50b Fix AvatarInputs phantom movement 2016-05-19 13:19:15 -07:00
Ryan Huffman
cf49c8e2bf Add getUserAgent function that includes plugin information 2016-05-18 15:35:29 -07:00
Zach Pomerantz
65e81077cb Merge branch 'master' of github.com:highfidelity/hifi into perf/idle-event 2016-05-13 16:24:42 -07:00
Anthony Thibault
8fecb51dde Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw 
Eye tracking bug fix and debug rendering improvements
 2016-05-11 17:41:49 -07:00
Brad Hefta-Gaub
d656f61c64 Merge pull request #7759 from jherico/app_plugin_type 
Don't expose raw pointer to the display plugin
 2016-05-11 14:49:22 -07:00
Zach Pomerantz
2d4fd783bd Rename Paint/Idle events to Present 2016-05-10 16:09:04 -07:00
Anthony J. Thibault
80a349c65b Merge branch 'master' into tony/improved-avatar-debug-draw 2016-05-10 14:50:13 -07:00
Zach Pomerantz
783be53125 Trigger Idle from present Paint 2016-05-10 14:39:23 -07:00
Brad Hefta-Gaub
350743454b Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 
use smart pointers for entity simulations
 2016-05-10 11:35:57 -07:00
Clément Brisset
c3ce463b6c Merge pull request #7854 from zzmp/refactor/delayLoad 
Clean up resource cache's encapsulation of asynchronous loading
 2016-05-10 10:47:23 -07:00
Brad Hefta-Gaub
d7eee98acc Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum 
resurrection of threadsafe ViewFrustum
 2016-05-10 09:06:38 -07:00
Seth Alves
b761ecf44f merge from upstream 2016-05-10 08:18:45 -07:00
Zach Pomerantz
9ac783a88d Black box asynch resource retrieval 2016-05-09 18:03:19 -07:00
Atlante45
5c196f3df5 Remove Deadlock status 2016-05-09 15:53:45 -07:00
Anthony J. Thibault
641e152699 Eye tracking bug fix and debug rendering improvement 
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
 2016-05-08 16:20:32 -07:00
Brad Davis
c54d0bc993 Don't expose raw pointer to the display plugin 2016-05-08 10:35:31 -07:00