Commit graph

80224 commits

Author SHA1 Message Date
Jamil Akram
a3919af747
Merge pull request #16062 from dooglifeSF/animation_json_tuning
Tuning pass on anim-graph, using the new blend modes and engine features
2019-08-19 14:02:37 -07:00
Zach Fox
072261f551
Merge pull request #16074 from zfox23/helpQuickFixes
BUGZ-1295: Fix typo in Help > Controls > Turn Right
2019-08-19 13:15:10 -07:00
Zach Fox
36dffb7dc8
Merge pull request #16073 from zfox23/micIconFix
Fix some engine bugs that fix muted state in all UIs including simplifiedUI
2019-08-19 13:09:43 -07:00
Zach Fox
35a2cb7f27 BUGZ-1295: Fix typo in Help > Controls > Turn Right 2019-08-19 13:08:42 -07:00
Zach Fox
05abff1c0b
Merge pull request #16071 from zfox23/helpApp1
Help App: Phase 1
2019-08-19 11:16:44 -07:00
Zach Fox
ca2cdfc533 Fix some engine bugs that fix muted state in all UIs including simplifiedUI 2019-08-19 11:13:11 -07:00
Zach Fox
42705c2fea
Combine conditional statements 2019-08-19 11:04:54 -07:00
Zach Fox
2b86947d4a Mipmap images; better padding 2019-08-19 10:32:08 -07:00
Zach Fox
3de9f44bf3 It's working 2019-08-16 16:00:30 -07:00
Zach Fox
4c006c50aa Controls almost done 2019-08-16 15:53:30 -07:00
Zach Fox
3b138fe031
Merge pull request #16067 from zfox23/fixMutedBanner
Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner
2019-08-16 14:57:42 -07:00
Zach Fox
30d552919a Merge branch 'master' of github.com:highfidelity/hifi into helpApp1 2019-08-16 14:06:58 -07:00
Zach Fox
a274e5c2b1 Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner 2019-08-16 12:31:50 -07:00
Howard Stearns
65ee21bb01
Merge pull request #16063 from Atlante45/fix/requesjs
BUGZ-1242: Fix linux specific script engine crash
2019-08-16 11:52:14 -07:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown
BUGZ-984: Wait for client entity-scripts to unload when shutting down
2019-08-16 10:12:38 -07:00
Clement
5be1cfcb36 Fix linux specific script engine crash 2019-08-15 13:07:43 -07:00
Anthony Thibault
4d2e7eaaba
Merge pull request #16059 from luiscuenca/fixMultisphereCrash
BUGZ-1156: Allow collapsing of all multi spheres
2019-08-15 10:40:29 -07:00
Brad Hefta-Gaub
b0b406adda
Merge pull request #16015 from HifiExperiments/renderUpdate
BUGZ-902: Drastically reduce locking and branching necessary for render updates
2019-08-15 09:35:17 -07:00
Shannon Romano
d9f78499ef
Merge pull request #16053 from samcake/toulouse
BUGZ-1173, BUGZ-1175: On Windows, Fix black edges on whiteboard lines in Forward and more issues in GL41Backend
2019-08-15 09:34:03 -07:00
Brad Hefta-Gaub
1e5c81c251
Merge pull request #16058 from jherico/fix/bugz-1119
BUGZ-1119: workaround for race condition crash in QML rendering
2019-08-15 09:32:31 -07:00
Brad Hefta-Gaub
95f3fcbae2
Merge pull request #16060 from samcake/yellow
BUGZ-1081: Put Macs into "Low" rendering tier if INtel GPU
2019-08-15 09:31:30 -07:00
dooglifeSF
2f3f6be693 Tuning pass on anim-graph, using the new blend modes and engine features. 2019-08-14 15:18:19 -07:00
Simon Walton
9aacd136b8 Add blocking to script unload for client entity-scripts 2019-08-14 13:51:40 -07:00
Sam Gateau
eb24667218 Remove useless variable 2019-08-14 11:54:39 -07:00
Sam Gateau
a5e2cacb98 Apply the new tiering rule for macos: if intel gpu go low, else stick to mid 2019-08-14 11:45:27 -07:00
Sam Gateau
f4c33d8392 Refining the look of the enable button of the TaskPropView 2019-08-14 11:33:30 -07:00
Sam Gateau
5e57e53db2 Address errors sent from running the ENgine Inspector.js 2019-08-14 11:15:52 -07:00
Sam Gateau
99f62f61a9 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-14 10:37:47 -07:00
Sam Gateau
44a3deacb1 Merge branch 'yellow' of github.com:samcake/hifi into yellow 2019-08-14 10:37:30 -07:00
Sam Gateau
859016bf37 Addressing review comments 2019-08-14 10:28:42 -07:00
Zach Fox
52c4d4fe69 better FAQ 2019-08-14 09:31:08 -07:00
Zach Fox
7297ac9a09 Merge branch 'master' of github.com:highfidelity/hifi into helpApp1 2019-08-14 09:11:04 -07:00
luiscuenca
02e730a4d9
fix size_t warning 2019-08-14 08:08:32 -07:00
Sam Gateau
5c085bd08d CLean the code of the task::COnfig changes 2019-08-13 18:58:35 -07:00
Sam Gateau
4a93b23d83 Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly 2019-08-13 18:47:57 -07:00
luiscuenca
1570c59a45
Allow collapsing of all multi spheres 2019-08-13 16:06:44 -07:00
Brad Davis
3e862950a8 BUGZ-1119: workaround for race condition crash in QML rendering 2019-08-13 15:47:59 -07:00
Sam Gateau
224e9590ec avoid using explicit dialects when we want just a default one 2019-08-13 15:45:24 -07:00
Sam Gateau
9a1e1a001a Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-13 10:00:59 -07:00
Sam Gateau
0b470b9ab8 Fixing the bad location assignment on gl41 on windows with Austin's help 2019-08-13 00:22:17 -07:00
Andy Howell
03e3f38ff1
Merge pull request #16056 from Atlante45/fix/requesjs
BUGZ-1239: Delete reply after the callback is executed
2019-08-12 17:35:39 -07:00
Clement
90aeb636bd Delete reply after the callback is executed 2019-08-12 17:21:22 -07:00
Ryan Huffman
6f76098a2c
Merge pull request #16051 from Atlante45/feat/add-version-to-oven
DEV-352: Add --version to the Oven
2019-08-12 15:45:09 -07:00
Shannon Romano
ee57d25df9
Merge pull request #16055 from zfox23/removeLoDShortcut
BUGZ-1233: Remove keyboard shortcut to LoD tools
2019-08-12 12:20:10 -07:00
Shannon Romano
54671da230
Merge pull request #16054 from jherico/fix/bugz-919
BUGZ-919: Skybox broken on older AMD drivers
2019-08-12 12:15:59 -07:00
Zach Fox
a225a009cd BUGZ-1233: Remove keyboard shortcut to LoD tools 2019-08-12 11:27:34 -07:00
Brad Davis
a01f115357 Disable use of DSA to load cubemaps 2019-08-12 10:34:37 -07:00
Brad Davis
44e2037e15 Quiet warnings, add convenience function 2019-08-12 10:34:07 -07:00
Sam Gateau
9139edc8b1 Maybe fixed the problem, cannot render the gl41 version properly 2019-08-12 00:44:14 -07:00
Sam Gateau
53642763c9 Merge branch 'master' of https://github.com/highfidelity/hifi into toulouse 2019-08-11 21:57:36 -07:00