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

Sept. 1 2023 #145

Merged
merged 43 commits into from
Sep 2, 2023
Merged

Sept. 1 2023 #145

merged 43 commits into from
Sep 2, 2023

Conversation

xanderrootslayer
Copy link
Owner

Summary

Category "Brief description"

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

PatrikLundell and others added 30 commits August 26, 2023 20:48
* Initial commit

* Add ravenfolk

* Fixes

* Add a couple snippets, add more ravenfolk mutations

* Spelling

* Finish weeks-old newspaper article

* Update data/mods/Magiclysm/snippets/newspapers.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Spelling

* Fix Reverie fatigue rate

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Weekly Changelog 2023-08-21 to 2023-08-28

* Apply suggestions from code review

Co-authored-by: Maleclypse <[email protected]>

* Update data/changelog.txt

Co-authored-by: David Seguin <[email protected]>

---------

Co-authored-by: David Seguin <[email protected]>
Co-authored-by: Maleclypse <[email protected]>
[Magiclysm] Fix Ravenfolk mutation category name
* Initial commit

* Add "AIR_SPIRIT" species

* Dictionary updates

* Fixes

* Change druid and feral radiation mage spells

* Various fixes

* Lab location tweaks

* Fix feral radiation mage summoning

* Give Dimensionalist spells, add Knowing the Day and the Hour to some wilderness professions
Remove bed requirement for base expansion
[Magiclysm] Add RNG to crystallized mana spawns
Condition: count spells by spell class
* More addiction snippets

* Apply suggestions from code review

Co-authored-by: I-am-Erk <[email protected]>

---------

Co-authored-by: I-am-Erk <[email protected]>
* Adds `static` variable for `input_context default_mode_input_context`.
* Reason for making this a static variable is
	* `get_default_mode_input_context` is called for each `do_turn`
	* we should not need to recreate the vector of actions for each turn
* With this change, a testmap reduced its in-game hour debug timer from ~3628ms to ~3374ms.
* Move mods selector to it's own window

Remove the mods selector from the main page into it's own window

* Make the spell window and the item group window into a page

Instead of showing the itemgroup window and the spell window as separate
windows, they become a page inside the main window

* Add menubar to main window and clean up code

The navigation menu allows you to switch between pages. We don't need
the removed code anymore

* Add json output to the same window as spell editor

- Added the json output to the same window as the spell editor. This
allows the spell editor to be included in a tabbed view in the main
application
- Changed the spell editor to be a QWidged instead of a Qframe since a
QFrame is more then we need here.

* modselector- Removed layout code and changed to QWidget

- Changed the mod selector window to a QWidget since a Qframe is more
then we need
- Removed some layout code that's no longer needed
- This change will cause a segfault when the mod selection is tested so
an additional fix is needed.

* item_group_window- Change to QWidged and add json output

- Changed the item group window from a QFrame to a QWidget
- Added the json output to the window (which is now in a tab)

* mainwindow- changed to tabbed view

- Changed the main window to become a tabbed view that includes all of
the other pages.
- The menubar is not needed right now so it's removed
- The stackedwidget is not fit for this use case and was replaced with
the tabbed widget

* Mod selector- Move settings and mods_box to h file

The application lost track of settings and crashed bause of it. This
will fix it.

* move mod_selection window to h file in creator_main_window

This fixes a crash that would occur when the application is closed. It
crashed probably because it lost track of mod_selection_window

* Move item_group_json to the third column and set size
Changed one symbol to fix misplaced carpet in steel mill
@github-actions
Copy link

github-actions bot commented Sep 2, 2023

It appears you modified a .po or .pot file. These translation files are automatically generated, pushed to, and pulled from Transifex, and should not be modified otherwise. If these changes are intended, please add Translation file changes are intended to the PR body.

@github-actions
Copy link

github-actions bot commented Sep 2, 2023

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • If I can just find some oxies, everything will be fine.
  • In your dream you brutally disanimate several zombies and then tear through their clothing looking for any unsmoked cigarettes
  • Some fine steel mesh attached to a length of thicker steel wire, forming a rigid frame. Useful for sieving.
  • The best thing about the apocalypse is that you've become your own prescriber.
  • The scroll said that this spell is for "Curing the aftereffects of XE037 overexposure", whatever that means. According the scroll, the spell should be allowed to run its course before reapplication
  • You are one of the Kor'uru, called "ravenfolk" by those who can't make the appropriate clacking sound due to their lack of beak. While your people could not fly without the aid of magic, you were always drawn to explore the world, and had traveled to nearly every country and continent even before modern society made such travel easy. You were well-integrated into society at all levels…and that made you just as vulnerable as everyone else when it fell.
  • enspelled lab coat
  • sieving
  • ♪Got a bag of pills I've been dealin'♪

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@xanderrootslayer xanderrootslayer merged commit 37a913b into xanderrootslayer:master Sep 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment