Commit graph

74161 commits

Author SHA1 Message Date
sam gateau
e941833676 gathering the lighting stage jobs in their own task away from the renderer specificities 2018-12-06 17:27:13 -08:00
sam gateau
a267c3115a drafting more factorisation of render tasks 2018-12-05 17:47:33 -08:00
sam gateau
8efdec1e51 merging with master 2018-12-04 11:03:46 -08:00
John Conklin II
e4b68f1d38
Merge pull request #14455 from samcake/one
case 20041: Package all the graphics related objects and functions in Application in the Graphics Engine
2018-12-04 10:46:45 -08:00
Sam Gateau
d2ff4d4674 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-12-03 20:52:43 -08:00
sam gateau
0343983f31 Applying changes done in deferred to forward 2018-12-03 16:58:54 -08:00
Clément Brisset
56ac34f9d1
Merge pull request #14506 from Atlante45/fix/misc-agent
Fix various AC bugs
2018-12-03 14:18:12 -08:00
Clément Brisset
62f21822ce
Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash
Fix Agent crash on shutdown
2018-12-03 14:17:35 -08:00
Zach Fox
2776839dff
Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval
Fix MS20117: Prevent HTML link from appearing in Wallet notification
2018-12-03 10:27:32 -08:00
sam gateau
5af24aa7d9 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-03 08:49:44 -08:00
Sam Gateau
a5d1c4833e Exploring varying with names 2018-12-03 00:00:28 -08:00
Sam Gateau
259a97c43a Exploring varying with names 2018-12-02 23:41:57 -08:00
Shannon Romano
3c43f44119
Merge pull request #14462 from huffman/fix/key-light-angle
Swap key light directions in Create
2018-11-30 19:28:53 -08:00
Shannon Romano
0d2b0903d8
Merge pull request #14469 from huffman/fix/draggable-input-tabbable
Fix draggable inputs not being tabbable
2018-11-30 19:28:11 -08:00
Sam Gateau
80ec393f2e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-11-30 19:16:42 -08:00
Shannon Romano
5afff69b78
Merge pull request #14505 from huffman/fix/create-empty-rgb-field
Fix empty rgb field in Create going black
2018-11-30 18:19:44 -08:00
sam gateau
2c4cd68a00 iterating on a simpler engine graph 2018-11-30 17:43:27 -08:00
Clément Brisset
0dac8580ee
Merge pull request #14492 from Atlante45/fix/audio-mixer-crash-master
Fix audio mixer crash
2018-11-30 17:03:36 -08:00
Zach Fox
051b7cfbb8 Fix MS20117: Prevent HTML link from appearing in Wallet notification 2018-11-30 16:12:21 -08:00
Shannon Romano
f3c0118602
Merge pull request #14454 from NissimHadar/19991-MacAppData
case 19991 - implement AppData for Mac
2018-11-30 11:38:21 -08:00
Shannon Romano
1f29423a58
Merge pull request #14423 from vladest/qml_warning_fix
Fix QML achoring warnings on Layouts
2018-11-30 10:50:30 -08:00
Jeff Clinton
0bca290de2
Merge pull request #14485 from sethalves/crash-on-exits
suppress 'No instance available' messages during shutdown.  try a dif…
2018-11-30 10:10:43 -08:00
Shannon Romano
0bf5be57f8
Merge pull request #14488 from danteruiz/limit-avatar-entity-data
don't save joint information for avatar entities in avatarbookmarks.json
2018-11-30 09:49:01 -08:00
Shannon Romano
41ce976869
Merge pull request #14481 from danteruiz/master-mallets
fixing keyboard mallets dimensions (Master)
2018-11-30 09:46:32 -08:00
Shannon Romano
dacf43d70c
Merge pull request #14483 from danteruiz/keyboard-toggle-option
Keyboard menu option in general settings
2018-11-30 09:43:10 -08:00
Shannon Romano
1b24d051f7
Merge pull request #14432 from ctrlaltdavid/M17988
Fix memory accumulating while Interface is minimized
2018-11-30 09:39:14 -08:00
Shannon Romano
08bbe27522
Merge pull request #14489 from ctrlaltdavid/M17990-a
Remove unused avatar attachment constant
2018-11-30 09:37:40 -08:00
Jeff Clinton
04f09d70e3
Merge pull request #14464 from ctrlaltdavid/M17406
Fix fax grab to near grab transition and haptic pulses
2018-11-30 09:18:51 -08:00
sam gateau
7575f9948d Merge branch 'punk' of github.com:samcake/hifi into punk 2018-11-29 17:59:43 -08:00
sam gateau
14bf383c50 MIgrating everything to collect the items out from the render task 2018-11-29 17:59:04 -08:00
NissimHadar
8973b7caea
Merge branch 'master' into 19991-MacAppData 2018-11-29 17:45:58 -08:00
NissimHadar
87c863584d Just to remove conflict. 2018-11-29 17:43:19 -08:00
Clement
c53c52c7a0 Fix various Agent bugs 2018-11-29 17:42:04 -08:00
Sam Gateau
1dcddb9541
Merge pull request #14440 from NissimHadar/19942-MacInstall
19942 Mac installation procedure
2018-11-29 14:38:07 -08:00
Ryan Huffman
59b7cdf318 Fix empty rgb field in Create going black 2018-11-29 14:10:22 -08:00
David Rowe
dc05cdee5a Merge branch 'master' into M17406
# Conflicts:
#	scripts/system/controllers/controllerModules/nearParentGrabEntity.js
2018-11-30 09:44:09 +13:00
Jeff Clinton
be0a1ed2f8
Merge pull request #14498 from kencooke/audio-options-pitch-bugfix
Fix the audio injector "pitch" property
2018-11-29 10:07:07 -08:00
Seth Alves
87e4c17194
Merge pull request #14429 from danteruiz/disable-highlighting
Remove entity highlighting
2018-11-29 09:04:56 -08:00
Ken Cooke
88d935a28e Fix the audio injector "pitch" property 2018-11-29 08:12:14 -08:00
Sam Gateau
54fa4365b8 FIxing build issue doh... 2018-11-28 22:21:58 -08:00
Sam Gateau
aa749b0980 adressing review comments 2018-11-28 21:46:13 -08:00
Sam Gateau
9353745054 MErge with master 2018-11-28 21:40:24 -08:00
Sam Gateau
fb47900e2f Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-11-28 19:12:29 -08:00
Clement
181f2b4263 Fix Agent crash on shutdown 2018-11-28 18:40:52 -08:00
Shannon Romano
f4535e6784
Merge pull request #14493 from kencooke/audio-asan-warnings2
Fix UBSAN warning
2018-11-28 18:09:36 -08:00
Ken Cooke
11252a8f56 Fix UBSAN warning (left-shift of negative integer) when peak limiter is called with implausibly large (or NaN) audio values 2018-11-28 16:48:34 -08:00
Clement
c29f6346d8 Clear mixing structures when we stop mixing for node 2018-11-28 16:09:04 -08:00
Jeff Clinton
f98f070c8b
Merge pull request #14445 from danteruiz/fix-stylus-dimensions
fixing keyboard mallets dimensions
2018-11-28 14:19:53 -08:00
David Rowe
1683179fe5 Remove unused constant 2018-11-29 09:14:10 +13:00
Seth Alves
0de011dd71
Merge pull request #14478 from danteruiz/ScriptEngine-Crashes
Fix script engine crashes when reloading scripts.
2018-11-28 12:04:52 -08:00