Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Container tasks #293

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open

Container tasks #293

wants to merge 30 commits into from

Commits on Jan 30, 2021

  1. Container task running good

    @zapzoop0099
    zapzoop0099 committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    8993e56 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/opensuspect/opensuspect int… 

    …o container-tasks
    @zapzoop0099
    zapzoop0099 committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    aed76a8 View commit details
    Browse the repository at this point in the history

  3. Removed test debug messages

    @zapzoop0099
    zapzoop0099 committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    8d62ec3 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2021

  1. Fixed both bugs proposed by damjan94 and NiceMicro

    @zapzoop0099
    zapzoop0099 committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    04185c2 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2021

  1. implemented rest of the changes

    @zapzoop0099
    zapzoop0099 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    68548db View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2021

  1. added the chemical cabinet and UI opening using the interaction resource

    @nicemicro
    nicemicro committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    8d235b3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from nicemicro/container-refactor 

    Container refactor: adding the interaction resource to the map
    @zapzoop0099
    zapzoop0099 authored Feb 10, 2021
    Configuration menu
    Copy the full SHA
    43bf38c View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2021

  1. updated with main

    @zapzoop0099
    zapzoop0099 committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    71a40f3 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2021

  1. Updated with main

    @zapzoop0099
    zapzoop0099 committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    02cd2b1 View commit details
    Browse the repository at this point in the history

  2. Fixed merge mistakes

    @zapzoop0099
    zapzoop0099 committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    409bc6e View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2021

  1. Custom task resource

    @zapzoop0099
    zapzoop0099 committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    3530845 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/opensuspect/opensuspect int… 

    …o container-tasks
    @zapzoop0099
    zapzoop0099 committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    8d229fc View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Sync work

    @zapzoop0099
    zapzoop0099 committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    a8b3f17 View commit details
    Browse the repository at this point in the history

  2. renaming files

    @nicemicro
    nicemicro committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    8996940 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Merge pull request #2 from nicemicro/container-help 

    renaming files
    @zapzoop0099
    zapzoop0099 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    58ea05c View commit details
    Browse the repository at this point in the history

  2. Fixed sync state

    @zapzoop0099
    zapzoop0099 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    ca16166 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'container-tasks' of https://github.com/zapzoop0099/open… 

    …suspect into container-tasks
    @zapzoop0099
    zapzoop0099 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    6bc7a25 View commit details
    Browse the repository at this point in the history

  4. Some basic item_holding_dic added

    @zapzoop0099
    zapzoop0099 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    3d35c41 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2021

  1. added new items for the chemical cabinet

    @nicemicro
    nicemicro committed Mar 5, 2021
    Configuration menu
    Copy the full SHA
    63a890d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from nicemicro/container-help 

    added new items for the chemical cabinet
    @zapzoop0099
    zapzoop0099 authored Mar 5, 2021
    Configuration menu
    Copy the full SHA
    7162681 View commit details
    Browse the repository at this point in the history

  3. Interaction done

    @zapzoop0099
    zapzoop0099 committed Mar 5, 2021
    Configuration menu
    Copy the full SHA
    b1ec4d5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'container-tasks' of https://github.com/zapzoop0099/open… 

    …suspect into container-tasks
    @zapzoop0099
    zapzoop0099 committed Mar 5, 2021
    Configuration menu
    Copy the full SHA
    422e28d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2021

  1. Basic stacking of items

    @zapzoop0099
    zapzoop0099 committed Mar 6, 2021
    Configuration menu
    Copy the full SHA
    fc83e06 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. added new items

    @nicemicro
    nicemicro committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    6d4f183 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. Merge pull request #4 from nicemicro/container-help 

    added new items
    @zapzoop0099
    zapzoop0099 authored Mar 26, 2021
    Configuration menu
    Copy the full SHA
    d3f3743 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2021

  1. Basic scene setup

    @zapzoop0099
    zapzoop0099 committed Mar 28, 2021
    Configuration menu
    Copy the full SHA
    5233618 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/opensuspect/opensuspect int… 

    …o container-tasks
    @zapzoop0099
    zapzoop0099 committed Mar 28, 2021
    Configuration menu
    Copy the full SHA
    b9cfc4d View commit details
    Browse the repository at this point in the history

  3. Cleanup

    @zapzoop0099
    zapzoop0099 committed Mar 28, 2021
    Configuration menu
    Copy the full SHA
    885e262 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of https://github.com/opensuspect/opensuspect int… 

    …o container-tasks
    @zapzoop0099
    zapzoop0099 committed Mar 28, 2021
    Configuration menu
    Copy the full SHA
    6175723 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. Working Container

    @zapzoop0099
    zapzoop0099 committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    e58b129 View commit details
    Browse the repository at this point in the history