F(copy)esd20241201 working #156
Open
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
…matic stability while under player control (#19)
… Ship.cpp differences from refactor of Ship::Move (#28) Thanks to UnorderedSigh for taking the time to resolve the conflicts and work it out. Co-authored-by: TomGoodIdea <108272452+TomGoodIdea@users.noreply.github.com> Co-authored-by: Daniel <101683475+Koranir@users.noreply.github.com> Co-authored-by: MasterOfGrey <60949828+MasterOfGrey@users.noreply.github.com> Co-authored-by: tibetiroka <68112292+tibetiroka@users.noreply.github.com> Co-authored-by: Ruslan Gadeev <rgadeew@yandex.ru> Co-authored-by: bene-dictator <115441627+bene-dictator@users.noreply.github.com> Co-authored-by: warp-core <warp-core@users.noreply.github.com> Co-authored-by: Saugia <93169396+Saugia@users.noreply.github.com> Co-authored-by: Hurleveur <94366726+Hurleveur@users.noreply.github.com> Co-authored-by: Dillon Barker <dor.barker@gmail.com> Co-authored-by: Quantumshark <thedup.adg@gmail.com> Co-authored-by: Amazinite <jsteck2000@gmail.com> Co-authored-by: LazerLit <105928379+LazerLit@users.noreply.github.com> Co-authored-by: lumbar527 <125756761+lumbar527@users.noreply.github.com> Co-authored-by: waterhouse <johnthescavenger@gmail.com> Co-authored-by: Nat Tabris <nat@tabris.us> Co-authored-by: Nick <quyykk@protonmail.com> Co-authored-by: M*C*O <mcofficer@gmx.de> Co-authored-by: nothing-but-the-rain <115675268+nothing-but-the-rain@users.noreply.github.com> Co-authored-by: Nahlyn Shereena <111293479+Smedley-SC@users.noreply.github.com> Co-authored-by: tibetiroka <tibetiroka@gmail.com> Co-authored-by: williaji <70952724+williaji@users.noreply.github.com> Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com> Co-authored-by: Rising Leaf <85687254+RisingLeaf@users.noreply.github.com> Co-authored-by: AvianGeneticist <64111606+AvianGeneticist@users.noreply.github.com> Co-authored-by: AlekSeaLion <137400737+AlekSeaLion@users.noreply.github.com> Co-authored-by: Nick <85879619+quyykk@users.noreply.github.com> Co-authored-by: flowers9 <flowers9@users.noreply.github.com>
Updating experimental branch to match mainstream master, this time as a "commit merge" to retain the proper commit history and hopefully allow github to resynchronize changes properly.
This should bring Experimental fully up to date. The single conflict was in the ordering of items in the preference panel. This should be checked after merging and potentially adjusting the layout.
Co-authored-by: Daniel <101683475+Koranir@users.noreply.github.com> Co-authored-by: mOctave <73318970+mOctave@users.noreply.github.com> Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com>
Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com>
Co-authored-by: Lia <31712538+ravenshining@users.noreply.github.com>
Co-authored-by: Loymdayddaud <145969603+TheGiraffe3@users.noreply.github.com> Co-authored-by: Lia <31712538+ravenshining@users.noreply.github.com> Co-authored-by: Rising Leaf <mail@thvk.net>
Random inspirational and entertainingly unique ship.
Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com> This adds a small ship that is only found in Hai space. Unlike most person ships, this is not representative of a specific person, but rather serves to both expand the variety of ships in Hai space, and add a little more interest to the area. This is the first of hopefully many new person ships that may or may not represent real people, with the dual intent of adding more variety to the game, as well as demonstrating more unique builds. (Only people creating person ships for themselves, and for completely fictional people will be accepted. No creating ships for other people unless said person independently confirms they agree to it. These persons ships should have at least a dozen lines of unique dialog suitable for the faction or area they are in, and should be vanilla ships where the only change is in how they are outfitted. Outfits are restricted to those available to the faction and area they are located in, with in general no spoiler or unique outfits.)
Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com> Continuing to add new persons to add some unique configurations and dialog to the galaxy.
…ers to reduce confusion (#141)
Conflicts were in Human ships that had their mass and drag changed (largely reduced). These have all been dropped in favor of values already in Delta; but should be the subject of discussion at some point. Just a general note that feedback on the entire ship ecosystem is always appreciated. None of the values are "locked in stone", they're just our current best-estimate as to what we think will provide a varied and fun system. The only real restriction is that we don't want to do big rebalances and shift in values based on first-impressions and short-duration flights.
…better suited to looting (#147) This is not the end of the road, but rather the start of a new one. One that has many more unoptimized variants and opportunities to dance and not just be splattered by unfairly optimized or designed builds.
Will probably need to go through other code to see if I used interfaceInfo anywhere.
…xtraneous commmits (#153)
It builds in VS, at least... Game runs, and can access player info, ship info, and hardpoint info. Can drag to re-arrange weapons. I do note that no tooltips are visible. Need to switch to a non-update version to test if tooltips should be visible, but I think they are, aren't they?
The tooltip thing may have been found because of this update, but isn't because of it.
Zitchas
added a commit
that referenced
this pull request
Dec 2, 2024
…again. (#156) Co-authored-by: Loymdayddaud <145969603+TheGiraffe3@users.noreply.github.com>
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.
Updating the branch with the conflicts resolved.