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

26559 commits

Author SHA1 Message Date
Dante Ruiz
acaf4f0d1d fix merge conflict 2018-02-16 15:14:18 -08:00
Seth Alves
367d715ff8 set connected flag when going to serverless domain 2018-02-16 15:08:37 -08:00
Dante Ruiz
aea517ddba fix merge conflict 2018-02-16 15:00:08 -08:00
Dante Ruiz
e0bbc57f6c support relative file path from appliaction directory 2018-02-16 14:48:38 -08:00
Seth Alves
de9ac7f4a5 working to integrate serverless domains into history, etc 2018-02-16 13:56:22 -08:00
Seth Alves
afa059d331 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-16 12:58:56 -08:00
Seth Alves
b2a4181bc0 working to integrate serverless domains into history, etc 2018-02-16 12:58:50 -08: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
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
Seth Alves
b5fe5a0c23 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-15 16:09:11 -08:00
Seth Alves
abc467b919 load json from indicated file to populate serverless domain 2018-02-15 16:09:03 -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
Seth Alves
aa91000bb7 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-15 15:19:56 -08:00
Seth Alves
17e2db96c6 make domain-manager and pals be still when interface is in serverless mode 2018-02-15 15:19:50 -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
samcake
c70b655fbc A bit more explanations to the Task Flow class 2018-02-15 11:55:16 -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
Clément Brisset
c62f68264f
Merge pull request #12295 from birarda/feat/content-split-from-settings 
initial separation of DS into domain settings and content settings
 2018-02-15 10:04:36 -08:00
samcake
246ac25d0a Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight 2018-02-14 17:36:46 -08:00
David Back
e4263100b4 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarInRange 2018-02-14 16:40:11 -08:00
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue 
Introducing group culling to avoid the avatar model to be partially culled
 2018-02-14 15:38:52 -08:00
Seth Alves
d1c0f0a40f
Merge pull request #12390 from druiz17/add-control-mapping 
add control button mapping for controller API
 2018-02-14 15:02:28 -08:00
John Conklin II
9ba29028e3
Merge pull request #12398 from jherico/fix/spectator_cam 
Fix spectator camera crash
 2018-02-14 13:15:42 -08:00
Stephen Birarda
6240181474 initial separation of content settings and domain settings 2018-02-14 12:09:56 -08:00
John Conklin II
63f752e76f
Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints 
fix -- get children of animated entity joints to follow along, again
 2018-02-14 11:12:45 -08:00
Brad Davis
8853bd6388 Fix spectator camera crash 2018-02-14 11:11:28 -08:00
samcake
6357f36a97 Fixing names 2018-02-14 10:39:14 -08:00
samcake
1d3ae1b187 Work in progress to get the render items beeing tagged correctly for groupCulled 2018-02-13 17:50:01 -08:00
Stephen Birarda
6ba2f4b279
Merge pull request #12286 from Atlante45/feat/asset-server-backup 
Add asset server backups capabilities to the Domain Server
 2018-02-13 17:40:11 -07:00
John Conklin II
309c2ecba1
Merge pull request #12239 from druiz17/fix-camera-update 
Do not override sensorToWorldMatrix if animGraph is loading or failed to load
 2018-02-13 15:10:13 -08:00
samcake
a98f55298b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2018-02-13 13:06:58 -08:00
samcake
f64e5f2444 Introducing the cull group 2018-02-13 13:06:26 -08:00
Clément Brisset
593113c102
Merge pull request #12387 from Atlante45/new-master 
Merge stable back into master
 2018-02-13 12:59:59 -08:00
Andrew Meadows
b111e82763
Merge pull request #12365 from AndrewMeadows/workload-001 
moving Job/Task framework out of 'render' library and into its own 'task' library
 2018-02-13 12:26:32 -08:00
Andrew Meadows
20c2a4470e merge 'findByID' into 'workload-001' 2018-02-13 11:47:02 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images 
2d images (JPG and PNG) are now supported as (quasi) entities
 2018-02-13 11:44:02 -08:00
Andrew Meadows
38bc312004 faster and const EntityTree::findByID() 2018-02-13 11:25:34 -08:00
Dante Ruiz
ddcee05b14 added control button for controller API 2018-02-13 09:41:00 -08:00
Sam Gateau
040710807d
Merge pull request #12346 from Zvork/scripts 
Fix transition (ex-fade) debugging scripts
 2018-02-13 09:08:35 -08:00
Andrew Meadows
01fb8f3369 remove cruft 2018-02-13 08:58:24 -08:00
Andrew Meadows
95b34cf112 remove cruft and extra whitespace 2018-02-13 08:58:24 -08:00
Andrew Meadows
f1495d27f6 try task link dependency rather than include 2018-02-13 08:58:24 -08:00
Andrew Meadows
a1c540fc85 instantiate trace_workload logging category 2018-02-13 08:57:20 -08:00
Andrew Meadows
2b1b75450d fix assert 2018-02-13 08:57:20 -08:00
Andrew Meadows
d59c3898dc add 'workload' logging profile 2018-02-13 08:57:20 -08:00
Andrew Meadows
cfb64ad693 add LoggingCategory data member to JobContext 2018-02-13 08:57:20 -08:00
Andrew Meadows
724e2f7e66 add CMakeLists.txt for new 'task' library 2018-02-13 08:56:11 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
Andrew Meadows
955af21aba use explicit cast to avoid windows warning 2018-02-13 08:54:44 -08:00