pull #2
Merged
pull #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For us lazy people.
* Modified DialogListItem to allow for additional information Added fileName parameter to DialogListItem and changed OnPointerClick to use fileName instead of text, allowing for UI text to show additional information. * Fixed the filelist issues Changed spacing from VerticalLayoutGroup to AutomaticVerticalSize, and added padding to the file lists. * Added light-grey alternate color Added light grey alternate color to list boxes. Made static b/c I think all dialog boxes should have the same alternate colors. Needed to change foreach to for loop to have alternation counter. * Alternation needs prefab change to function Alternation needs prefab change to function * Revert "Alternation needs prefab change to function" This reverts commit f1580e7. * Revert "Revert "Alternation needs prefab change to function"" This reverts commit fb5b03f. * Changed the Save/Load dialog file list position to look nicer Added a bit of padding to the Save/Load dialogs so it's not right against the edge of the box * Fixed another padding issue I noticed on the texts Each save item was extending past the background containing panel. * Added size and italics modifier Added size and italics modifier to load/save dialog to reduce the size of the date
* UI and O2 generator now cares about preasure and not amount of gas * Comments added * Correct handeling of gas when splitting rooms * Gas splits correctly between rooms * Bugfix. room loading * fd * Xml merge
* Added Localization Tools Added localization tools and added translation files for English. * Added German Translation & Language Selection * Fixed an alignement issue and a typo * Revert "Fixed an alignement issue and a typo" This reverts commit 339f232. * Fixed something that GitHub broke Due to me reverting a change before it seems that the code got broke. I changed that, it should work now. Closes #61
* Fixed a star being called to search inventories while ignoring stackpiles. This lead to a search trough every tile. * added null check * Finally fixed, after few hours of git fighting
* Implemented time scale * Added Debug messages, fixed one typo in Character related to deltaTime * Typo... Please squash when merging * Implemented time switching with +/- keys. * Fixed +/-/numeric keys desync, added keypad support * fixing merge... I'm not git pro yet ;) * Another fix... * Another fix... v2
* Created Power Generator Building * Created Power System Class * Commit furniture xml again * Power Generator now adds power to the system * Added Power Consumers to the system
…t initialized. (#83)
* Ignore ProjectSettings and ProjectVersion These files get modified by differing Unity versions. * Music folder placeholders
…de (#122) * Added ability to dismiss build mode with right click * Bug fix - If cancelling build mode while dragging, isDragging wasn't turning false * Format cleanup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.