Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4746 commits
Select commit Hold shift + click to select a range
c3da1c3
Start new colonies with some happiness
swaqvalley Apr 16, 2020
7699128
Don't install unneeded for headless build files
o01eg Apr 16, 2020
2744033
fixup! Affect new colonies only
swaqvalley Apr 16, 2020
6b9ff58
[AI] Remove Python2 compatilility (#2860)
Cjkjvfnby Apr 16, 2020
a06f612
Fix timeout description
o01eg Apr 17, 2020
4e7c2b2
Merge pull request #2863 from swaqvalley/fix-2862
geoffthemedio Apr 17, 2020
0e45fcf
Merge pull request #2846 from o01eg/stop-game-on-victory
geoffthemedio Apr 17, 2020
5976f77
Added tracking and FOCS access to the last turn a planet was colonize…
geoffthemedio Apr 17, 2020
2dfaab5
grooming
geoffthemedio Apr 17, 2020
e286b00
Use new LastTurnColonized property
swaqvalley Apr 17, 2020
01f4bbf
Merge pull request #2866 from swaqvalley/fix-2862-part2
geoffthemedio Apr 17, 2020
aef80e8
Do not inherit python classes from object
Morlic-fo Apr 17, 2020
9e266f9
Fix missing relevant techs in ShipDesignAI
Morlic-fo Apr 17, 2020
797dccf
Do not recalculate relevant techs for each planet
Morlic-fo Apr 17, 2020
eb957d3
[AI] Remove old save compatibility (#2865)
Cjkjvfnby Apr 17, 2020
c3ae5a1
Merge pull request #2867 from Morlic-fo/RemoveOldStyleClasses
Morlic-fo Apr 17, 2020
d8431dc
Split out ItemSpec into UnlockableItem.{h,cpp}
adrianbroher Apr 17, 2020
3313b3c
Rename ItemSpec class to UnlockableItem
adrianbroher Apr 17, 2020
78fe145
Merge pull request #2864 from o01eg/no-install-images-sound-headless
geoffthemedio Apr 18, 2020
8e87e0c
Merge pull request #2868 from Morlic-fo/FixAIShipdesignCache
Morlic-fo Apr 18, 2020
ef6b1a7
Merge pull request #2870 from adrianbroher/split-unlockableitem
geoffthemedio Apr 18, 2020
85fd577
Split out PartType into ShipPart.{h,cpp}
adrianbroher Apr 17, 2020
caa6f13
Rename PartType class to ShipPart
adrianbroher Apr 17, 2020
11155eb
Use old serialization tag names to preserve save file compat
adrianbroher Apr 18, 2020
49d3259
Merge pull request #2869 from adrianbroher/split-shippart
geoffthemedio Apr 18, 2020
fe512eb
Replace GG::GUI::operator() with GG::GUI::Run method
adrianbroher Apr 4, 2020
e9cb2e7
Simplify GG::EventPumpBase::LoopBody signature
adrianbroher Apr 5, 2020
4bfc710
Merge GG::{EventPumpBase,EventPump} classes into GG::ModalEventPump
adrianbroher Apr 5, 2020
2f4fd01
Replace GG::EventPump generation with GG::GUI::RunModal method
adrianbroher Apr 5, 2020
4117d8b
Move GG frame simulation logic into GG::GUI::ModalRun
adrianbroher Apr 5, 2020
b8a941b
Make st-tool command line help more verbose
adrianbroher Apr 12, 2020
5c459c6
Fix wrong st-tool compare summary wording
adrianbroher Apr 12, 2020
7f7ecec
Fix st-tool check bug on handling empty translations
adrianbroher Apr 12, 2020
a47fc59
Add wrapper function to check location conditions for hulls/parts
Morlic-fo Apr 18, 2020
44fe6d3
Simplify caching of buildable parts/hulls per planet
Morlic-fo Apr 18, 2020
6447d3c
Fix typo in st-tool format description
adrianbroher Apr 19, 2020
a7fa1ad
Merge pull request #2858 from adrianbroher/client-game-loop
geoffthemedio Apr 19, 2020
4da892b
Merge pull request #2873 from adrianbroher/fix-sttool
geoffthemedio Apr 19, 2020
458a95e
Simplify caching using existing decorator
Morlic-fo Apr 18, 2020
72b5967
grooming, nullptr replacement
geoffthemedio Apr 18, 2020
89600d1
grooming, nullptr replacement
geoffthemedio Apr 18, 2020
0277124
grooming, nullptr addition and removal
geoffthemedio Apr 18, 2020
b9aa14d
grooming, nullptr addition and removal
geoffthemedio Apr 18, 2020
81da30b
silence double -> float truncation warning
geoffthemedio Apr 19, 2020
d981d1d
-Removed unused single-parameter Meter constructor.
geoffthemedio Apr 4, 2020
664956b
grooming
geoffthemedio Apr 8, 2020
4277f10
Split out {Monster,}FleetPlan into FleetPlan.{h,cpp}
adrianbroher Apr 17, 2020
e8fe17a
Move UniverseGenerator.{h,cpp} into server directory
adrianbroher Feb 8, 2020
48d1a39
Made Universe::GetEffectsAndTargets const.
geoffthemedio Apr 19, 2020
a9ed45a
Split out FieldType into FieldType.{h,cpp}
adrianbroher Apr 17, 2020
6a9d872
Rename FieldTypeManager::{FieldTypeMap,container_type}
adrianbroher Apr 19, 2020
0c150a1
Merge pull request #2871 from Morlic-fo/ImproveAIShipDesign
Morlic-fo Apr 19, 2020
98e9881
Let outposts have minimum construction one, in order to be attacked b…
Apr 19, 2020
b742370
-Separately store const and non-const references to ObjectMap in Scri…
geoffthemedio Apr 19, 2020
e90a109
Merge pull request #2879 from agrrr3/20200418_Outposts_with_infrastru…
geoffthemedio Apr 20, 2020
570d5da
Merge pull request #2877 from adrianbroher/split-fleetplan
geoffthemedio Apr 20, 2020
71d1ff7
Merge pull request #2878 from adrianbroher/split-fieldtype
geoffthemedio Apr 20, 2020
57bea45
Use global logger setup facilities for Python logger wrapper
adrianbroher Apr 20, 2020
1f99278
Make Logger keywords an implementation detail
adrianbroher Apr 20, 2020
b4d935e
Use global logger setup facilities for Python logger wrapper
adrianbroher Apr 20, 2020
b3afee3
Update fr.txt
Ouaz Apr 20, 2020
e3abc2d
Use typename keyword within template statements
adrianbroher Apr 19, 2020
b2112fe
Merge pull request #2875 from adrianbroher/template-typename
geoffthemedio Apr 20, 2020
4ecf1c8
Variable::m_ref_type doesn't need to be mutable.
geoffthemedio Apr 21, 2020
31ba59c
Use initializer list instead of assigning on first call to getter.
geoffthemedio Apr 21, 2020
4840efa
Merge platform specific logging and logger definition macros
adrianbroher Apr 20, 2020
60cba3b
Made Condition variance tracking members non-mutable and set their va…
geoffthemedio Apr 21, 2020
aff1c6f
Merge pull request #2880 from adrianbroher/simplify-logger
geoffthemedio Apr 22, 2020
8d4227a
Split out BuildingType into BuildingType.{h,cpp}
adrianbroher Apr 17, 2020
8c66a5c
Rename BuildingTypeManager::{BuildingTypeMap,container_type}
adrianbroher Apr 19, 2020
8b9de2e
Add readme, build, contributing and changelog docs to Doxygen built
adrianbroher Apr 22, 2020
f6858ac
Remove build instruction for symlink to default directory
adrianbroher Apr 22, 2020
c3658d6
Use underlines for Markdown document titles
adrianbroher Apr 22, 2020
f0d1341
Update and rewrite build instructions, removing the listing style
adrianbroher Apr 22, 2020
083e6ba
Add doc directory to Doxygen input directories
adrianbroher Apr 22, 2020
94109da
Merge and rewrite content tag documentation
adrianbroher Apr 22, 2020
a7defa2
Remove need for template in doc/tag_parser.py
adrianbroher Apr 22, 2020
01cacdc
Merge pull request #2884 from adrianbroher/use-markdown-documentation
geoffthemedio Apr 22, 2020
eaa58b1
Exclude engines from colony base hull
Oberlus Apr 22, 2020
ac337c7
Exclude fuel parts from colony base hull
Oberlus Apr 22, 2020
4673e27
Make AI aware of excluded parts in SH_COLONY_BASE
Morlic-fo Apr 22, 2020
28f96b8
Merge pull request #2876 from adrianbroher/split-buildingtype
geoffthemedio Apr 23, 2020
e1ab6b0
Use different variable name to avoid variable shadowing
adrianbroher Apr 23, 2020
e978c5e
Merge pull request #2888 from adrianbroher/fix-2881
geoffthemedio Apr 23, 2020
62895f3
Split out HullType and auxilliary into ShipHull.{h,cpp}
adrianbroher Apr 17, 2020
ea9c26a
Rename HullType to ShipHull
adrianbroher Apr 19, 2020
68350aa
Rename ShipHullManager::{ShipHullMap,container_type}
adrianbroher Apr 19, 2020
e45c596
Reduce shield parts cost to balance against fighters
Oberlus Apr 24, 2020
9193558
Not so cheap Black Shield, cheaper RIS
Oberlus Apr 24, 2020
aef91ee
Rename Fighter (FT_HANGAR_2) to Strike Fighter
Oberlus Apr 24, 2020
0eee09b
remove mention of py3_migration from python README
l29ah Apr 24, 2020
bbd9d79
Merge pull request #2891 from Oberlus/RenameFighterStrike
geoffthemedio Apr 25, 2020
397f31a
Add codeowners for russian translation
Cjkjvfnby Apr 25, 2020
fe698ac
Merge pull request #2885 from Oberlus/Fix-2882-ExcludeEnginesFromBase…
geoffthemedio Apr 26, 2020
2dbec24
Merge pull request #2886 from Morlic-fo/AIColonyBase
geoffthemedio Apr 26, 2020
4172e6d
better words for exiting the game
l29ah Apr 8, 2020
3b4a431
Merge pull request #2837 from l29ah/surrender
geoffthemedio Apr 26, 2020
9ab7847
Set ship speed for new ships to be affected by Interstellar Logistics
Oberlus Apr 26, 2020
8ef81c0
fix warning about std::move preventing copy elision
geoffthemedio Apr 26, 2020
f6f5648
Move GitHub issue and release template into .github/ISSUE_TEMPLATE
adrianbroher Apr 26, 2020
ae13371
Add YAML frontmatter to templates to populate issue title and metadata
adrianbroher Apr 26, 2020
7173afb
Mark release issue template as team only
adrianbroher Apr 26, 2020
1ddf3f3
Add forum url to issue template chooser
adrianbroher Apr 26, 2020
3099569
Add comment
Cjkjvfnby Apr 26, 2020
f6ee091
Merge pull request #2894 from Cjkjvfnby/add-ru.txt-owners
geoffthemedio Apr 26, 2020
45334b6
Update fr.txt
Ouaz Apr 27, 2020
764ea57
Restrict interceptor launch bay upgrade to tech of own empire
Apr 28, 2020
7a1afa5
Merge pull request #2904 from agrrr3/202004_issue2902_too_many_interc…
geoffthemedio Apr 28, 2020
6540f55
Add comment about readonly dict implementation
Cjkjvfnby Apr 29, 2020
d949c5a
Merge pull request #2911 from Cjkjvfnby/comment-on-read-only-dict
geoffthemedio Apr 29, 2020
14d3813
Merge pull request #2889 from adrianbroher/split-shiphull
geoffthemedio Apr 29, 2020
1fd7aac
Expose empire stat records to python API. Additional Python-side glue…
geoffthemedio Apr 28, 2020
ba07557
Patching nested map __getitem__ methods.
geoffthemedio Apr 30, 2020
641e561
Fix comment
Oberlus Apr 30, 2020
a148a13
Adjust deflector cost to be consistent with other shields
Oberlus Apr 30, 2020
4206ccd
Merge pull request #2896 from Oberlus/FixIterstellarDelayNewShips
geoffthemedio Apr 30, 2020
6908c9e
Merge pull request #2890 from Oberlus/CheaperShields
geoffthemedio Apr 30, 2020
cafcbf2
Don't overwrite ship design with same ID.
o01eg Apr 30, 2020
57fdb83
typos
geoffthemedio Apr 29, 2020
a136f16
Gifting SitReps
geoffthemedio Apr 29, 2020
f8d1c2c
Merge pull request #2913 from o01eg/no-overwrite-ship-design
geoffthemedio Apr 30, 2020
64d4d6a
provide recursive map to dict wrapper to get contents of std::map<T, …
Morlic-fo May 1, 2020
af2982d
Make linter happy
Morlic-fo May 1, 2020
b6fad6f
-Remove unnecessary Source conditions from activation conditions
geoffthemedio May 2, 2020
617c1ef
Extend instructions on the bug issue template
adrianbroher May 3, 2020
b8b3c66
Add issue template for feature requests
adrianbroher May 3, 2020
9ce337f
Use underline as title formatting in bug report issue template
adrianbroher May 3, 2020
edf41dd
Update about statement for feature issue template
adrianbroher May 3, 2020
f93f224
Merge pull request #2903 from freeorion/ExposeStatsToPython
geoffthemedio May 4, 2020
8e3444a
Re-implements multi-threaded evaluation of effect scope conditions us…
geoffthemedio Apr 22, 2020
115fc86
remove RunQueue
geoffthemedio Apr 22, 2020
cdc0785
Add mechanism to skip evaluating scopes for effectsgroups without met…
geoffthemedio Apr 22, 2020
b8407c8
workaround for pre-Boost 1.66 that lacks thread_pool
geoffthemedio Apr 23, 2020
598f3dc
Attempted GCC compatibility fix when initializing lambda captures.
geoffthemedio Apr 23, 2020
baac737
-grooming
geoffthemedio Apr 24, 2020
7d31468
Removed Effect::Execute overload that took a TargetsCauses struct and…
geoffthemedio Apr 24, 2020
9529c50
try-catch around Python finalization / cleanup
geoffthemedio Apr 25, 2020
3051b0c
-Rename "TargetsCauses" to "SourcesEffectsTargetsAndCausesVec" to avo…
geoffthemedio Apr 26, 2020
5bfc6bc
warning about an effectsgroup being executed on a sources-causes-targ…
geoffthemedio Apr 26, 2020
6d04655
-In GetEffectsAndTargets and ExecuteEffect, pass and process std::map…
geoffthemedio Apr 26, 2020
52b949e
Rename parameter targets_causes -> targets_cause
geoffthemedio Apr 26, 2020
2747829
Fixed rebase issues.
geoffthemedio Apr 30, 2020
5269e14
Pre-filter input source objects in DispatchEffectsGroupScopeEvaluatio…
geoffthemedio May 2, 2020
99ea33f
Cache already-evaluated activation condition results within a call to…
geoffthemedio May 3, 2020
0e34759
-cache scope condition results, save a pointer instead of re-dispatch…
geoffthemedio May 3, 2020
84dc973
Optimized RESONANT_MOON_SPECIAL effectsgroup scope condition.
geoffthemedio May 3, 2020
e7242c8
Optimized ACCRETION_DISC_SPECIAL scope condition.
geoffthemedio May 3, 2020
146c4e9
Update fr.txt
Ouaz May 4, 2020
806babb
Replace Condition::Invariance enum with boolean
adrianbroher Apr 30, 2020
a861386
Move Condition::All constructor into implementation file
adrianbroher May 1, 2020
13af6e8
Move Condition::Source constructor into implementation file
adrianbroher May 1, 2020
3c2f4ba
Move Condition::None constructor into implementation file
adrianbroher May 1, 2020
9a8b324
Move Condition::RootCandidate constructor into implementation file
adrianbroher May 1, 2020
5293a0f
Move Condition::Target constructor into implementation file
adrianbroher May 1, 2020
1e08589
Move Condition::Capital constructor into implementation file
adrianbroher May 1, 2020
6db38b5
Move Condition::Monster constructor into implementation file
adrianbroher May 1, 2020
f319d23
Move Condition::Armed constructor into implementation file
adrianbroher May 1, 2020
3eb0354
Move Condition::ContainedBy constructor into implementation file
adrianbroher May 1, 2020
f8e1544
Move Condition::Contains constructor into implementation file
adrianbroher May 1, 2020
9c1bbaf
Move Condition::CanAddStarlaneConnection constructor into implementat…
adrianbroher May 1, 2020
54b330d
Move Condition::Stationary constructor into implementation file
adrianbroher May 1, 2020
58bec9d
Move Condition::Aggressive constructor into implementation file
adrianbroher May 1, 2020
19c440d
Move Condition::CanColonize constructor into implementation file
adrianbroher May 1, 2020
ad4224a
Move Condition::CanProduceShips constructor into implementation file
adrianbroher May 1, 2020
2dca24f
Move Condition::Described constructor into implementation file
adrianbroher May 1, 2020
c5cb9bd
Remove unused Condition::PredefinedShipDesign constructor
adrianbroher May 1, 2020
43480db
Use delegate constructor for Condition::SortedNumberOf
adrianbroher May 1, 2020
d1e04cc
Use delegate constructor for Condition::EmpireAffiliation
adrianbroher May 1, 2020
ca733ba
Use delegate constructor for Condition::Type
adrianbroher May 1, 2020
0cfe264
Use delegate constructor for Condition::HasSpecial
adrianbroher May 1, 2020
dd8c082
Use delegate constructor for Condition::HasTag
adrianbroher May 1, 2020
922f064
Use delegate constructor for Condition::Species
adrianbroher May 1, 2020
97eeeec
Use delegate constructor for Condition::Enqueued
adrianbroher May 1, 2020
151c4ca
Use delegate constructor for Condition::EmpireMeterValue
adrianbroher May 1, 2020
15ffad0
Use delegate constructor for Condition::OwnerHasTech
adrianbroher May 1, 2020
c958d0f
Use delegate constructor for Condition::OwnerHasBuilding
adrianbroher May 1, 2020
db6d67b
Use delegate constructor for Condition::OwnerHasShipDesignAvailable
adrianbroher May 1, 2020
a535b9b
Use delegate constructor for Condition::OwnerHasShipPartAvailable
adrianbroher May 1, 2020
3b42fda
Return Condition::Condition invariance attributes in corresponding ge…
adrianbroher May 2, 2020
62e205c
Assign invariants on construction for Condition::All
adrianbroher May 1, 2020
4dd4902
Assign invariants on construction for Condition::Source
adrianbroher May 1, 2020
e02d357
Assign invariants on construction for Condition::None
adrianbroher May 1, 2020
cdd4cd1
Assign invariants on construction for Condition::RootCandidate
adrianbroher May 1, 2020
5f77b7b
Assign invariants on construction for Condition::Target
adrianbroher May 1, 2020
3b2818d
Assign invariants on construction for Condition::Capital
adrianbroher May 1, 2020
dccc5b3
Assign invariants on construction for Condition::Monster
adrianbroher May 1, 2020
0f4b21f
Assign invariants on construction for Condition::Armed
adrianbroher May 1, 2020
75bbbfc
Assign invariants on construction for Condition::Stationary
adrianbroher May 1, 2020
c7e6994
Assign invariants on construction for Condition::Aggressive
adrianbroher May 1, 2020
9ce33e9
Assign invariants on construction for Condition::CanColonized
adrianbroher May 1, 2020
903b477
Assign invariants on construction for Condition::CanProduceShips
adrianbroher May 1, 2020
7d4e48b
Assign invariants on construction for Condition::EmpireAffiliation
adrianbroher May 1, 2020
7bb1186
Assign invariants on construction for Condition::Type
adrianbroher May 1, 2020
1a64ff9
Assign invariants on construction for Condition::HasTag
adrianbroher May 1, 2020
0d7f233
Assign invariants on construction for Condition::Contains
adrianbroher May 1, 2020
4ce018f
Assign invariants on construction for Condition::ContainedBy
adrianbroher May 1, 2020
ba3328a
Assign invariants on construction for Condition::InSystem
adrianbroher May 1, 2020
7059c01
Assign invariants on construction for Condition::ObjectID
adrianbroher May 1, 2020
0169624
Assign invariants on construction for Condition::DesignHasHull
adrianbroher May 1, 2020
f6f3989
Assign invariants on construction for Condition::PredefinedShipDesign
adrianbroher May 1, 2020
f034f63
Assign invariants on construction for Condition::NumberedShipDesign
adrianbroher May 1, 2020
091d911
Assign invariants on construction for Condition::ProducedByEmpire
adrianbroher May 1, 2020
e312218
Assign invariants on construction for Condition::Chance
adrianbroher May 1, 2020
64c200d
Assign invariants on construction for Condition::VisibleToEmpire
adrianbroher May 1, 2020
920fdf6
Assign invariants on construction for Condition::CanAddStarlaneConnec…
adrianbroher May 1, 2020
14710ac
Assign invariants on construction for Condition::ExploredByEmpire
adrianbroher May 1, 2020
16d235d
Assign invariants on construction for Condition::FleetSupplyableByEmpire
adrianbroher May 1, 2020
0483b72
Assign invariants on construction for Condition::OrderedBombarded
adrianbroher May 1, 2020
cafb3e2
Assign invariants on construction for Condition::CombatTarget
adrianbroher May 1, 2020
8a1a32d
Assign invariants on construction for Condition::Described
adrianbroher May 1, 2020
27da4d1
Assign invariants on construction for Condition::Homeworld
adrianbroher May 1, 2020
53b9cb5
Assign invariants on construction for Condition::Building
adrianbroher May 1, 2020
3da84ad
Assign invariants on construction for Condition::PlanetType
adrianbroher May 1, 2020
ee19db0
Assign invariants on construction for Condition::PlanetSize
adrianbroher May 1, 2020
59de530
Assign invariants on construction for Condition::Species
adrianbroher May 1, 2020
9802820
Assign invariants on construction for Condition::FocusType
adrianbroher May 1, 2020
38e5fad
Assign invariants on construction for Condition::StarType
adrianbroher May 2, 2020
3108eaf
Assign invariants on construction for Condition::And
adrianbroher May 2, 2020
b70280d
Assign invariants on construction for Condition::Or
adrianbroher May 2, 2020
953d01d
Assign invariants on construction for Condition::Not
adrianbroher May 2, 2020
deecc6f
Assign invariants on construction for Condition::OrderedAlternativesOf
adrianbroher May 2, 2020
d78452d
Assign invariants on construction for Condition::HasSpecial
adrianbroher May 2, 2020
f100bb8
Assign invariants on construction for Condition::Enqueued
adrianbroher May 2, 2020
fac4012
Assign invariants on construction for Condition::ValueTest
adrianbroher May 2, 2020
f04e848
Assign invariants on construction for Condition::DesignHasPart
adrianbroher May 2, 2020
3c44230
Assign invariants on construction for Condition::DesignHasPartClass
adrianbroher May 2, 2020
df3eb26
Assign invariants on construction for Condition::Number
adrianbroher May 2, 2020
4999b1b
Assign invariants on construction for Condition::Turn
adrianbroher May 2, 2020
80d488e
Assign invariants on construction for Condition::SortedNumberOf
adrianbroher May 2, 2020
907ace7
Assign invariants on construction for Condition::CreatedOnTurn
adrianbroher May 2, 2020
3994d36
Assign invariants on construction for Condition::MeterValue
adrianbroher May 2, 2020
db3e0f4
Assign invariants on construction for Condition::ShipPartMeterValue
adrianbroher May 2, 2020
f34b837
Assign invariants on construction for Condition::EmpireMeterValue
adrianbroher May 2, 2020
cddf9da
Assign invariants on construction for Condition::EmpireStockpileValue
adrianbroher May 2, 2020
c33c0b9
Assign invariants on construction for Condition::OwnerHasTech
adrianbroher May 2, 2020
3b3a298
Assign invariants on construction for Condition::OwnerHasBuildingType…
adrianbroher May 2, 2020
b787791
Assign invariants on construction for Condition::OwnerHasShipDesignAv…
adrianbroher May 2, 2020
59d7711
Assign invariants on construction for Condition::OwnerHasShipPartAvai…
adrianbroher May 2, 2020
c8a3560
Assign invariants on construction for Condition::WithinDistance
adrianbroher May 2, 2020
a07343c
Assign invariants on construction for Condition::WithinStarlaneJumps
adrianbroher May 2, 2020
c0bb53e
Assign invariants on construction for Condition::ResourceSupplyConnec…
adrianbroher May 2, 2020
00fc26d
Assign invariants on construction for Condition::Location
adrianbroher May 2, 2020
bffd601
Assign invariants on construction for Condition::PlanetEnvironment
adrianbroher May 2, 2020
6b66285
Make Condition::Condition invariance getters non-virtual
adrianbroher May 2, 2020
04340da
Serialize Condition::Condition invariance states
adrianbroher May 2, 2020
e90ccb3
Remove unused SetConditionVariance from Condition implementation
adrianbroher May 1, 2020
38c9aac
Merge pull request #2919 from adrianbroher/boolify-condition-invariance
geoffthemedio May 5, 2020
caa4b70
Merge pull request #2923 from freeorion/ThreadedEffectScopeConditions…
geoffthemedio May 5, 2020
b7a2164
Merge pull request #2898 from adrianbroher/gh-issue-titles
geoffthemedio May 5, 2020
574cada
Rebalance exobots: make them bad at everything but let them live anyw…
Voker57 Mar 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
54 changes: 54 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
os: Visual Studio 2017

version: ci-{build}

environment:
matrix:
- BUILD_SYSTEM: CMAKE
- BUILD_SYSTEM: MSVC

matrix:
allow_failures:
- BUILD_SYSTEM: CMAKE

init:
- git config --global core.eol native
- git config --global core.autocrlf true

clone_depth: 50

skip_commits:
files:
- default/
- '**/*.md'
- '**/*.xml'
- '**/COPYING'
message: /.*\[(skip appveyor)|(appveyor skip)\].*/

install:
- cd ..
- ps: Start-FileDownload https://github.com/freeorion/freeorion-sdk/releases/download/v11/FreeOrionSDK_11_MSVC-v141-Win32.zip -FileName FreeOrionSDK.zip
- unzip -q FreeOrionSDK.zip
- cp bin/* freeorion/
- cd freeorion

before_build:
- if "%BUILD_SYSTEM%" == "MSVC" (
cd msvc2017
)
- if "%BUILD_SYSTEM%" == "CMAKE" (
mkdir build
)

build_script:
- if "%BUILD_SYSTEM%" == "MSVC" (
msbuild FreeOrion.sln /maxcpucount /property:BuildInParallel=true /property:CL_MPCount=2 /property:PlatformToolset=v141 /property:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:minimal
)
- if "%BUILD_SYSTEM%" == "CMAKE" (
pushd build &&
cmake -G "Visual Studio 15 2017" -T v141 -A Win32 -DBUILD_TESTING=On .. &&
cmake --build . --config "Release" -- /maxcpucount /property:BuildInParallel=true /property:CL_MPCount=2 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:minimal &&
popd
)

test: off
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Code owners for translation stringtables
ru.txt @Cjkjvfnby @o01eg
44 changes: 25 additions & 19 deletions .github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
---
name: Report bug
about: Report problems and bugs with FreeOrion.
labels: "category:bug"
---
Bug Report
==========
<!--
Please fill in a a meaningful and concise issue title in the title field above.
Please fill in a a meaningful and concise title in the field above.
It helps us to classify the issue even before reading the body and handling the
issue a bit better. Prefix the title with labels you find appropriate to
describe the issue like "[Bug]" in case of a bug, "[Feature]" for a feature
request.
issue a bit better.

Examples:
* Great: "[Bug] Unable to select fleet in galaxy map"
* Good: "[Bug] Unable to click fleet"
* Great: "Unable to select fleet in galaxy map"
* Good: "Unable to click fleet"
* Not really okay: "Issue with fleets"
* Horrible: "HELP!!!"
-->


### Environment
Environment
-----------
<!--
You don't need to provide the information in section when they are not useful in
the context of this issue. For example feature requests may not need a
FreeOrion version, but maybe depend on the operating system you use. When in
doubt provide all information you have available.
the context of this issue. For example a crashing hosted server may not need
information about the graphic card, but maybe depend on the operating system you
use. When in doubt provide all information you have available.

You can find the FreeOrion version number in the lower right corner of the game
main screen.
Expand All @@ -37,10 +43,10 @@ so, `Windows 8 Pro` instead of `Windows` or `Mac OSX Mountain Lion` instead of
* Compiled from source


### Description
Description
-----------
<!--
Add a meaningful description of the bug you encountered or of the feature you
want to request.
Add a meaningful description of the bug you encountered.

If a screenshot or image helps to describe the issue content feel free to create
one.
Expand All @@ -53,22 +59,22 @@ found on
-->


### Expected Result
Expected Result
---------------
<!--
If this issue is not a bug you can remove this section.

When you enter an issue please add a description of what behaviour you would
expect from the game instead of the issue.
-->


### Steps to reproduce
Steps to reproduce
------------------
<!--
If this issue is not a bug you can remove this section.

If the error only manifests itself after doing a certain number of actions
please add a list of steps to reproduce the bug. If the error only occurs in
a certain game state please be sure to add a save game to the issue.

To upload save games please pack them into a Zip archive (*.zip) first.
-->
* First step.
* Second step.
Expand Down
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
contact_links:
- name: FreeOrion Forum
url: https://freeorion.org/forum/
about: Get in touch with the FreeOrion developers and community for gameplay support
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: Feature request
about: Propose a new or improved functionality to FreeOrion.
labels: "category:feature"
---
Feature request
===============

Idea
----
<!--
Write down a short explanation of what the new feature consists of. What
should be added or changed to the project?
-->


Gain
----
<!--
Explain why the introduction of this feature would improve the project.
-->


Discussion
----------

<!--
Please create a new forum thread for discussions and link it here;
to directly open the the "New Topic" form you can use the link below:
https://www.freeorion.org/forum/posting.php?mode=post&f=6
-->
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
---
name: Publish release
about: "Team only: Create a tracking issue for a FreeOrion release."
title: Release X.Y.Z preparation
assignees: Vezzra
---
<!--
Please use the issue title 'Release X.Y.Z preparation' and replace X, Y and Z
with the major, minor and patch release version number.
Please replace X, Y and Z with the major, minor and patch release version
number in the title above.

The X.Y.Z convention as placeholder for the actual version number is used
thoughout this document.
Expand Down Expand Up @@ -51,7 +57,7 @@ git checkout -b release-vX.Y.Z master
```
* [ ] *On release branch HEAD* - Update version number in `CMakeLists.txt` and
`cmake/make_versioncpp.py` to `vX.Y.Z`, remove trailing `+` if needed.
* [ ] *On release branch HEAD* - Remove `Super Testers` species.
* [ ] *On release branch HEAD* - Disable `Super Testers` species by default.
* [ ] *On master branch HEAD* - Update version number in `CMakeLists.txt` and
`cmake/make_versioncpp.py` to `vX.Y.Z+`.
* [ ] Push updated release and master branch to GitHub.
Expand Down
46 changes: 43 additions & 3 deletions .github/labels.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ rule of thumb there is at least one label from every category that needs to be
applied to an issue but use common sense to check if the label is appropriate or
not for the specific Issue/PR.

Currently there are three categories:
Currently there are four categories:


#### Label category `category`
Expand All @@ -42,6 +42,15 @@ affected by. This should help developers to identify if they have required
knowledge or interests to handle the issue. There should be at least one
component listed for an Issue.

#### Label category `priority`

The priority labels help developers and contributors to prioritize the Issue/PR,
to focus their efforts more efficiently. There are only two `priority:*` labels,
for high and low priority. Assigning no `priority:*` label means the Issue/PR
has "standard"/"normal"/"medium" priority, which is the default (and should
apply to the majority of issues/PRs). Priority may change over the lifetime of
the Issue/PR.

#### Label category `status`

With the status category developers, managers or issue reporters can check if
Expand Down Expand Up @@ -112,7 +121,16 @@ content of the PR may require extensive gameplay balance testing.

The Issue/PR deals with non-game related infrastructure that aids development.
For example this includes issues with the project homepage, used external
services like continuous integration or hosting of release binaries.
services like continuous integration, hosting of release binaries, tools for
checking code style, etc.

Infrastructure Issues/PRs should not entail/contain any changes to the actual
codebase unless such changes are essentially required by the Issue/PR and would
not make sense outside of its context. Any such non-codebase Infrastructure
Issues/PRs should not be assigned a milestone unless they have particular
relevance to the milestone, such as by establishing some type of
testing/verification of the codebase which is desired to be completed for the
milestone.

#### Label `component:internal`

Expand Down Expand Up @@ -149,6 +167,28 @@ should be used in conjunction with `component:art music text assets`; when this
Issue addresses external documentation like the FO wiki add the
`component:infrastructure` label.

#### Label `priority:high`

The Issue/PR is very urgent or important and should be addressed/finished as
soon as possible, and developers/contributors should focus their efforts on them
before other things. Usually applied to critical bugs and features relevant for
upcoming releases.

#### Label `priority:low`

The Issue/PR is of minor importance/urgency and can be set aside for more
important or urgent things. Usually applied to e.g. nice-to-have features or
bugs that are more of cosmetic nature or a minor annoyance than something that
impedes or breaks gameplay.

#### Label `status:abandoned`

The contributor providing the PR has stopped working on it and either explicitely
stated that they have no intentions or cannot be expected to resume their work
(e.g. because they left the project with no intentions of coming back). Also, no
one is going to pick up the PR for them, so it can be sufficiently safely assumed
that the PR will never be finished.

#### Label `status:cherry-pick for release`

The PR should be applied to the currently open release branch. Use this label
Expand All @@ -163,7 +203,7 @@ the number of the covering Issue/PR in a comment and close this Issue/PR. For
PRs document why the other PR was chosen over this PR. For Issues copy over
new knowledge that is valuable to solve the covering Issue.

#### Label `status:follow up`
#### Label `status:superseded`

The PR discussion showed that the proposed implementation is insufficient in
some way or the PR in itself is malformed. Usually not required as we prefer
Expand Down
31 changes: 23 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,11 @@ DerivedData
# FreeOrion specific
*.zip
/util/Version.cpp
/Installer/FreeOrion_Install_Script.nsi
/packaging/windows_installer.nsi
/packaging/Info.plist
/doc/apidoc-commit-message

# FreeOrion Xcode project
/Xcode/dep/
/Xcode/build/
/Xcode/Info.plist
contents.xcworkspacedata

# FreeOrion MSVC2010 project
# FreeOrion MSVC project
*.pdb
*.log
*.tlog
Expand All @@ -81,6 +76,26 @@ contents.xcworkspacedata
*.opensdf
*.res

# Incremental build files
*.ipdb
*.ilk
*.iobj

# KDevelop4
*.kdev4
*.db

# git mergetool
*.orig

# vim
.*.sw?


# Visual Studio
.vs/
.vscode/

# linters temp files
.mypy_cache/
.pytest_cache/
Loading