Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 21:48:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80714 commits 25 branches 0 tags 1.1 GiB
Commit graph

8282 commits

Author SHA1 Message Date
amer cerkic
da071abd8b wrapping the dependencyManager::get<> call with ifdef to prevent the log from constantly spitting out that instance does not exist 2019-06-07 16:25:04 -07:00
Preston Bezos
a0753f6393 removed ctrl+b and ctrl+n as shortcuts 2019-06-07 15:41:44 -07:00
amer cerkic
f2c6cb79f7 if formatting 2019-06-07 14:17:49 -07:00
amer cerkic
fd7dd7948f reverted vs spacing changes 2019-06-07 13:41:14 -07:00
amerhifi
b1df463f56 disabling dde initialization due to random crashes while closing down the socket connection on mac 2019-06-07 10:16:36 -07:00
Seth Alves
06436e6a7d quiet build warning 2019-06-04 13:00:26 -07:00
Sam Gateau
2a4d0cfaec Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset 2019-06-03 18:06:28 -07:00
Sam Gateau
db04f61c5b Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-03 09:37:13 -07:00
Sam Gateau
54d1705f06 Testing a different approach 2019-05-31 18:42:26 -07:00
Sam Gondelman
d94b685c94
Merge pull request #15661 from SamGondelman/avatarCrash 
BUGZ-478: Fix address manager crash
 2019-05-31 16:01:07 -07:00
SamGondelman
e29bf376a4 fix address manager crash 2019-05-31 14:01:58 -07:00
sabrina-shanman
fa79d0ec18 Fix Application not checking window minimize state properly 2019-05-31 11:36:52 -07:00
Sam Gateau
b88deb52b0 Cleaning up the interface for the Performance PRESET and the associated debug ui 2019-05-30 12:03:44 -07:00
Sam Gateau
bf7617ea8e INtroducing the PerformanceManager 2019-05-29 15:47:14 -07:00
Shannon Romano
d065847bee
Merge pull request #15638 from samcake/nut 
case BUGZ-191: Implement patform tier profile from platform description
 2019-05-28 15:28:05 -07:00
Sam Gateau
546639fdfe Adding a script and ui to check the values returned by the PlatformInfo ui 2019-05-26 12:30:50 -07:00
Andrew Meadows
5988f8cce6 avoid calling removeOwnershipData() from multiple threads 2019-05-24 16:12:21 -07:00
luiscuenca
050682c84c
Keep logged in after first run 2019-05-23 19:53:37 -07:00
luiscuenca
42c1f4be33
fix typo and entry on first run when --url is set 2019-05-23 17:07:06 -07:00
luiscuenca
8db3d03772
add display name as param 2019-05-23 10:21:47 -07:00
Howard Stearns
f1e8343b30 put DomainServerCheckIn on NodeList thread 2019-05-17 14:30:30 -07:00
Sam Gateau
ffbe055fa8
Merge pull request #15569 from SamGondelman/switch 
BUGZ-187: Proper Render Scripting Interface with renderMethod property
 2019-05-16 18:29:18 -07:00
Brad Hefta-Gaub
1ac1735d55
Merge pull request #14533 from SamGondelman/oculusHome 
Case 22439: Fix HMD auto switch detection
 2019-05-16 16:26:04 -07:00
SamGondelman
451c52fa47 merge with master 2019-05-16 16:02:52 -07:00
SamGondelman
fee20d9e46 render scripting interface + renderMethod control 2019-05-16 16:01:21 -07:00
Sam Gateau
6b3707873b
Merge pull request #15562 from jherico/bugz-133 
BUGZ-133: Expose additional functionality to QML/Scripts
 2019-05-16 12:03:22 -07:00
Brad Davis
9bcc23f0c4 PR comments 2019-05-16 09:40:22 -07:00
Brad Davis
5db78ef2e1 Add scripting to set the refresh rate 2019-05-15 12:55:25 -07:00
Zach Fox
966965af5b
Merge pull request #15538 from zfox23/simplifiedUI 
Simplified UI v1
 2019-05-14 17:45:30 -07:00
Roxanne Skelly
68fb43ec7f Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 10:11:02 -07:00
Zach Fox
c57ddf969a Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI 2019-05-14 09:32:07 -07:00
Shannon Romano
8597a51657
Merge pull request #15556 from jherico/fix/watchdog_spam 
BUGZ-131: Additional silencing of watchdog spam
 2019-05-14 08:10:02 -07:00
Howard Stearns
33f1bd965e
Merge pull request #15549 from SimonWalton-HiFi/call-reset-in-NodeList 
Call correct NodeList::reset() from Application
 2019-05-13 19:49:41 -07:00
Brad Davis
7d8e14f510 Additional silencing of watchdog spam 2019-05-13 18:19:29 -07:00
Roxanne Skelly
aa16430cf4 add a comment and kick build servers 2019-05-13 17:25:06 -07:00
Roxanne Skelly
0319e8cc4d Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-13 16:01:39 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
Simon Walton
305a215d21 Pass a QObject context for the functor 2019-05-13 15:50:04 -07:00
Simon Walton
ede8859cc7 Call correct NodeList::reset() from Application 2019-05-13 14:38:34 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 
case 22190: Disable triggering away state when interface focus lost
 2019-05-13 13:22:28 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch 
Case 22379: Run-time switch for deferred/forward rendering
 2019-05-13 11:14:26 -07:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
Shannon Romano
5c9570cffb
Merge pull request #15539 from jherico/fix/watchdog_spam 
BUGZ-131: Reduce spam from watchdog thread
 2019-05-10 14:24:15 -07:00
Zach Fox
112e13383b Dock it! 2019-05-10 12:03:29 -07:00
Brad Davis
0f8ddae9df Reduce spam from watchdog thread 2019-05-10 12:01:07 -07:00
Shannon Romano
0d28932181
Merge pull request #15529 from Atlante45/feat/more-ice-logging 
Add instrumentation to help track down connection issues
 2019-05-10 11:57:24 -07:00
Zach Fox
314c04ab96 Simplified UI v1 2019-05-10 10:49:25 -07:00
Clement
0a7352074c Fix android build 2019-05-09 17:17:43 -07:00
Shannon Romano
930032bcc6
Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop 
case 22166: Build complex shapes in ThreadPool instead of MainLoop
 2019-05-09 17:14:50 -07:00
SamGondelman
59e7db2d6b Merge remote-tracking branch 'upstream/master' into switch 2019-05-09 11:42:05 -07:00
Clement
b3d0705e39 Extend ICE logging + make it more searchable 2019-05-08 18:38:00 -07:00
Anthony Thibault
4ee39355f1
Merge pull request #15525 from hyperlogic/feature/backtrace-gpu-ident 
Add gpu_name, gpu_driver & gpu_memory to crash annotations
 2019-05-08 16:09:13 -07:00
Anthony Thibault
78403e4436 Add gpu_name, gpu_driver & gpu_memory to crash annotations 
This may help us identify the hardware causing early gl initialization errors.
 2019-05-08 13:33:45 -07:00
Shannon Romano
15484436ca
Merge pull request #15507 from danteruiz/dockable-windows 
case LILY-30: Dockable Interactive Windows
 2019-05-08 12:16:04 -07:00
danteruiz
3806631bf1 dockable window 2019-05-08 10:04:31 -07:00
Shannon Romano
e90f91f109
Merge pull request #15488 from sethalves/fix-indep-camera 
case 22412: allow independent camera to be set by scripts

👍 by QL for pre-merge testing in the manu ticket
 2019-05-07 09:38:54 -07:00
Andrew Meadows
e770bd6142 build CollisionShapes and load RigidBodies even when not yet stepping 2019-05-06 17:37:35 -07:00
Andrew Meadows
915cbb69df split work out of EntityTree::update(), call it preUpdate() 2019-05-06 17:37:35 -07:00
Andrew Meadows
3eed8218ca overhaul of MotionState and shape creations 2019-05-06 17:37:35 -07:00
Shannon Romano
86f562de1b
Merge pull request #15515 from kencooke/midi-devicechange-audio-deadlock 
Case 20521: Unplugging headphones with hifi open causes freeze
 2019-05-06 15:03:56 -07:00
Shannon Romano
1636256068
Merge pull request #15496 from davidkelly/dk/bugz-6 
Increase max heartbeat time to 10 sec on mac
 2019-05-06 13:03:25 -07:00
Ken Cooke
ea9690d72b Disable MIDI rescan after devicechange, to avoid deadlock 2019-05-06 10:46:54 -07:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification 
Avatar verification
 2019-05-06 08:04:06 -07:00
John Conklin II
16ece6c2fc
Merge pull request #15493 from amantley/bugPushToTalk 
When you unmute using ctrl-m during push to talk, you now see that reflected in the audio icon
 2019-05-03 09:03:36 -07:00
Angus Antley
1f004f34c4 added check for valid dynamic casts 2019-05-02 21:59:11 -07:00
Angus Antley
f019fa3a7c Merge remote-tracking branch 'upstream/master' into bugPushToTalk 2019-05-02 18:28:34 -07:00
Sam Gateau
46f4b13f2f
Merge pull request #15499 from samcake/coco 
BUGZ-92: Refresh rate Throttling refinements
 2019-05-02 17:24:34 -07:00
Shannon Romano
5d3c88b964
Merge pull request #15502 from sabrina-shanman/crash_snapshot_no-directory 
(case 22368) Fix snapshots freezing Interface when no snap directory defined
 2019-05-02 15:59:25 -07:00
David Kelly
0b2d11aeef Merge branch 'master' of github.com:highfidelity/hifi into dk/bugz-6 2019-05-02 12:37:16 -07:00
Shannon Romano
caefa3e06a
Merge pull request #15362 from ctrlaltdavid/M22075 
Case 22075: Controller JSDoc update
 2019-05-02 11:34:58 -07:00
Sam Gateau
7f22ac1be4 FIxing a warning on unix 2019-05-02 08:57:19 -07:00
Sam Gateau
c7702048ad Merge branch 'master' of github.com:highfidelity/hifi into coco 2019-05-02 08:50:30 -07:00
David Rowe
e217909f17 Merge branch 'master' into M22075 2019-05-02 20:19:17 +12:00
amantley
a8b54cbe10 changed reinterpret to dynamic cast 2019-05-01 17:32:39 -07:00
Sam Gateau
7f71ec8d3d Apply my own comments 2019-05-01 16:57:03 -07:00
danteruiz
f65f28c52a refresh rate controller 2019-05-01 16:04:33 -07:00
David Kelly
02b960db33 Increase max heartbeat time to 10 sec on mac (for now - not long-term solution) 2019-05-01 15:06:02 -07:00
amerhifi
a878232c6d setting default cursor after display initialization for systems that do not call checkcursor on startup 2019-05-01 14:31:40 -07:00
amantley
4b7b416abf corrected the behaviour for ctrl-m so that when you unmute during push to talk you will see it reflected in the audio icon color 2019-05-01 14:00:56 -07:00
Seth Alves
9321cf89d3 allow independent camera to be set by scripts 2019-05-01 07:20:52 -07:00
sabrina-shanman
ef1ff2183b Fix snapshots freezing Interface when no snap directory defined 2019-04-30 17:45:17 -07:00
amer cerkic
df3049cb44 simplified way to switch to system cursor if non hmd mode 2019-04-30 11:49:33 -07:00
amer cerkic
978108b3ba found a more simplified way to stop rendering the mouse unless its the Reticle cursor 2019-04-30 11:34:11 -07:00
amer cerkic
7d2b75673c fixed syntax for cursor 2019-04-29 16:42:49 -07:00
SamGondelman
8c032ea83f Merge remote-tracking branch 'upstream/master' into switch 2019-04-29 11:08:01 -07:00
Simon Walton
60389017a4 Merge from master, including avatar protocol change 
Tony had added HandController version-type.
 2019-04-26 18:51:41 -07:00
David Rowe
407ce745d5 Merge branch 'master' into M22075 
# Conflicts:
#	libraries/controllers/src/controllers/Actions.cpp
 2019-04-27 10:51:13 +12:00
SamGondelman
ca5c7e3904 runtime switch for deferred/forward rendering 2019-04-26 14:37:27 -07:00
Sam Gateau
c647bbcb16
Merge pull request #15400 from danteruiz/throttle-refresh-rate 
Case 22253: Refresh Rate Controller
 2019-04-26 12:04:39 -07:00
Simon Walton
f3efee56c0 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-25 13:40:27 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -07:00
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
Howard Stearns
da1597c5d1
Merge pull request #15327 from Atlante45/fix/warnings 
Case 22065: Fix mac warnings
 2019-04-24 20:32:29 -07:00
Simon Walton
de97af5c02 Minimal working version for avatar's client 
Also merge of Wayne's proof-of-concept
 2019-04-24 17:42:51 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Dante Ruiz
0bdc37859d Refresh Rate Controller 2019-04-24 16:16:08 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-24 09:52:12 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
SamGondelman
48aef3e6d9 build error 2019-04-23 10:46:53 -07:00
SamGondelman
4fc97effda combine snapshotOperator lists per sam's suggestions 2019-04-22 16:22:18 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
Clement
0f2dbd7b6a Fix mac warnings 2019-04-19 20:14:15 -07:00
SamGondelman
7fa81ffef3 fix warnings 2019-04-18 12:48:46 -07:00
SamGondelman
e7d12dc4f8 fix snapshots and preview 2019-04-17 15:43:05 -07:00
Seth Alves
feda884c71 remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts. 2019-04-12 09:21:48 -07:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
Sam Gateau
d7e5f1eb8e
Merge pull request #15280 from kitely/fix-startup-race-condition 
case 21981: Fix startup race conditions in Interface
 2019-04-10 11:30:23 -07:00
Sam Gateau
89ff63e8bb
Merge pull request #15267 from jherico/fix/tracing 
Case 21930: Don't change OpenGL context state every frame
 2019-04-10 09:42:09 -07:00
David Rowe
59533d0f59 Controller JSDoc update 2019-04-10 08:51:14 +12:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco 
Case 21777: Locomotion Project
 2019-04-04 16:18:32 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-04 13:36:25 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
NissimHadar
facf8a9305
Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid 
Case 21893: Remove disabling of --url for Android.
 2019-04-03 07:50:31 -07:00
Shannon Romano
1bfa0397f0
Merge pull request #15048 from wayne-chen/newAudioMuteStates 
Case 21899: New Audio Mute States
 2019-04-01 15:27:03 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Shannon Romano
04eac57950
Merge pull request #15300 from jherico/fix/web_camera_master 
Case 21993: Globally disallow use of the camera or microphone by hosted web content
 2019-04-01 14:05:22 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Wayne Chen
afdf95c894
remove unused slotted function 2019-04-01 12:20:55 -07:00
Brad Davis
58abfb44c4 Globally disallow use of the camera or microphone by hosted web content 2019-03-31 11:14:29 -07:00
Saracen
90e979bda7 Add option to disable triggering an away state when interface 
focus is lost.
 2019-03-31 18:44:16 +01:00
NissimHadar
171aebd6aa Remove disabling of --url for Android. 2019-03-28 13:04:16 -07:00
Oren Hurvitz
7a8b7c095b Fixed a race condition related to the keyboard when starting Interface. 
These two things need to happen in the following order:
1. Initialize the input plugins (including the keyboard)
2. Start the scripts

That's because the scripts try to use the keyboard (e.g., in edit.js), and if it's not ready yet
then they fail, and then Interface doesn't work right (e.g., the Create button doesn't work).

In order to ensure that these things happen in the correct order, we must make sure that
resumeAfterLoginDialogActionTaken() (which starts the scripts) is called only after everything
else in the Interface constructor has finished. Usually this happens correctly, but occasionally
resumeAfterLoginDialogActionTaken() is called too soon. This commit makes sure that even in that
case, we'll postpone calling resumeAfterLoginDialogActionTaken() until the Interface constructor
has finished.
 2019-03-28 13:36:41 +02:00
Oren Hurvitz
49165056c9 Fixed a race condition that sometimes caused the main menus not to appear. 
When Interface starts, it first calls pauseUntilLoginDetermined(), and later resumeAfterLoginDialogActionTaken().
But on rare occasions these functions are called in the reverse order, and this caused Interface to remain
in the "paused" state. Now we check for this case, and abort pauseUntilLoginDetermined() if it happens.

This has only happened to me when running Interface immediately after rebuilding it (in Release mode).
 2019-03-28 11:44:12 +02:00
Oren Hurvitz
8e201f4801 Fixed race condition during initialization of the Desktop. 
The Application constructor must setup event handlers for events emitted when the Desktop is
constructed *before* calling initializeUi(). Otherwise, sometimes these event handlers won't
be called.

When this problem happened (usually on slow machines), Interface would start but neither the
Desktop nor the Login Screen would appear.
 2019-03-28 11:44:12 +02:00
Brad Davis
413091fed3 Trace application notification handler events if longer than 2 ms 2019-03-26 13:50:46 -07:00
SamGondelman
4ed7c09016 grab correct stencil masks from display plugins 2019-03-26 13:42:18 -07:00
Roxanne Skelly
90b9de8623 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832 2019-03-25 14:48:26 -07:00
Roxanne Skelly
1608b24be1 ase 20832 - Inventory app login and cancel buttons don't work on logout 2019-03-25 14:48:17 -07:00
r3tk0n
3ac42e69e3 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-25 11:27:31 -07:00
Wayne Chen
390ce9bb26 wip for getting AvatarInputsBar to switch accordingly 2019-03-22 15:34:06 -07:00
Wayne Chen
ee1a14505a adding constants, removing entity creation in cpp 2019-03-22 14:54:15 -07:00
Wayne Chen
d0116abc52 separating out bubble icon qml - adding support for transparency 2019-03-22 14:54:13 -07:00
Wayne Chen
20e181cd82 staging avatar inputs for ignore radius 2019-03-22 14:42:51 -07:00
Wayne Chen
77b7cc2457 separating out bubble icon qml - adding support for transparency 2019-03-22 14:16:29 -07:00
Wayne Chen
d382893e75 staging avatar inputs for ignore radius 2019-03-22 14:16:28 -07:00
Sam Gondelman
40f5a0263c
Merge pull request #15201 from SamGondelman/emit 
Case 21756: Entities.emitScriptEvent works now
 2019-03-21 18:05:17 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio 
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
 2019-03-21 18:03:58 -07:00
r3tk0n
108e8b9994 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-21 15:17:56 -07:00
r3tk0n
543d53ecde Add ability to toggle strafing. 2019-03-21 13:12:15 -07:00
Shannon Romano
b82c808562
Merge pull request #15207 from danteruiz/kick-ui 
Case 21771: Possible Entity Scipt Ban Incident
 2019-03-21 13:10:54 -07:00
Shannon Romano
a6d4f98ee7
Merge pull request #15204 from roxanneskelly/Case21025 
Case 21025 conditionalizing TabletWebView features
 2019-03-20 14:21:37 -07:00
danteruiz
2ab8eb98e8 better implementation 2019-03-17 14:00:41 -07:00
SamGondelman
d4e1ec9741 fix emitScriptEvent 2019-03-15 16:20:01 -07:00
SamGondelman
83bac723ef fix wearable duplication on domain switch 2019-03-15 13:38:25 -07:00
Roxanne Skelly
9182db8bd4 Case 21025 conditionalizing TabletWebView features 2019-03-15 12:56:43 -07:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
Wayne Chen
07ddd4e1dd moving key press detection to JSON 2019-03-11 14:27:47 -07:00
Wayne Chen
7b51061b5f fixing initialization in switch statement 2019-03-10 19:46:01 -07:00