main #48

Closed

sebastian wants to merge 44 commits from main into inventory

pull from: main

merge into: sebastian:inventory

sebastian:character-interactions

Conversation 0 Commits 44 Files Changed 75 +1853 -454

sebastian commented 2024-05-11 08:40:35 +02:00

Owner

Copy Link

No description provided.

sebastian added 44 commits 2024-05-11 08:40:35 +02:00

Implement Itemsystem bf4c6bd19c

Automatically add Owning group of item to inherited group-list a57024c6af

Opening Item-Overview dd73d0d60b

Basic Visualization of Itemgroups and their Items 5a3c0e9d75

Prettier Visualization of Itemgroups db0455cd07

Remove default angular test text e1e9647b13

Adapt Context-Menu to add Itemgroups and Items c66049c4d8

Open Itemgroup Editor 7132030a81

Display ItemgroupCharacteristics and Delete them 1266e4b53d

Edit ItemgroupCharacteristic cf95fe234e

Add new ItemgroupCharacteristics ae640a7a31

Open ItemEditor 30e220e0dc

Let Items Inherit new Itemgroups 7ee8db2a37

Delete Inherited Itemgroups and Introduce ItemgroupCharacteristicValue 6eff107282

Items should inherit characteristics from older ancestors too 0b1a3806f8

Disable Deleting from automatically inherited Itemgroups 6b93bf1dc5

Add ItemCharacteristicValue Editor and initialize ItemcharacteristicValues 6e65cc3a6a

ItemCharacteristicValueEditor 3a1a9ba6ee

Visualize Characteristics and their Values eae55eb49c

Edit CharacteristicValues 2b83650348

Initialize Itemgroup Characteristic Values db0bd14ea8

Rerender table automatically on Change 34c139eecf

Automatically initialize CharacteristicValues for manually Inherited groups aa6c051246

Remove logging statements 133dc1d372

Persist Itemgroups fed0ca99bf

Persist Items 1b2fd273bf

Persist Items independly from Itemgroups ddcbfc5bb3

Load Itemgroups 73edf03fa0

Parse Itemgroups 2e29d4cde7

Parse Itemgroups cb2094aa49

Merge remote-tracking branch 'origin/inventory-items-2' into inventory-items-2 8345b541d4

Parse Items f01d8c4dab

Merge branch 'refs/heads/inventory-items-2' ... 72fc9dbc05

# Conflicts:
#	app/main.ts
#	app/storage/ModelComponentFileDirectory.js
#	app/storage/ModelComponentFileDirectory.ts
#	app/storage/StoredGameModel.js
#	app/storage/StoredGameModel.ts
#	app/storage/loader/GameModelLoader.js
#	app/storage/loader/GameModelLoader.ts
#	app/storage/loader/ItemLoader.js
#	app/storage/loader/ItemLoader.ts
#	src/app/app.component.html
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/editor/editor.component.html
#	src/app/editor/editor.component.ts
#	src/app/project/game-model/GameModel.ts
#	src/app/project/game-model/ModelComponentType.ts
#	src/app/project/game-model/ModelComponentTypeUtillities.ts
#	src/app/project/game-model/inventory/Item.ts
#	src/app/project/serializer/ItemSerializer.ts

Remove items of old data format from persistence 1f1cf3f976

Create New Itemgroups c413c45741

Create New Items 70904dae5c

Remove logging statements 95a174cd4f

Refactor Creating New ScriptAccounts 92608125fb

Refactor Creating New Characters 7a650524f3

Remove unnessecary ScriptAccountTest.spec.ts ae434f9005

Refactor Gamesystem Creation ccb53df815

Refactor Gamesystem Creation and fix Hierarchy Construction 7ea5b3dd78

Remove GamesystemCreationTest cbe5fe0ef0

Merge pull request 'refactor-component-creation' (#47) from refactor-component-creation into main ... 6912b4cc28

Reviewed-on: #47

sebastian closed this pull request 2024-05-11 08:40:44 +02:00

All checks were successful

Hide all checks

E2E Testing / test (push) Successful in 1m38s

Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

Future

Small feature not that relevant, but nice to have

  

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No Label

Future

bug

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: sebastian/ConceptCreator#48

No description provided.