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.

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

Баня экспериментатора #3

Conversation

Tetronamecronicus
Copy link
Collaborator

О чем PR

Почему

Технические детали

Медиа

  • Я добавил скриншот/видео, показывающее изменения в игре или PR не нуждается в показе
  • Я проверил изменения на предмет багов

GeneralGaws and others added 5 commits May 2, 2024 14:30
меняет редактируемый шаблон в ПРах

Signed-off-by: GeneralGaws <[email protected]>
Signed-off-by: GeneralGaws <[email protected]>
@GeneralGaws
Copy link
Collaborator

ахуеть 5 косарей
щяс исправим

GeneralGaws pushed a commit that referenced this pull request Dec 20, 2024
* TESTING enable events for dev enviroment

* Add NextEventComponent

* Check for schedulers NextEventComponent

* Seperate gernateing event to its own method

* Add NextEventSystem and use in BasicStationEventSchedulerSystem

* TESTING: Override time and player restrictions

* Stash events in NextEventComponent (#1)

* Add NextEventComponent

* Check for schedulers NextEventComponent

* Seperate gernateing event to its own method

* Add NextEventSystem and use in BasicStationEventSchedulerSystem

* Format code

* Add nextEvent time perdiction

* Use RunTime instead of float minutes

* Bug fixes

* Add NextEvent to Ramping and Meteors

* Fix timing on BasticStationEvents

* initialize NextEventComponent when created

* Event scheduler caching (#2)

* Check for schedulers NextEventComponent

* Seperate gernateing event to its own method

* Add NextEventSystem and use in BasicStationEventSchedulerSystem

* Format code

* Add nextEvent time perdiction

* Use RunTime instead of float minutes

* Bug fixes

* Add NextEvent to Ramping and Meteors

* Fix timing on BasticStationEvents

* initialize NextEventComponent when created

---------

Signed-off-by: SolStar <[email protected]>

* Revert "Event scheduler caching (#2)"

This reverts commit bf9cd26.

* Revert "Merge branch 'seer' into stash-next-event"

This reverts commit 656ca26, reversing
changes made to 36f45be.

* Revert "Caching next exent"

This reverts commit 9f1bee4, reversing
changes made to 82678d9.

* Reapply "Event scheduler caching (#2)"

This reverts commit 82678d9.

* More merge conflict nonsence

* oops

* oops 2

* Oops 3

* Precognition Psionic ability (#3)

* Precognition ability added

* Precog get next event

* Get soonest event and display

* update prototypes with precog results

* Add random

* Use Timespan for UseDelay

* Damage breaks doafter

* typo

* fix localization

* fix do after

* Add effects durring do after

* Revert "TESTING enable events for dev enviroment"

This reverts commit 0345313.

* Revert testing changes

* add deltav comments

* Cleaning up!

* Move NextEvent to server space

* Fix NextEventId init value

* Reverted upstream file to block scoped namespace

* Add precognitnon result messages

* reverting testing changes for real

* Add admin alert for upcoming events

* Add sound effect

* make alert more subtule

* extended max window size

* fix message mixup

* yaml fixes

* more yaml fixes

* Delta Changes

* totaly a yaml error trust

* remove unsessesary weights

---------

Signed-off-by: SolStar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants