Sync #511
Merged
Sync #511
Conversation
This file contains hidden or 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
Contributor
GoogleFrog
commented
Apr 10, 2020
GoogleFrog
commented
- Deleted duplicate campaign files.
- Battle proposal system.
- Chili update, improved noFont primarily.
… mission)" This reverts commit ba0741b.
…ario"" This reverts commit 37d147e.
Added Automata, Zombies and several Chicken codex texts
…et29, planet31, planet34, planet35, planet41, planet46, planet47, planet49, planet50, planet53, planet56, planet58, planet59 All but the final entry are added to the Rebel storyline Added mottos to the factions who have one
Part of the Rebel storyline Also replaced Dynasties per Dynasty, as it is in Planetwar
Reveal of what the player character is, and what was behind the rebellion Tweaked Dynasty and Dynasty Restored
* Rewrote the Jump while flying tip, and made it more prominent. * Made the anti-Jugglenaut attack occur later on Easy, and made it smaller. * Removed an enemy Fusion on Easy. Hibiliha (Funnelweb + Ulti): * Removed some enemy Fusions on Easy. * Removed the Caretaker that assists the enemy Strider Hub on Easy.
… coherence, added many empty codex entries for places that could benefit The entries aren't added on the planet files yet, to avoid unlocking empty entries
Anarchai name may be changed Replaced Occurences with Anomalies as category Added numbers before category names to force order instead of alphabetical one
Battle list merge
…wn on Merlin spam).
coat the paint
* They seemed to improve my ping by around 300-400ms. * The canaries can test them live.
Some codex editing.
Warmind evokes The Quantum Thief too much, and gestalt goes somewhat better with scattership
Warmind evokes The Quantum Thief too much, and gestalt goes somewhat better with scattership (done again following merge fail)
Factions now each have one icon, with Empire, Haven and both Dynasties coming from Planetwars (duplicated from the factions folder at the moment) All Threats, some Entries, Locations and Occurences have their own as well, some duplicated from the unitpic folder. Probably not final versions, and too many entries are still missing an icon at the moment.
Now all the Entries have their own icons as well
Contributor
Author
|
@gajop I have resynced. Run an automated whitespace fixer or find someone to fix whitespace. |
Now each entry has its own icon, except for the three interception networks that share the same one Several icons are still copied from unitpics though.
…on the name Anarchai.
Added icons to all codex entries
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.