[Minor] Optimize codestyle #1740
Open
+1,172
−1,057
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
# Conflicts: # YRpp
+misc codestyle fixes
oops
- Fix a regression in AE cloak code - Fix DecloakToFire=no not preventing decloaking when having a target in range - Move cloak-related code to its own file
…or occurs instead of first token
…small-fix-3 # Conflicts: # src/Ext/Techno/Hooks.cpp
…com/Coronia/Phobos into origin/ae-attach-discard-by-health-3 # Conflicts: # docs/Whats-New.md # src/Ext/WeaponType/Body.h
# Conflicts: # src/Ext/Aircraft/Hooks.cpp # src/Ext/Techno/Body.Update.cpp # src/Ext/Techno/Body.cpp # src/Ext/Techno/Body.h # src/Ext/Techno/Hooks.Misc.cpp # src/Ext/TechnoType/Body.h
# Conflicts: # src/Ext/Bullet/Hooks.DetonateLogics.cpp # src/Ext/Techno/Hooks.ReceiveDamage.cpp # src/New/Entity/ShieldClass.cpp
# Conflicts: # src/Ext/Bullet/Hooks.DetonateLogics.cpp # src/Ext/Rules/Body.cpp # src/Ext/Rules/Body.h # src/Ext/TAction/Body.cpp # src/Ext/Techno/Body.Internal.cpp # src/Ext/Techno/Body.Update.cpp # src/Ext/Techno/Body.cpp # src/Misc/Hooks.BugFixes.cpp # src/New/Entity/AttachEffectClass.cpp # src/New/Entity/ShieldClass.cpp
# Conflicts: # src/Commands/NextIdleHarvester.cpp # src/Ext/Anim/Hooks.cpp # src/Ext/Building/Hooks.Grinding.cpp # src/Ext/CaptureManager/Body.cpp # src/Ext/Script/Mission.Move.cpp # src/Ext/Techno/Hooks.Pips.cpp # src/Ext/Techno/Hooks.Transport.cpp # src/Ext/Techno/Hooks.cpp # src/Misc/Hooks.BugFixes.cpp # src/New/Entity/ShieldClass.cpp
# Conflicts: # src/Ext/EBolt/Hooks.cpp # src/Ext/House/Hooks.cpp # src/New/Entity/AttachEffectClass.cpp
# Conflicts: # src/Ext/Bullet/Hooks.DetonateLogics.cpp
|
Nightly build for this pull request:
This comment is automatic and is meant to allow guests to get latest nightly builds for this pull request without registering. It is updated on every successful build. |
Starkku
force-pushed
the
develop
branch
2 times, most recently
from
b429215 to
280b1c8
Compare
# Conflicts: # src/Ext/Building/Hooks.Grinding.cpp # src/Ext/Script/Body.cpp # src/Ext/Techno/Hooks.ReceiveDamage.cpp # src/Misc/Hooks.BugFixes.cpp # src/New/Entity/AttachEffectClass.cpp
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.
Split from #1535. Despite editing many files, it only contains 2 change mostly: