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

1844 commits

Author SHA1 Message Date
David Rowe
901af8896f Add "Prefer Stylus Over Laser" setting 2018-01-03 17:54:43 +13:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00
Andrew Meadows
2538204b1e expose physics simulation stats to Test JS API 2017-12-11 11:31:00 -08:00
SamGondelman
c5ebb8a279 expose Window.getDeviceSize() 2017-11-28 16:16:30 -08:00
SamGondelman
033f658fff Merge remote-tracking branch 'upstream/master' into pointers 2017-11-17 16:10:20 -08:00
Stephen Birarda
eedb77dae9 add clearing of known state if client resets ES connection 2017-11-16 11:40:35 -08:00
Brad Davis
7bbc719d79 Fix for black screen on HMD derived display plugins 2017-11-16 08:53:12 -08:00
Brad Davis
23653f08ca Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-30 09:20:58 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
SamGondelman
a44e8efb99 merge from master 2017-10-26 12:14:53 -07:00
Bradley Austin Davis
becd99a964 Merge pull request #11584 from SamGondelman/pointerEvents 
First step of cleaning up PointerEvents
 2017-10-26 12:01:03 -07:00
luiscuenca
3d3077978e Simplyfied and fixed null pointer 2017-10-25 18:47:10 -07:00
Sam Gondelman
863a2041a6 Merge branch 'master' into pointerEvents 2017-10-25 17:22:19 -07:00
luiscuenca
a1c9285c90 Fixed bug on case 6443 2017-10-25 13:13:50 -07:00
SamGondelman
9bbb2eb692 austin's comments, send events directly to selected web entity 2017-10-23 10:17:45 -07:00
SamGondelman
7686948daf resolve conflicts and cleanup 2017-10-20 15:23:17 -07:00
SamGondelman
24ce09f914 generalized pointer, laserpointermanager -> pointermanager 2017-10-20 11:28:48 -07:00
SamGondelman
d7745efc8e one global pickmanager 2017-10-19 16:55:24 -07:00
Zach Fox
3f0b08aea8 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-18 10:37:47 -07:00
Anthony J. Thibault
67d43b4fac Use atomic<bool> and compare_exchange_strong 2017-10-13 16:03:56 -07:00
SamGondelman
5bfb0baf09 const references 2017-10-13 14:38:46 -07:00
Anthony J. Thibault
a2a6cd0c7a Reduce present traffic on main thread event queue. 
In an effort to diagnose the root cause of several deadlocks,
it seems possible that the main thread event queue can grow
to a size where it can take many seconds to drain.

This PR attempts to address this in two ways:
  * Change the connection between the DisplayPlugin::presented signal and
    the Application::onPresent slot to be a DirectConnection.  This should
    prevent the main thread from filling up with signal events.
  * Within Applicaiton::onPresent use an atomic counter to prevent the main
    thread from filling up with repeated Idle events.
 2017-10-13 14:28:23 -07:00
SamGondelman
0d164363af cleanup mousePressOffEntity signal 2017-10-12 15:29:29 -07:00
SamGondelman
53fde83922 cleaning up pointerevents, wip 2017-10-12 11:21:50 -07:00
Zach Fox
5efa920712 Getting closer 2017-10-12 11:13:23 -07:00
Zach Fox
f037eab26c Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-11 11:07:32 -07:00
SamGondelman
7e6d5d9d98 merge with master 2017-10-06 14:57:08 -07:00
Zach Fox
1fa9bd8fc6 Better implementation of location change and bugfixes 2017-10-06 12:22:29 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
Sam Gateau
316156db46 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 21:31:59 -07:00
samcake
bb99f68d40 Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead 2017-10-02 17:04:00 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Sam Gateau
68046ae4e3 Merge pull request #11491 from jherico/dev/disable_watchdog 
Disable watchdog with environment variable
 2017-10-02 10:19:32 -07:00
samcake
225d2bbbb4 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 13:47:37 -07:00
SamGondelman
3ae41b9b75 cleanup client and stats string 2017-09-29 11:34:35 -07:00
SamGondelman
cbf82a6f2c fix timeout for physics check 2017-09-29 11:34:34 -07:00
Brad Davis
a7d507e9fd Disable watchdog with environment variable 2017-09-29 10:44:04 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
samcake
c112a3baf1 Seting up of camera and avatar correctly in game loop, not in render loop 2017-09-28 15:09:49 -07:00
samcake
b1daae0150 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 09:16:02 -07:00
samcake
40ca98214b Moving all of the camera and avatar eval to game loop 2017-09-27 17:58:43 -07:00
Sam Gateau
88097bb39f Merge pull request #11447 from AndrewMeadows/lod-auto-adjust 
LODManager uses batchTime and engineRunTime for automatic LOD adjustment
 2017-09-27 10:51:46 -07:00
samcake
328dd9c108 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue 2017-09-26 16:12:27 -07:00
samcake
669af73a96 Bringing as much as possible out from render to game 2017-09-26 10:47:24 -07:00
Sam Gateau
953614fe65 More stuff out of render to the gameloop 2017-09-25 23:43:32 -07:00
samcake
157b4f2e13 Moving some of the updates on the camera and the avatar out from render to game loop 2017-09-25 18:28:33 -07:00
samcake
11c55755d5 Removing unused call 2017-09-25 15:10:40 -07:00
Andrew Meadows
37c501b131 LODManager uses renderTime instead of main loop fps 2017-09-25 13:17:21 -07:00
samcake
510ecbb137 Merging with upstream 2017-09-21 16:59:15 -07:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Sam Gateau
a70f7dfc87 put updateCamera in its function 2017-09-13 22:05:20 -07:00
vladest
38295ab73f Merge conflicts 2017-08-28 16:58:30 +02:00
Andrew Meadows
4d7700b774 Merge pull request #11243 from SamGondelman/sharks 
Fix ray pick crash on shutdown
 2017-08-25 09:01:14 -07:00
SamGondelman
abaccf9edd crash on shutdown 2017-08-24 16:00:36 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks 
Adding Blocks Tablet App to Marketplace
 2017-08-18 15:06:18 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Zach Fox
ecd1f13197 Allow users to take a snapshot from the secondary camera 2017-08-16 15:34:06 -07:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
vladest
8326600274 Merge branch 'master' into modal_dialogs_async 2017-08-16 13:48:47 +02:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
SamGondelman
9bb7e66859 separate raypickscriptinginterface, cleanup 2017-08-15 13:36:41 -07:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
vladest
63e907e7b6 Merge branch 'master' into modal_dialogs_async 2017-08-12 13:04:52 +02:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
Seth Alves
ff83a8158b cancel effects of --replaceAvatarURL when avatar is changed with preference dialog 2017-08-10 13:49:48 -07:00
Elisa Lupin-Jimenez
1ac9536f95 Downloading blocks from marketplace in own asset folder 2017-08-09 15:56:07 -07:00
vladest
556569819d 1st stage of moving to async dialogs 2017-08-09 14:00:19 +02:00
SamGondelman
42147640e2 remove LaserPointerManager as a dependency 2017-08-07 14:18:56 -07:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Elisa Lupin-Jimenez
ebc28a6557 Renamed isBlocks to isZip, added debug print for non-entity files 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0 Blocks drag does not work yet 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub
9b3be6d164 Merge pull request #10808 from humbletim/21400 
WL 21400 -- Setting that lets you switch from cursor to reticle
 2017-07-27 13:16:58 -07:00
Liv
57b27a7bb7 change packet type to be sourced, change from packet list to single packet 2017-07-25 20:17:20 -07:00
Liv
32ddffd9c8 Move logic for confirmation into Application.cpp for handling files directly 2017-07-24 18:09:32 -07:00
Seth Alves
3670a04d8e switch bare pointers to AudioInjector objects to be QSharedPointers 2017-07-11 14:24:58 -07:00
David Kelly
936c21e849 remove unnecessary cacheDir member 2017-07-06 07:24:58 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
David Kelly
48de8011b2 cr feedback 2017-06-28 14:15:29 -07:00
David Kelly
01155ba4e3 this handles redirecting ktx_cache, data8, prepared 2017-06-27 08:47:54 -07:00
humbletim
c10475186c add support for switching cursor from arrow to reticle 2017-06-23 18:48:29 -04:00
David Kelly
94a33fea94 new switches to override avatarURL 2017-06-21 16:03:05 -07:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Vladyslav Stelmakhovskyi
b8bb8026ca Merge branch 'master' into fix_tablet_buttons_qt59 2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi
5a0783c38c Send mouse events before touch event. It seems the order is important for Qt 5.9 2017-06-17 22:24:27 +02:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
NeetBhagat
c3621d7c32 Resolved two issues: 
1) While in HMD mode -> open Tablet -> Click Desktop.  Desktop mode will be on.
2) Menu sync problem while switching modes.
 2017-06-06 22:31:14 +05:30
NeetBhagat
6228ff19bf Resolve the reviewed comments of @ZappoMan 2017-06-02 15:23:21 +05:30
NeetBhagat
58142817a1 Resolve the review comments of @ZappoMan. 2017-05-31 19:18:14 +05:30
volansystech
212627bd5d Merge branch 'master' into 21255 2017-05-29 17:51:45 +05:30
volansystech
0920dbc1a8 Resolve the comments of @ZappoMan. 2017-05-29 15:53:33 +05:30
Zach Pomerantz
03d3666c0c show menu after requesting it 2017-05-28 17:34:11 -04:00
Zach Pomerantz
156b3f9738 use showDialog instead of toggleMenu 2017-05-28 17:10:59 -04:00
Zach Pomerantz
637a448c2c abstract toggleMenu 2017-05-26 17:12:15 -04:00
volansystech
a2851b5bcb Put proper comments and indentation. 2017-05-25 18:47:59 +05:30
volansystech
8d51be644d Merge branch 'master' into 21255 2017-05-25 17:48:48 +05:30
volansystech
1f24e38585 Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift. 2017-05-25 14:56:06 +05:30
Sam Cake
3eb95d2d19 cleaning the commented code 2017-05-25 01:16:45 -07:00
volansystech
0c4cd96bfd Initial Commit : Switch from HMD [Oculus Rift] mode to Desktop mode automatically when user removing Oculus Rift. 2017-05-24 12:26:07 +05:30
Dante Ruiz
54d63f5155 Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-23 18:19:38 +01:00
Atlante45
c2e2682eff Fix "Reset Settings" window poping up every time 2017-05-19 10:50:23 -07:00
Dante Ruiz
a18940142e Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-17 16:23:50 +01:00
Atlante45
201f81f20a Don't wait on the sandbox 2017-05-16 14:41:57 -07:00
Dante Ruiz
975b1ab077 moved low velocity filter in the input system 2017-05-16 00:15:06 +01:00
Brad Davis
9def788956 Merge pull request #10314 from jherico/avatars-renderer 
Migrate Avatar rendering code to library
 2017-05-04 14:23:49 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Zach Fox
4d49ae5b09 Remove the +1s 2017-05-03 15:43:57 -07:00
Zach Fox
07d3e482cf ARG 2017-05-03 15:40:39 -07:00
Zach Pomerantz
ad8d3e5490 continue idling while minimized 2017-05-02 20:05:55 -04:00
Stephen Birarda
038ac745c8 clear domain octree details if ES killed 2017-04-27 17:47:18 -07:00
Vladyslav Stelmakhovskyi
b2533b6106 Code nitpick. Pointer cleanup on exit 2017-04-20 21:12:57 +02:00
Vladyslav Stelmakhovskyi
06406ef7de Merge branch 'master' into notify-sound-inject 2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi
023d03d9f8 Implemented snap sound using sound injector 2017-04-20 17:43:16 +02:00
Zach Fox
50456f71ed Merge pull request #10142 from Triplelexx/21258 
21258 - Don't render (or heavily use GPU) when window in minimized
 2017-04-19 16:26:49 -07:00
Andrew Meadows
5a458c9923 remove last qApp usage from Avatar class 2017-04-18 11:52:21 -07:00
Andrew Meadows
9cddbbc42a more interface-only spaghetti out of Avatar 2017-04-18 11:52:21 -07:00
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