Commit graph

32959 commits

Author SHA1 Message Date
Shannon Romano
8ce64d95ab
Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux
BUGZ-863: wait for objects to be added to physics before completing SafeLanding
2019-07-15 08:34:17 -07:00
Shannon Romano
23c7e1c0f3
Merge pull request #15843 from SamGondelman/quit
Fix ScriptEngines::loadScript invoke call
2019-07-15 08:32:16 -07:00
Shannon Romano
74b830dd12
Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen
BUGZ-918: Generate RSA key-pair early in start-up
2019-07-12 09:42:11 -07:00
Shannon Romano
3e70f4f51c
Merge pull request #15671 from SamGondelman/uber
DEV-203, BUGZ-978: Condense all redundant shader variants using new slp defines feature and add Haze to Forward renderer
2019-07-12 09:39:33 -07:00
Andrew Meadows
590876e54b remove NUM_REGIONS_TRACKED 2019-07-11 17:05:32 -07:00
SamGondelman
bda87aa13f trying to fix android 2019-07-11 16:39:23 -07:00
SamGondelman
046b25ab67 fix haze on web entities, deferred and forward 2019-07-11 14:56:17 -07:00
Andrew Meadows
0d943ca55a more warning supression 2019-07-11 14:47:31 -07:00
Andrew Meadows
f165184fb2 eliminate warnings about signed-vs-unsigned comparison 2019-07-11 14:09:37 -07:00
SamGondelman
7793e07eeb fix polyvox 2019-07-11 13:34:58 -07:00
SamGondelman
22a7a97a9a fix forward web + parabola blending 2019-07-11 12:23:04 -07:00
Andrew Meadows
ba8978862d improved names for workload::Region constants 2019-07-11 11:17:04 -07:00
SamGondelman
9539664749 add haze to skybox 2019-07-11 11:00:30 -07:00
SamGondelman
d545ba5bc6 haze on most entities, working on skybox 2019-07-10 23:52:50 -07:00
Shannon Romano
54b07e9c9b
Merge pull request #15905 from SamGondelman/text
BUGZ-967: Fix text visibility toggle
2019-07-10 17:47:10 -07:00
Simon Walton
645a99c200 Generate RSA key-pair early in start-up 2019-07-10 17:36:25 -07:00
Howard Stearns
084b2edad4
Merge pull request #15908 from SimonWalton-HiFi/keygen-thread-logging
BUGZ-918: Verbose RSA-keypair logging
2019-07-10 15:57:30 -07:00
Simon Walton
7a64ed10f6 Verbose RSA-keypair logging 2019-07-10 15:08:51 -07:00
Sam Gondelman
a64d307bdf
make sure we don't have transparent shadow casters 2019-07-10 14:21:56 -07:00
SamGondelman
9a866a129d fix text visibility toggle 2019-07-10 10:20:27 -07:00
Shannon Romano
f235778a6e
Merge pull request #15866 from huffman/feat/override-default-scripts
DEV-164: Add defaultScriptsOverride option
2019-07-10 10:16:55 -07:00
Andrew Meadows
9a6b42ec28 move getCollisionShapeURL() back to base class 2019-07-09 15:51:56 -07:00
Andrew Meadows
f44551e957 more readable code 2019-07-09 15:51:56 -07:00
Andrew Meadows
0f42dca40b add some comments about meanings of workload Regions 2019-07-09 15:51:56 -07:00
Andrew Meadows
520c62f6f6 wait for objects added to physics before stop SafeLanding 2019-07-09 15:51:56 -07:00
SamGondelman
bd2003fa01 Merge remote-tracking branch 'upstream/master' into uber 2019-07-09 13:45:14 -07:00
SamGondelman
68b2c8c2fb wip adding haze to forward rendering 2019-07-09 00:46:24 -07:00
SamGondelman
41e8a08484 Merge remote-tracking branch 'upstream/master' into uber 2019-07-08 23:00:36 -07:00
Howard Stearns
335119cb58 log wakeup (on client and report to DS) during connection on Windows 2019-07-08 16:50:36 -07:00
Jamil Akram
aa82c4e971
Merge pull request #15806 from dooglifeSF/idles_talks_locomotion_improvements
Idles talks locomotion improvements
2019-07-08 13:30:51 -07:00
Brad Hefta-Gaub
3108b69e5f
Merge pull request #15881 from SimonWalton-HiFi/cyan-sphere-debugging
BUGZ-781: Additional debugging for dropped avatar data
2019-07-08 09:14:13 -07:00
Sam Gateau
f2cda426d8
Merge pull request #15884 from samcake/nut
BUGZ-736 / BUGZ-914 : Improve the enumeration of the platform and profiler / apply a specific PPI per Tier
2019-07-06 02:18:11 +02:00
Sam Gateau
b4e86741e0 Adress typo in gpuident and add extra checks on the recommended scale value 2019-07-06 01:13:38 +02:00
Samuel Gateau
1aa067db74 address warning 2019-07-05 18:54:33 +02:00
Sam Gateau
11f036246e Implement the ppi scaling in sync with the platform tier 2019-07-05 17:52:44 +02:00
Samuel Gateau
6ef652038b EXpose the master index for cpu, gpu and display and adjust the profuiler to support it / remove unsupported deferred for macs since now it is fixed 2019-07-05 16:15:19 +02:00
Samuel Gateau
9d9b80dec0 remove cruft on the win side and live with a crappy ppiDesktop 2019-07-05 15:02:51 +02:00
Samuel Gateau
0c26d3ef66 clean up etc 2019-07-05 13:23:19 +02:00
Sam Gateau
4cc3800384 COmprehensive enumeration of gpu and displays from mac 2019-07-05 12:26:42 +02:00
Samuel Gateau
28fddc2fb3 full stack for windows 2019-07-04 18:13:08 +02:00
Samuel Gateau
12cc69e41c Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-07-04 01:56:06 -07:00
Samuel Gateau
8284c8d015 doing the full enumeration in windows 2019-07-04 01:55:48 -07:00
SamGondelman
ea1b117ca4 fix image y flip and text crash 2019-07-03 23:14:52 -07:00
SamGondelman
8b9fcd43b1 merge with master 2019-07-03 17:58:23 -07:00
Simon Walton
597477614c Debugging for missing Avatar Data 2019-07-03 17:51:05 -07:00
Sam Gondelman
00441f1899
Merge pull request #15875 from SamGondelman/load
BUGZ-910: Return entity load priority operator to proper state after safe landing
2019-07-03 14:20:03 -07:00
Sam Gateau
1a71a63a8b
Merge pull request #15867 from SamGondelman/unlit
BUGZ-661: Add unlit property to text entities
2019-07-03 18:43:26 +02:00
Samuel Gateau
3be8b80eff Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-07-03 01:01:26 -07:00
Samuel Gateau
a1968bd9d0 Moving mac specific include at the correct place 2019-07-03 01:00:52 -07:00
SamGondelman
4973563c20 return entity load priority operator to proper state 2019-07-02 16:29:19 -07:00