Viewing all changes in revision 8845.
- Committer: GunChleoc
- Date: 2019-04-24 07:13:17 UTC
- mfrom: (8822.1.248 trunk)
- Revision ID: fios@foramnagaidhlig.net-20190424071317-nr3bwspfym0mj3h4
Merged trunk.
- files added:
- data/images/ui_fsmenu/easy.png
- files renamed:
- data/campaigns/campaigns.conf => data/campaigns/campaigns.lua
- data/campaigns/tutorials.conf => data/campaigns/tutorials.lua
- data/images/ui_fsmenu/hard.png => data/images/ui_fsmenu/challenging.png
- data/images/ui_fsmenu/challenging.png => data/images/ui_fsmenu/hard.png
- data/images/ui_fsmenu/easy.png => data/images/ui_fsmenu/medium.png
- src/logic/campaign_visibility.cc => src/ui_fsmenu/campaigns.cc
- src/logic/campaign_visibility.h => src/ui_fsmenu/campaigns.h
- files modified:
- .travis.yml
expand all
collapse all
added
removed
data/images/ui_fsmenu/easy.png
data/tribes/images/frisians/roadt_busy.png
data/tribes/images/frisians/roadt_normal_00.png
data/tribes/images/frisians/roadt_normal_01.png
