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

Replace time as int with time_duration #59079

Merged
merged 12 commits into from
Jul 16, 2022
Merged

Replace time as int with time_duration #59079

merged 12 commits into from
Jul 16, 2022

Conversation

Fris0uman
Copy link
Contributor

@Fris0uman Fris0uman commented Jul 8, 2022 •
edited
Loading

Summary

None

Purpose of change

Part of #36110
take care of time

Describe the solution

Describe alternatives you've considered

Testing

Additional context

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Bionics CBM (Compact Bionic Modules) Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 8, 2022
@github-actions github-actions bot added Code: Tests Measurement, self-control, statistics, balancing. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Mods: Aftershock Anything to do with the Aftershock mod Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Magiclysm Anything to do with the Magiclysm mod and removed astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 9, 2022
@github-actions github-actions bot added Character / World Generation Issues and enhancements concerning stages of creating a character or a world astyled astyled PR, label is assigned by github actions labels Jul 10, 2022
Night-Pryanik
Night-Pryanik reviewed Jul 10, 2022
View reviewed changes
src/character.cpp Outdated Show resolved Hide resolved
Fris0uman and others added 3 commits July 10, 2022 15:14
@Fris0uman @Night-Pryanik
Update src/character.cpp
638165d 
Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Fix test
6be08c3
Merge branch 'time_for_time' of https://github.com/Fris0uman/Cataclys…
2e000f7 
…m-DDA into time_for_time
@Fris0uman Fris0uman marked this pull request as ready for review July 11, 2022 18:30
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 12, 2022
@ZhilkinSerg ZhilkinSerg merged commit 9c66556 into CleverRaven:master Jul 16, 2022
@Fris0uman Fris0uman deleted the time_for_time branch July 16, 2022 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Night-Pryanik Night-Pryanik Night-Pryanik left review comments

@Light-Wave Light-Wave Light-Wave approved these changes

@KorGgenT KorGgenT Awaiting requested review from KorGgenT

@Maleclypse Maleclypse Awaiting requested review from Maleclypse

@John-Candlebury John-Candlebury Awaiting requested review from John-Candlebury

@Mom-Bun Mom-Bun Awaiting requested review from Mom-Bun

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Bionics CBM (Compact Bionic Modules) [C++] Changes (can be) made in C++. Previously named `Code` Character / World Generation Issues and enhancements concerning stages of creating a character or a world Code: Tests Measurement, self-control, statistics, balancing. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Magiclysm Anything to do with the Magiclysm mod
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Fris0uman @Night-Pryanik @Light-Wave @ZhilkinSerg