Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 01:59:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79940 commits 76 branches 59 tags 1.2 GiB
Commit graph

33017 commits

Author SHA1 Message Date
Seth Alves
9baf4c7078 comfort mode -- squeeze vision to avoid sickness 2019-07-12 09:14:17 -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
6ce809fb2a merge with master 2019-07-11 09:01:30 -07:00
SamGondelman
d545ba5bc6 haze on most entities, working on skybox 2019-07-10 23:52:50 -07:00
David Rowe
2cb3425740 Merge branch 'master' into DOC-102 2019-07-11 16:38:23 +12:00
David Rowe
a45d8924fa Miscellaneous minor JSDoc fixes noticed in passing 2019-07-11 16:31:09 +12: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
amer cerkic
d5d5741d42 removed extra lines 2019-07-10 17:17:53 -07:00
amer cerkic
73097113c7 adding a null check to the display plugin. Possible that display plugin was disposed off during the check if hmdmode 2019-07-10 17:13:34 -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
29dbbc49ad Merge remote-tracking branch 'upstream/master' into bias 2019-07-09 15:38:13 -07:00
SamGondelman
bd2003fa01 Merge remote-tracking branch 'upstream/master' into uber 2019-07-09 13:45:14 -07:00
SamGondelman
8fd2251612 mostly working equation? 2019-07-09 13:34:33 -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
Sam Gondelman
732a7b0a89
fix build error 2019-07-03 22:43:35 -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
SamGondelman
72f52b069e cleanup, fix shadow qml 2019-07-03 16:21:47 -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 Gondelman
0d9f639331
Merge branch 'master' into bias 2019-07-03 10:20:16 -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
SamGondelman
692c776be5 expose shadow bias and max distance wip 2019-07-02 15:18:28 -07:00
Shannon Romano
a3ec365f6c
Merge pull request #15862 from annabrewer/display-simplification 
BUGZ-838, BUGZ-850, BUGZ-853: Muted sign displays backwards in second person view, Fix lossy/duplicate color format conversions, Adjust wearables screen is flipped
 2019-07-02 11:31:53 -07:00
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -07:00
Shannon Romano
df34e2f86d
Merge pull request #15864 from hyperlogic/bug-fix/dependency-manager-shutdown-issues 
Fix for DependencyManager crash on shutdown on Mac
 2019-07-02 08:24:11 -07:00
Shannon Romano
2f07d35eb7
Merge pull request #15863 from SimonWalton-HiFi/public-address-change2 
BUGZ-894: Propagate a Node's public address change, part 2
 2019-07-02 08:23:34 -07:00
Sam Gateau
2c412808e7 More information from the platform on mac 2019-07-02 14:48:25 +02:00
Ryan Huffman
d29cd796ca Add defaultScriptsOverride option 2019-07-01 23:51:34 -07:00
Anthony Thibault
6c66f5a37b Fix for DependencyManager crash on shutdown on Mac 
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.

However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early.  Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.

To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.

However, this is only a speculative fix, because this is so difficult to reproduce.
 2019-07-01 17:37:57 -07:00
Sabrina Shanman
043aee4f78
Merge pull request #15859 from AndrewMeadows/fix-safe-landing 
BUGZ-787: fix SafeLanding to load correct set of objects before enabling physics simulation
 2019-07-01 17:05:19 -07:00
Anna
f44bc52d58 implemented requested changes, fixed math error in filmic curve 2019-07-01 17:05:13 -07:00
Simon Walton
6253adf749 Hook-up remote address-change to Connection class 2019-07-01 16:36:05 -07:00
Andrew Meadows
4bbfd7cad1 more correct bounding sphere around avatar for SafeLanding query 2019-07-01 15:53:42 -07:00
Anna
95f2dfa551 added horizontal flip back to mirror mode 2019-07-01 15:31:26 -07:00
Howard Stearns
36e526d1cd cr feedback 2019-07-01 15:23:00 -07:00
Howard Stearns
ce26611e1f CR comments 2019-07-01 15:11:54 -07:00
Howard Stearns
08ebd51559 Merge branch 'master' of github.com:highfidelity/hifi 2019-07-01 14:37:42 -07:00
Howard Stearns
0db69ecc20 add network card info to platform data 2019-07-01 14:36:48 -07:00
Anna
f52376563d remove redundant getRenderTexturePipeline() override from HMD display plugin 2019-07-01 11:14:54 -07:00
Anna
e6abaf76f3 Merge branch 'master' of github.com:highfidelity/hifi into display-simplification 2019-07-01 10:56:47 -07:00
Anna
787359fdfb fixed ui flipping issue 2019-07-01 10:52:03 -07:00
Brad Hefta-Gaub
0ef9110f2b
Merge pull request #15853 from SimonWalton-HiFi/public-address-change 
BUGZ-762: Propagate a Node's public address change to Connection class
 2019-06-28 16:12:01 -07:00
Shannon Romano
07fdbeaa0a
Merge pull request #15855 from SamGondelman/forward 
BUGZ-661: Fix text entity rendering in deferred vs. forward
 2019-06-28 15:59:09 -07:00
Sam Gondelman
e2bf3d7138
remove unused constant 2019-06-28 15:11:22 -07:00
SamGondelman
a5b92a6c7b fix layered rendering of group culled sub items 2019-06-28 14:24:33 -07:00
Shannon Romano
7ff751567b
Merge pull request #15848 from jherico/fix/dev-175-source 
DEV-175: QML content URL validation, whitelist trusted sources
 2019-06-28 14:18:56 -07:00
SamGondelman
c76d267c2a separate text into two render items 2019-06-28 13:53:44 -07:00
Simon Walton
225f65f4fb Log message tweaks 
Also don't need std in std::move, somehow.
 2019-06-28 11:30:09 -07:00
Shannon Romano
67901166ba
Merge pull request #15851 from ctrlaltdavid/DOC-79 
DOC-79: Entities JSDoc Update - Doc Review
 2019-06-28 10:12:05 -07:00
Anna
9b85c7f1ac Merge branch 'master' of github.com:highfidelity/hifi into gamma-simplification 2019-06-28 09:47:17 -07:00
David Rowe
2d6d3eb4fe Doc review 2019-06-28 17:05:36 +12:00
Simon Walton
9b894456e9 Change address for sequence-number hash also 2019-06-27 17:29:17 -07:00
Brad Davis
8bcde84d89 Disable remote QML unless whitelisted 2019-06-27 16:37:56 -07:00
Simon Walton
1265531f79 Plumb down change of destination address 2019-06-27 15:52:39 -07:00
raveenajain
3a60bc6a13 clang braces fix 2019-06-27 11:52:43 -07:00
raveenajain
d6fb7f8a6f arrays for bias calcs 2019-06-27 10:42:14 -07:00
raveenajain
309e59ca8b Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows 2019-06-27 09:42:03 -07:00
raveenajain
04afbde188 cascade loop, fine tune calc 2019-06-27 09:41:39 -07:00
Simon Walton
50965f1916 Handle remote public-address changes 2019-06-26 18:04:41 -07:00
Anna
6b79b275a9 fixed reinhard and filmic curves 2019-06-26 18:00:49 -07:00
Anna
24b6d64e34 removed extraneous code for hmd 2019-06-26 17:27:53 -07:00
Anna
6f5b37ec87 removed extraneous conversion to SRGB and back during deferred rendering 2019-06-26 16:36:04 -07:00
raveenajain
534794d7ff move bias init from config to run 2019-06-26 15:42:11 -07:00
Sam Gondelman
7573c1207b
remove extra alpha check in deferred sdf_text3D.slf 2019-06-26 11:21:52 -07:00