Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-16 22:06:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64614 commits 6 branches 1 tag 1.1 GiB
Commit graph

64614 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
2bf9b4f4a7
Merge pull request #12454 from samcake/workload-engine 
Drafting the Classification Tracker job and adding it as a no op to the workload engine
 2018-02-21 12:59:37 -08:00
Andrew Meadows
7267f2a629 fix linux compile error 2018-02-21 12:36:49 -08:00
samcake
0a920fcfc5 Merging with master 2018-02-21 12:16:33 -08:00
samcake
db4e280e95 Adding the stub of the ClassificationTracker class 2018-02-21 12:04:41 -08:00
Andrew Meadows
ff067601e7
Merge pull request #12450 from samcake/workload 
Workload: baby steps to add the rendering of the space proxies for debug prupose
 2018-02-21 11:58:28 -08:00
samcake
85a17f1301 missing cstring for the memcpy in Space.cpp 2018-02-21 11:21:43 -08:00
samcake
1c3bc0aa67 addressing review and warnings 2018-02-21 11:18:41 -08:00
samcake
33b47f9ae2 Merging with the actual worloadspace managed from the EntityTreeRenderer 2018-02-21 10:34:58 -08:00
samcake
34db56c50c Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-02-21 08:58:01 -08:00
Sam Gateau
e9ea4828ce
Merge pull request #12448 from AndrewMeadows/workload-004 
workload: initial pass at tracking entities in workload::Space
 2018-02-21 08:56:00 -08:00
Andrew Meadows
9246f6c24a render-perf depdends on workload library 2018-02-20 19:15:54 -08:00
samcake
f1dcfeb25e Adding shaders and means to render the proxies contained in the workload SPace 2018-02-20 18:20:12 -08:00
Andrew Meadows
c3d08d06ff remove cruft 2018-02-20 17:50:12 -08:00
Andrew Meadows
e7495d830b maintain Space proxies for entities 2018-02-20 17:39:05 -08:00
Andrew Meadows
76d2e9bc78 fix comment 2018-02-20 17:38:01 -08:00
samcake
be3fdbeaeb Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-02-20 13:16:25 -08:00
Andrew Meadows
7ed68ced62 Merge master into highfidelity/workload 2018-02-20 12:31:37 -08:00
John Conklin II
6148c407a5
Merge pull request #12422 from misslivirose/fix-overlay-lines 
Show outline for zones when rotating
 2018-02-20 09:30:22 -08:00
John Conklin II
aa67a98d02
Merge pull request #12426 from ElderOrb/FB11508 
fix for toolbar slowly drifting on switching between HMD/Desktop modes
 2018-02-20 09:30:01 -08:00
Sam Gateau
cd14fb65f0 First stp to add a rendering job to debug and display the workload space 2018-02-19 23:44:23 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals 
Material Entities
 2018-02-19 10:58:02 -08:00
Brad Hefta-Gaub
0ef2794c35
Merge pull request #12395 from druiz17/fix-qml-tablet-apps 
Prevent adding the same tablet url to the tabletApps list
 2018-02-18 19:10:24 -08:00
Brad Hefta-Gaub
a4783ded15
Merge pull request #12414 from hyperlogic/bug-fix/scramlbed-avaatrs 
Bug fix for Scrambled Avatars
 2018-02-18 19:06:53 -08:00
Brad Hefta-Gaub
d0b0fcba9a
Merge pull request #12436 from cain-kilgore/patch-1 
Fixed extra " in backup_instructions.html
 2018-02-18 19:06:24 -08:00
Cain Kilgore
47ed45b5e9
Fixed extra " in backup_instructions.html 2018-02-17 18:14:44 +00:00
samcake
d1b1ae0ea3 Working on adding rendering from the workload 2018-02-16 17:22:27 -08:00
samcake
9441bb477d Working on adding rendering from the workload 2018-02-16 17:21:07 -08:00
Stephen Birarda
311b9388d6
Merge pull request #12424 from birarda/bug/settings-response-filter 
fix overwrite of general description object with filtered
 2018-02-16 10:57:58 -07:00
John Conklin II
24a3eb6e80
Merge pull request #12419 from druiz17/fix-edit-avatar-entities 
Don't update avatar entities of the avatars ID is AVATAR_SELF_ID
 2018-02-16 09:48:19 -08:00
Alexander Ivash
2eb8ebcdbc FB11508 - toolbar slowly sides downward 2018-02-16 20:22:16 +03:00
MiladNazeri
331b253ba0
Merge pull request #12386 from cain-kilgore/21668 
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
 2018-02-16 06:57:03 -08:00
Stephen Birarda
81662b5edc don't overwrite general description object with filtered one 2018-02-15 19:14:14 -08:00
Andrew Meadows
6d347cf44f revert deadlock, remove Space stubbery in EntityTree 2018-02-15 17:40:15 -08:00
SamGondelman
2d0b85af72 workaround bug 2018-02-15 17:28:59 -08:00
Liv Erickson
175532c444 show outline for zones when rotating 2018-02-15 15:51:54 -08:00
Sam Gateau
f809862870
Merge pull request #12412 from samcake/blue 
Introduce task abort feature for early exit of task branch
 2018-02-15 15:50:43 -08:00
SamGondelman
b189433855 merge 2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Dante Ruiz
a194c8bc03 Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps 2018-02-15 15:46:16 -08:00
Dante Ruiz
bbcf865db3 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-avatar-entities 2018-02-15 15:03:12 -08:00
Dante Ruiz
e4db09fef8 don't update avatar entities if the avatars ID is AVATAR_SELF_ID 2018-02-15 15:02:45 -08:00
Andrew Meadows
91f0134632 remove linux crash-on-login workaround hackery 2018-02-15 13:10:26 -08:00
Andrew Meadows
f35469c0de give EntityTree a workload/Space instance 2018-02-15 12:57:58 -08:00
Andrew Meadows
1247f88d83 merge 'master' into 'workload' 2018-02-15 12:21:05 -08:00
samcake
c70b655fbc A bit more explanations to the Task Flow class 2018-02-15 11:55:16 -08:00
Anthony J. Thibault
f07b1fa4c5 Revert "FBX node IDs aren't alphanumerically ordered per logical structure" 
This reverts commit a7ec4501e6.

Because remainingModels is a QSet, the order is not guaranteed.
Therefore the same code iterating over the same items will sometimes have a different ordering.
See docs for QSet, http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same.  When they are not the avatar's appear scrambled.
 2018-02-15 11:32:29 -08:00
samcake
0228392ac9 Merge branch 'blue' of https://github.com/samcake/hifi into blue 2018-02-15 11:24:49 -08:00
samcake
b21b98c810 Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work 2018-02-15 11:24:20 -08:00
Zach Fox
3c620282b1
Merge pull request #12393 from zfox23/fixAvailabilityMouseArea 
PAL: Prevent opening of Availability from WebView
 2018-02-15 11:10:05 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals 2018-02-15 11:02:49 -08:00