Page MenuHomeWildfire Games
Differential D3434

Fix issues in rP24722
ClosedPublic
Actions

Authored by wraitii on Jan 20 2021, 2:32 PM.

Details

Reviewers
Nescio
Commits
rP24749: Fix string issues in rP24722
Summary

per Nescio

Test Plan

per Nescio :p

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

wraitii created this revision.Jan 20 2021, 2:32 PM
Owners added a subscriber: Restricted Owners Package.Jan 20 2021, 2:32 PM
wraitii updated this revision to Diff 15568.Jan 20 2021, 2:35 PM

Forgot to modify arsenal

Vulcan added a comment.Jan 20 2021, 2:41 PM

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2988/display/redirect for more details.

Vulcan added a comment.Jan 20 2021, 2:46 PM

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2989/display/redirect for more details.

Harbormaster completed remote builds in B15283: Diff 15567.Jan 20 2021, 2:49 PM
Harbormaster completed remote builds in B15284: Diff 15568.Jan 20 2021, 2:55 PM
wraitii requested review of this revision.Jan 20 2021, 2:55 PM
Nescio added a subscriber: Nescio.Jan 20 2021, 2:58 PM
Nescio added inline comments.
binaries/data/mods/public/simulation/data/technologies/siege_cost_time.json
11 ↗(On Diff #15568)

Siege Engines

wraitii mentioned this in rP24722: [gameplay] Update siege techs..Jan 20 2021, 10:25 PM
wraitii updated this revision to Diff 15585.EditedJan 20 2021, 10:27 PM

Siege EnginesSiege EnginesSiege EnginesSiege EnginesSiege EnginesSiege EnginesSiege EnginesSiege EnginesSiege EnginesSiege Engines

Edit: lol this was an accident sorry :p

borg- accepted this revision.Jan 20 2021, 10:30 PM
borg- added a subscriber: borg-.

Haha, np.
Thanks for making the changes, I was at work and couldn't do.

This revision is now accepted and ready to land.Jan 20 2021, 10:30 PM
Vulcan added a comment.Jan 20 2021, 10:32 PM

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2997/display/redirect for more details.

Harbormaster completed remote builds in B15303: Diff 15585.Jan 20 2021, 10:42 PM
Freagarach removed a reviewer: borg-.Jan 21 2021, 6:37 AM
Freagarach added a subscriber: Freagarach.
Freagarach added inline comments.
binaries/data/mods/public/simulation/data/technologies/siege_health.json
3 ↗(On Diff #15585)

Sounds like melee resistance is not changed ;)

This revision now requires review to proceed.Jan 21 2021, 6:37 AM
Nescio accepted this revision.Jan 21 2021, 11:50 AM
This revision is now accepted and ready to land.Jan 21 2021, 11:50 AM
Closed by commit rP24749: Fix string issues in rP24722 (authored by wraitii). · Explain WhyJan 21 2021, 1:17 PM
This revision was automatically updated to reflect the committed changes.
wraitii added a commit: rP24749: Fix string issues in rP24722.

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
simulation/
data/
technologies/
17 lines
17 lines
4 lines
4 lines
templates/
2 lines

Diff 15600

View Options

ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_build_time.json

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_cost_time.json

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_health.json

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/data/technologies/siege_pack_unpack.json

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml

Loading...
Wildfire Games · Phabricator