forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge pull request CleverRaven#40098 from BevapDin/uoy #161
Merged
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
…ngs loading, trajectory buffer and cursor position initialization
change player's last target only when necessary
In non-spell version of target_ui, cursor was drawn using a custom implementation of draw_cursor. On CURSES it looked great, yes, but didn't work at all for TILES build.
This should fix parts of the UI jumping up and down when moving aim point or overwriting aim bars (when aiming using wielded guns) for 'compact' layout
It had to wait until event loop has been refactored
made 'fire' not work if there are no turrets in range
Fixes bug when view snaps back to the player if they have temporarily toggled snap-to-target on, moved aim point away, started aiming and ran out of moves
pc.recoil is tied to pc.last_target, so repeatedly firing from monster list by setting pc.last_target will bypass the penalty for swinging the gun around, allowing 180 no-scope
DPS test cleanup
…er-2020-05-02 Declutter overmap terrain definitions (2020-05-02)
…er-2020-05-03 Declutter overmap terrain definitions (2020-05-03)
Fix caramel ointment crafting
* Migrate ACT_OPEN_GATE to the new activity actor system Per issue #40013 the goal is to migrate all activities from activity_handlers.cpp to the new activity actor system references #40013 * Removed uneccessary includes from activity_actor.cpp and activity_handlers.cpp * Update src/activity_actor.cpp Remove unnecessary setting of `act.placement` Co-authored-by: Isaac Freund <[email protected]> * Update parameters to open_gate_activity_actor constructor * Remove unnecessary function declaration from activity_handlers.h Co-authored-by: Isaac Freund <[email protected]>
cleanup mall part 1
[magiclysm] buff glowing rocks
Blazemod Mini-PR: Transfer tank treads and their dependents from blazemod to tankmod
Allow one achievement to be hidden by another. It will not appear in the list until that other has been completed. Add several new survival achievements, each of which hides the next, for progressively longer periods.
Another example of hiding.
Corrected wrong use of "it's"
The code calls `visitable::visit_items` and adds all items to be removed as reported by the lambda to the vector and later calls `visitable::remove_item` for all those listed items. But `visit_items` will visit `this` as well. So the vector ends up containing `this`, which is subsequently given to `remove_item`, which complains (correctly) that `this` is not contains in `this`.
…er-2020-05-04 Declutter overmap terrain definitions (2020-05-04)
Support for achievements hidden by other achievements
Minor uilist code clean-up
Refactor aiming UI and its target selection / aim preservation
fix jp8 fuel for humvee-tow
Fix #39914 (Random error)
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.
Summary
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context