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
Olivier Prat
9758a6ded0
Edition picking again (but without bounding box highlighting)
2017-07-10 17:57:02 +02:00
Sam Gateau
746812ff78
Merging with origin orange
2017-07-10 17:25:13 +02:00
Olivier Prat
cc4e168369
Working fade again
2017-07-10 16:45:13 +02:00
Olivier Prat
66d09a4c3c
Some objects fade and fixed crash due to invalid meta item id
2017-07-10 16:02:12 +02:00
Olivier Prat
267531cc1a
First working fade
2017-07-10 15:27:09 +02:00
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
Zach Fox
dbb48cd1aa
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-07 16:03:04 -07:00
Atlante45
0778fbaea9
Fix Debug Mode Assert
2017-07-07 15:58:39 -07:00
David Kelly
f18e64ed1a
first pass at blitting correct hmd preview (in mono)
2017-07-07 15:53:29 -07:00
Andrew Meadows
665aa92da2
Merge pull request #10877 from sethalves/atp-client
...
Atp client
2017-07-07 14:04:50 -07:00
Zach Fox
3d14d3755e
Merge pull request #10898 from 1P-Cusack/21425
...
Add View->Enter First Person Mode in HMD checkbox.
2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5
Merge pull request #10878 from mnafees/21355
...
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab
Default 'Enter First Person Mode in HMD' to true.
2017-07-07 15:35:32 -04:00
Liv
060e3a9c5a
Add signal for avatar skeleton changing
2017-07-07 11:48:12 -07:00
Ryan Huffman
84345e6db1
Merge pull request #10915 from birarda/bug/bake-with-ext-textures
...
fix for FBX baking with external textures
2017-07-07 10:57:35 -07:00
Seth Alves
01b612fd14
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-07 10:42:12 -07:00
Seth Alves
6782a891d0
rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different
2017-07-07 10:35:45 -07:00
David Kelly
688b5dad8b
allow switching display modes to work in desktop
2017-07-07 10:34:11 -07:00
Brad Davis
e22a3c6af9
Fixing overlay crashes, for real
2017-07-07 10:28:36 -07:00
Zach Fox
e222753aac
Merge pull request #10911 from zfox23/PAL_adminFix2
...
Set admin status even if QML can't find user in PAL
2017-07-07 10:24:53 -07:00
Andrew Meadows
2349057306
Merge pull request #10879 from AndrewMeadows/avoid-null-shape
...
fix crash in ObjectMotionState::handleEasyChanges()
2017-07-07 10:22:05 -07:00
Stephen Birarda
bff54d260e
fix for baking FBX with external textures
2017-07-07 10:11:13 -07:00
Anthony J. Thibault
64375c0438
Merge branch 'master' into feature/smooth-ik-chains
2017-07-07 09:31:46 -07:00
Anthony J. Thibault
bd8d6280a8
Interpolate out of ik chains when they are disabled
2017-07-07 09:29:57 -07:00
Sam Gateau
c3dd25e499
Drafting the mechanism to add shape pipeline
2017-07-07 18:26:10 +02:00
Olivier Prat
06d69d04c3
TransitionStage + FadeJob compiling but not linked to entity events
2017-07-07 18:22:11 +02:00
Seth Alves
88c39f3237
off-by-one
2017-07-07 09:15:42 -07:00
Seth Alves
29baca20e3
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-07 09:10:47 -07:00
Seth Alves
e4aa4823f9
Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move
2017-07-07 08:51:38 -07:00
