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

feature(subsystem-prepare): extract Network and R&R code from EventSystemImpl #4565

Merged
merged 14 commits into from
Mar 9, 2021
Merged

feature(subsystem-prepare): extract Network and R&R code from EventSystemImpl #4565

merged 14 commits into from
Mar 9, 2021

Conversation

pollend
Copy link
Member

@pollend pollend commented Mar 7, 2021

Contains

Preparement to extraction EntitySystem: extract Network's replication and Recording of R&R from EventSystem.
Used Decorators for compose this together.

How to test

EventSystem loads:

  1. Start TS
  2. Create/Load Game
  3. Check that loads and works (movement, windows opens, blocks breaks)

Network:

  1. Start TS
  2. Start server
  3. Join to Server
  4. Check that loads and works (your events should replicated to server)

R&R:

  1. Start TS
  2. Create/Load game
  3. record
  4. replay
  5. check that works.

Ref PR: #4323

DarkWeird and others added 10 commits December 15, 2020 13:09
@DarkWeird
feature(subsystem-prepare): extract Network and R&R code from EventSy…
870f090 
…stemImpl
@DarkWeird
Merge branch 'develop' into feature/event-system-decomposite
1ebeca4
@DarkWeird
Merge branch 'develop' into feature/event-system-decomposite
c77f631
@DarkWeird
Merge branch 'develop' into feature/event-system-decomposite
a473406
@DarkWeird
Merge remote-tracking branch 'origin/develop' into feature/event-syst…
c772fe5 
…em-decomposite
@DarkWeird
chore(system-prepare): implement EventSystem#setToCurrentThread() f…
234331d 
…or `EventSystem`'s decorators
@DarkWeird
Merge remote-tracking branch 'fork/feature/event-system-decomposite' …
1a41c85 
…into feature/event-system-decomposite
@DarkWeird
Merge branch 'develop' into feature/event-system-decomposite
d90ffe9
@DarkWeird
Merge remote-tracking branch 'origin/develop' into feature/event-syst…
31e41b9 
…em-decomposite

# Conflicts:
#	engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java
#	engine-tests/src/test/java/org/terasology/persistence/ComponentSerializerTest.java
@pollend
Merge remote-tracking branch 'origin/develop' into feature/event-syst…
07a6df4 
…em-decomposite-1
keturn
keturn reviewed Mar 7, 2021
View reviewed changes
engine/src/main/java/org/terasology/entitySystem/event/internal/EventSystemImpl.java Outdated
PerformanceMonitor.startActivity(activity);
}

//TODO return this!
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODOs and commented code

@DarkWeird DarkWeird merged commit d37576f into develop Mar 9, 2021
@DarkWeird DarkWeird deleted the feature/event-system-decomposite-1 branch March 9, 2021 07:09
@skaldarnar skaldarnar added the Type: Improvement Request for or addition/enhancement of a feature label Mar 9, 2021
@skaldarnar skaldarnar added this to the v4.3.0 milestone Mar 9, 2021
@jdrueckert jdrueckert mentioned this pull request Mar 13, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@keturn keturn keturn left review comments

@DarkWeird DarkWeird DarkWeird approved these changes

@skaldarnar skaldarnar Awaiting requested review from skaldarnar

Assignees
No one assigned
Labels
Type: Improvement Request for or addition/enhancement of a feature
Projects
None yet
Milestone
v4.3.0
Development

Successfully merging this pull request may close these issues.
4 participants
@pollend @keturn @DarkWeird @skaldarnar