Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 17:25:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57380 commits 25 branches 28 tags 1.2 GiB
Commit graph

57380 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
c32f4ab0d3 CR 2017-07-10 14:24:53 -07:00
Seth Alves
4a35ad105b Merge pull request #10615 from amvmoody/21358 
WL 21358 Create a Laser Pointer app
 2017-07-10 14:21:54 -07:00
Chris Collins
24edbc5c43 Merge pull request #10934 from Atlante45/new-master 
Stable => Master
 2017-07-10 13:46:36 -07:00
Zach Fox
78d12f27ed Merge pull request #10933 from zfox23/spectatorCamera_forceMonoPreview 
Force Mono Preview when using Spectator Camera
 2017-07-10 13:29:22 -07:00
Atlante45
d28fc5603d Merge branch 'stable' 2017-07-10 13:28:25 -07:00
David Kelly
339cfed3c4 Merge pull request #10932 from davidkelly/dk/noPreviewAfterDismissing 
Ensure spectator camera preview is up when reopening tablet
 2017-07-10 13:28:01 -07:00
Zach Fox
303a3d1e4c Force Mono Preview when using Spectator Camera 2017-07-10 13:27:45 -07:00
David Kelly
fcf4bfd59a spacing issue 2017-07-10 13:25:33 -07:00
David Kelly
b87d69b15d Insure spectator camera preview is up when reopening tablet 2017-07-10 13:16:08 -07:00
Stephen Birarda
f6d0122550 Merge pull request #10791 from birarda/bug/adding-dead-upstream-agent 
don't add missing replicated node from kill packet
 2017-07-10 12:53:21 -07:00
Chris Collins
a1a0e411ce Merge pull request #10923 from highfidelity/RC-47 
Beta Release 47 - Includes up to Developer Release 6825
 2017-07-10 12:53:20 -07:00
druiz17
78ba2102f4 Merge pull request #10931 from druiz17/fix-goto-hmd-keyboard 
Fixed goto hmd keyboard not entering text
 2017-07-10 12:50:01 -07:00
Seth Alves
d957b970dd Merge pull request #10918 from misslivirose/feat-add-skeleton-changed-signal 
Add signal for avatar skeleton changing
 2017-07-10 11:35:24 -07:00
Seth Alves
9b5dfc8d3a Merge pull request #10929 from druiz17/luanch-crash-fix 
Fixed crash when launching interface from fresh install
 2017-07-10 11:31:59 -07:00
David Kelly
91ffb003fd Merge pull request #10908 from davidkelly/dk/hmdPreview 
hmd preview
 2017-07-10 11:14:28 -07:00
Zach Fox
fcf11915c5 Merge pull request #10930 from zfox23/spectatorCamera_noDesktopApp 
Don't show SPECTATOR app in Desktop mode
 2017-07-10 11:14:16 -07:00
Stephen Birarda
98ccfa80a2 don't add node missing from a replicated kill packet 2017-07-10 11:14:13 -07:00
Dante Ruiz
89a072cfee fixed hmd keyboard for goto 2017-07-10 19:05:07 +01:00
Brad Hefta-Gaub
121cf76ee3 Merge pull request #10914 from sethalves/dont-think-during-mouse-move 
Dont think during mouse move
 2017-07-10 10:36:03 -07:00
Zach Fox
f170449b88 Don't show SPECTATOR app in Desktop mode 2017-07-10 10:25:37 -07:00
David Kelly
1c9c36a8c8 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview 2017-07-10 10:22:31 -07:00
Andrew Meadows
ab6f615f96 Merge pull request #10910 from Atlante45/fix/audio-mixer-crash 
Fix Audio Mixer crash
 2017-07-10 09:55:44 -07:00
David Kelly
4843b91f47 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-10 09:50:17 -07:00
Dante Ruiz
cc86cda737 Merge branch 'master' of github.com:highfidelity/hifi into luanch-crash-fix 2017-07-10 17:49:20 +01:00
Dante Ruiz
75e1b265d5 comment out code that causes a crash on launch from fresh install 2017-07-10 17:48:53 +01:00
Andrew Meadows
96b88dccd7 Merge pull request #10913 from samcake/orange 
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
 2017-07-10 09:46:09 -07:00
LaShonda Hopper
3ee9d8b766 [Worklist #21420] Ran lint on edit script (details below). 
Prior to and after addressing Worklist Item #21420, it was observed that the
tool bar buttons popping in and out during load.  Taking a while to become visible.

Ran JSHint on the edit.js script to see if something stood out.

Testing with the various lint fixes the odd loading behavior wasn't observed locally any longer.
Pushing this up for testing.  This may be what @CainFoool was seeing regarding the create button
not appearing when testing a different PR as at times it took quite some time for the buttons
to load properly.

JSHint Issues Addressed:
* Resolved instance of \"Use the function form of \"use strict\"\"
** Moved use strict declaration to the file function level.
** This fixed various unknown or not defined errors.
* Resolved instances of \"\'const\' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).\"
** Switched const to var to avoid using keywords respected by only a subset of browsers.
* Resolved various multiply defined vars.
** Notable callouts being position var and properties var.
** This should fix issues where the same var was being used though the intent of use may have varied.
* Resolved instances of missing semi-colons

PreFix:  51 JSHint issues detected
PostFix: 0 JSHint issues detected.

Changes to be committed:
	modified:   scripts/system/edit.js
 2017-07-10 12:23:28 -04:00
Sam Gateau
746812ff78 Merging with origin orange 2017-07-10 17:25:13 +02:00
NeetBhagat
378e85e9b2 Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 2017-07-10 18:29:04 +05:30
NeetBhagat
dd2dbd9b39 Initial Commit to resolve problem :> When Max Avatar scale is set in Sandbox -> setting, take that value as default max value 2017-07-10 18:26:33 +05:30
Sam Gateau
0c3755483b adding assert or checks whenever getting a scene stage 2017-07-10 12:37:26 +02:00
Sam Gateau
4edea433ce Rename the _pipeline into _shapePipeline in the render::Args 2017-07-10 12:16:53 +02:00
Brad Davis
ee1f6dfa42 More tweaks for improved script performance 2017-07-09 21:36:46 -07:00
Brad Davis
9afe0bc124 Tweak frame timing to avoid overloading the main thread 2017-07-09 21:36:39 -07:00
Brad Davis
e52c7f4395 Add more efficient overlay getters, don't use blocking calls 2017-07-09 21:36:31 -07:00
Mike Moody
4b593d1ab4 Added fallback method using controllers if joints do not exist. 2017-07-08 15:18:27 -07:00
Seth Alves
39db7b0329 Merge pull request #10905 from sethalves/faster-getters-on-avatar-for-scripts 
Faster getters on avatar for scripts
 2017-07-08 15:01:23 -07:00
Brad Davis
8043caa9e9 Merge pull request #10925 from jherico/overlay_performance 
Fix terrible script performance when rendering load is too high
 2017-07-08 14:19:14 -07:00
Brad Davis
cd11f5cfa6 More tweaks for improved script performance 2017-07-07 22:02:56 -07:00
Brad Davis
148eece065 Tweak frame timing to avoid overloading the main thread 2017-07-07 21:00:33 -07:00
Brad Davis
7e9ea596a0 Add more efficient overlay getters, don't use blocking calls 2017-07-07 21:00:31 -07:00
Zach Fox
cdfbb02471 Merge pull request #10921 from zfox23/spectatorCamera_fixOverlayDrift 
Prevent Image3DOverlays from drifting
 2017-07-07 19:29:29 -07:00
Zach Fox
d0c521d7b4 Add clarifying comment. 2017-07-07 19:19:48 -07:00
Atlante45
7160fca4f7 Fix bad read access on shutdown 2017-07-07 17:14:08 -07:00
Atlante45
aa306c3450 Fix debug asserts on shutdown 2017-07-07 17:01:07 -07:00
Chris Collins
8a00efde72 Merge pull request #10922 from highfidelity/revert-10835-bug/invisible-avatars 
Revert "fix for invisible avatars after radius ignore"
 2017-07-07 16:51:06 -07:00
Stephen Birarda
420e9233b6 Revert "fix for invisible avatars after radius ignore" 2017-07-07 16:50:28 -07:00
druiz17
6e44c95d53 Merge pull request #10906 from druiz17/audio-qml-fix 
Made the output audio listview dynamically change height base on content size
 2017-07-07 16:48:15 -07:00
Stephen Birarda
f07ce6d294 Merge pull request #10835 from birarda/bug/invisible-avatars 
fix for invisible avatars after radius ignore
 2017-07-07 16:06:44 -07:00
Zach Fox
e537c494e5 Prevent Image3DOverlays from drifting 2017-07-07 16:04:08 -07:00