0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:wesnoth/wesnoth-old

Browse source
This commit is contained in:
Alexander van Gessel 2013-12-30 15:58:19 +01:00
commit d1b1f1db3f
8 changed files with 2031 additions and 614 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/campaigns/Legend_of_Wesmere/images/legend-of-wesmere-map.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB

1846
data/campaigns/Legend_of_Wesmere/utils/journey.cfg
View file

File diff suppressed because it is too large Load diff

776
data/core/editor/items.cfg
View file

@ -1,4 +1,5 @@
[item_group]
id=items
icon=icons/items/item_misc
name= _ "Items"
@ -15,6 +16,12 @@
name= _ "Altar"
[/item]
[item]
id=ankh-necklace
image=items/ankh-necklace.png
name= _ "Ankh Necklace"
[/item]
[item]
id=anvil
image=items/anvil.png
@ -22,15 +29,21 @@
[/item]
[item]
id=cage
image=items/cage.png
name= _ "Cage"
id=archery-target
image=items/archery-target-right.png
name= _ "Archery Target"
[/item]
[item]
id=armor-golden
image=items/armor-golden.png
name= _ "Golden Armor"
[/item]
[item]
id=box
image=items/box.png
name= _ "Box"
id=armor
image=items/armor.png
name= _ "Armor"
[/item]
[item]
@ -39,6 +52,30 @@
name= _ "Axe"
[/item]
[item]
id=ball-blue
image=items/ball-blue.png
name= _ "Blue Ball"
[/item]
[item]
id=ball-green
image=items/ball-green.png
name= _ "Green Ball"
[/item]
[item]
id=ball-magenta
image=items/ball-magenta.png
name= _ "Magenta Ball"
[/item]
[item]
id=barrel
image=items/barrel.png
name= _ "Barrel"
[/item]
[item]
id=bomb
image=items/bomb.png
@ -52,15 +89,39 @@
[/item]
[item]
id=bow
image=items/bow.png
name= _ "Bow"
id=bonestack
image=items/bonestack.png
name= _ "Bonestack"
[/item]
[item]
id=bow-elven
image=items/bow-elven.png
name= _ "Elven Bow"
id=book1
image=items/book1.png
name= _ "Book"
[/item]
[item]
id=book2
image=items/book2.png
name= _ "Book"
[/item]
[item]
id=book3
image=items/book3.png
name= _ "Book"
[/item]
[item]
id=book4
image=items/book4.png
name= _ "Book"
[/item]
[item]
id=book5
image=items/book5.png
name= _ "Book"
[/item]
[item]
@ -70,27 +131,57 @@
[/item]
[item]
id=archery-target
image=items/archery-target-right.png
name= _ "Archery Target"
id=bow-elven
image=items/bow-elven.png
name= _ "Elven Bow"
[/item]
[item]
id=armor
image=items/armor.png
name= _ "Armor"
id=bow
image=items/bow.png
name= _ "Bow"
[/item]
[item]
id=key
image=items/key.png
name= _ "Key"
id=box
image=items/box.png
name= _ "Box"
[/item]
[item]
id=sword
image=items/sword.png
name= _ "Sword"
id=brazier
image=items/brazier.png
name= _ "Brazier"
[/item]
[item]
id=buckler
image=items/buckler.png
name= _ "Buckler"
[/item]
[item]
id=burial
image=items/burial.png
name= _ "Burial"
[/item]
[item]
id=cage
image=items/cage.png
name= _ "Cage"
[/item]
[item]
id=chest-plain-closed
image=items/chest-plain-closed.png
name= _ "Closed Plain Chest"
[/item]
[item]
id=chest-plain-open
image=items/chest-plain-open.png
name= _ "Open Plain Chest"
[/item]
[item]
@ -100,17 +191,508 @@
[/item]
[item]
id=buckler
image=items/buckler.png
name= _ "Buckler"
id=cloak-green
image=items/cloak-green.png
name= _ "Green Cloak"
[/item]
[item]
id=coffin-closed
image=items/coffin-closed.png
name= _ "Closed Coffin"
[/item]
[item]
id=dragonstatue
image=items/dragonstatue.png
name= _ "Dragonstatue"
[/item]
[item]
id=flame-sword
image=items/flame-sword.png
name= _ "Flame Sword"
[/item]
[item]
id=flower1
image=items/flower1.png
name= _ "Flower"
[/item]
[item]
id=flower2
image=items/flower2.png
name= _ "Flower"
[/item]
[item]
id=flower3
image=items/flower3.png
name= _ "Flower"
[/item]
[item]
id=flower4
image=items/flower4.png
name= _ "Flower"
[/item]
[item]
id=gohere
image=items/gohere.png
name= _ "Go Here Sign"
[/item]
[item]
id=gold-coins-large
image=items/gold-coins-large.png
name= _ "Large Gold Coins"
[/item]
[item]
id=gold-coins-medium
image=items/gold-coins-medium.png
name= _ "Medium Gold Coins"
[/item]
[item]
id=gold-coins-small
image=items/gold-coins-small.png
name= _ "Small Gold Coins"
[/item]
[item]
id=grain-sheaf
image=items/grain-sheaf.png
name= _ "Grain Sheaf"
[/item]
[item]
id=hammer-runic
image=items/hammer-runic.png
name= _ "Runic Hammer"
[/item]
[item]
id=holly-water
image=items/holy-water.png
name= _ "Holy Water"
[/item]
[item]
id=key
image=items/key.png
name= _ "Key"
[/item]
[item]
id=leather-pack
image=items/leather-pack.png
name= _ "Leather Pack"
[/item]
[item]
id=orcish-flag
image=items/orcish-flag.png
name= _ "Orcish Flag"
[/item]
[item]
id=ornate1
image=items/ornate1.png
name= _ "Ornate"
[/item]
[item]
id=ornate2
image=items/ornate2.png
name= _ "Ornate"
[/item]
[item]
id=potion-blue
image=items/potion-blue.png
name= _ "Blue Potion"
[/item]
[item]
id=potion-green
image=items/potion-green.png
name= _ "Green Potion"
[/item]
[item]
id=potion-grey
image=items/potion-grey.png
name= _ "Grey Potion"
[/item]
[item]
id=potion-poison
image=items/potion-poison.png
name= _ "Poison Potion"
[/item]
[item]
id=potion-red
image=items/potion-red.png
name= _ "Red Potion"
[/item]
[item]
id=potion-yellow
image=items/potion-yellow.png
name= _ "Yellow Potion"
[/item]
[item]
id=ring-brown
image=items/ring-brown.png
name= _ "Brown Ring"
[/item]
[item]
id=ring-gold
image=items/ring-gold.png
name= _ "Golden Ring"
[/item]
[item]
id=ring-red
image=items/ring-red.png
name= _ "Red Ring"
[/item]
[item]
id=ring-silver
image=items/ring-silver.png
name= _ "Silver Ring"
[/item]
[item]
id=ring-white
image=items/ring-white.png
name= _ "White Ring"
[/item]
[item]
id=scarecrow
image=items/scarecrow.png
name= _ "Scarecrow"
[/item]
[item]
id=sceptre-of-fire
image=items/sceptre-of-fire.png
name= _ "Sceptre of Fire"
[/item]
[item]
id=spear-fancy
image=items/spear-fancy.png
name= _ "Fancy Spear"
[/item]
[item]
id=staff-magic
image=items/staff-magic.png
name= _ "Magic Staff"
[/item]
[item]
id=staff
image=items/staff.png
name= _ "Staff"
[/item]
[item]
id=stone-tablet
image=items/stone-tablet.png
name= _ "Stone Tablet"
[/item]
[item]
id=storm-trident
image=items/storm-trident.png
name= _ "Storm Trident"
[/item]
[item]
id=straw-bale1
image=items/straw-bale1.png
name= _ "Straw Bale"
[/item]
[item]
id=straw-bale2
image=items/straw-bale2.png
name= _ "Straw Bale"
[/item]
[item]
id=sword
image=items/sword.png
name= _ "Sword"
[/item]
[/item_group]
[item_group]
id=scenery
name= _ "Scenery"
icon=icons/items/item_scenery
[item]
id=castle-ruins
image=scenery/castle-ruins.png
name= _ "Castle Ruins"
[/item]
[item]
id=circle-magic-glow
image=scenery/circle-magic-glow.png
name= _ "Glowing Magic Circle"
[/item]
[item]
id=circle-magic
image=scenery/circle-magic.png
name= _ "Magic Circle"
[/item]
[item]
id=dwarven-doors-closed
image=scenery/dwarven-doors-closed.png
name= _ "Closed Dwarven Doors"
[/item]
[item]
id=fire
halo=scenery/fire[1~8].png:100
image=scenery/fire1.png
name= _ "Camp Fire"
[/item]
[item]
id=flames
halo=scenery/flames[01~15].png
image=scenery/flames01.png
name= _ "Flames"
[/item]
[item]
id=gate-rusty-se
image=scenery/gate-rusty-se.png
name= _ "Rusty Gate South East"
[/item]
[item]
id=gate-rusty-sw
image=scenery/gate-rusty-sw.png
name= _ "Rusty Gate South West"
[/item]
[item]
id=icepack1
image=scenery/icepack-1.png
name= _ "Icepack"
[/item]
[item]
id=leanto
image=scenery/leanto.png
name= _ "Leanto"
[/item]
[item]
id=lighthouse
name= _ "Lighthouse"
image=scenery/lighthouse.png
[/item]
[item]
id=mausoleum
halo=scenery/mausoleum[01~22].png
image=scenery/mausoleum01.png
name= _ "Mausoleum"
[/item]
[item]
id=mine-abandoned
image=scenery/mine-abandoned.png
name= _ "Abandoned Mine"
[/item]
[item]
id=monolith1
image=scenery/monolith1.png
name= _ "Monolith"
[/item]
[item]
id=monolith2
image=scenery/monolith2.png
name= _ "Monolith"
[/item]
[item]
id=monolith3
image=scenery/monolith3.png
name= _ "Monolith"
[/item]
[item]
id=monolith4
image=scenery/monolith4.png
name= _ "Monolith"
[/item]
[item]
id=nest-empty
image=scenery/nest-empty.png
name= _ "Empty Nest"
[/item]
[item]
id=nest-full
image=scenery/nest-full.png
name= _ "Full Nest"
[/item]
[item]
id=oak-leaning
image=scenery/oak-leaning.png
name= _ "Leaning Oak"
[/item]
[item]
id=pine1
image=scenery/pine1.png
name= _ "Pine Tree"
[/item]
[item]
id=pine2
image=scenery/pine2.png
name= _ "Pine Tree"
[/item]
[item]
id=rock-cairn
image=scenery/rock-cairn.png
name= _ "Rock Cairn"
[/item]
[item]
id=rock1
image=scenery/rock1.png
name= _ "Rock"
[/item]
[item]
id=rock2
image=scenery/rock2.png
name= _ "Rock"
[/item]
[item]
id=rock3
image=scenery/rock3.png
name= _ "Rock"
[/item]
[item]
id=rock4
image=scenery/rock4.png
name= _ "Rock"
[/item]
[item]
id=rubble
image=scenery/rubble.png
name= _ "Rubble"
[/item]
[item]
id=rune1
image=scenery/rune1.png
name= _ "Rune"
[/item]
[item]
id=rune2
image=scenery/rune2.png
name= _ "Rune"
[/item]
[item]
id=rune3
image=scenery/rune3.png
name= _ "Rune"
[/item]
[item]
id=rune4
image=scenery/rune4.png
name= _ "Rune"
[/item]
[item]
id=rune5
image=scenery/rune5.png
name= _ "Rune"
[/item]
[item]
id=rune6
image=scenery/rune6.png
name= _ "Rune"
[/item]
[item]
id=rune1-glow
image=scenery/rune1-glow.png
name= _ "Glowing Rune"
[/item]
[item]
id=rune2-glow
image=scenery/rune2-glow.png
name= _ "Glowing Rune"
[/item]
[item]
id=rune3-glow
image=scenery/rune3-glow.png
name= _ "Glowing Rune"
[/item]
[item]
id=rune4-glow
image=scenery/rune4-glow.png
name= _ "Glowing Rune"
[/item]
[item]
id=rune5-glow
image=scenery/rune5-glow.png
name= _ "Glowing Rune"
[/item]
[item]
id=rune6-glow
image=scenery/rune6-glow.png
name= _ "Glowing Rune"
[/item]
[item]
id=shipwreck
image=scenery/shipwreck-1.png
name= _ "Shipwreck"
[/item]
[item]
id=signpost
name= _ "Signpost"
@ -118,9 +700,123 @@
[/item]
[item]
id=whirlpool
name= _ "Whirlpool"
image=scenery/whirlpool.png
id=slab1
name= _ "Slab"
image=scenery/slab1.png
[/item]
[item]
id=snowbits
name= _ "Snowbits"
image=scenery/snowbits.png
[/item]
[item]
id=summoning-center
image=scenery/summoning-center.png
name= _ "Summoning Center"
[/item]
[item]
id=summoning-circle1
image=scenery/summoning-circle1.png
name= _ "Summoning Circle"
[/item]
[item]
id=summoning-circle2
image=scenery/summoning-circle2.png
name= _ "Summoning Circle"
[/item]
[item]
id=summoning-circle3
image=scenery/summoning-circle3.png
name= _ "Summoning Circle"
[/item]
[item]
id=summoning-circle4
image=scenery/summoning-circle4.png
name= _ "Summoning Circle"
[/item]
[item]
id=summoning-circle5
image=scenery/summoning-circle5.png
name= _ "Summoning Circle"
[/item]
[item]
id=summoning-circle6
image=scenery/summoning-circle6.png
name= _ "Summoning Circle"
[/item]
[item]
id=temple1
image=scenery/temple1.png
name= _ "Temple"
[/item]
[item]
id=tent-fancy-red
image=scenery/tent-fancy-red.png
name= _ "Fancy Red Tent"
[/item]
[item]
id=tent-ruin-1
image=scenery/tent-ruin-1.png
name= _ "Ruined Tent"
[/item]
[item]
id=tent-shop-weapons
name= _ "Weapon Shop Tent"
image=scenery/tent-shop-weapons.png
[/item]
[item]
id=trapdoor-closed
image=scenery/trapdoor-closed.png
name= _ "Closed Trapdoor"
[/item]
[item]
id=trapdoor-open
image=scenery/trapdoor-open.png
name= _ "Open Trapdoor"
[/item]
[item]
id=trash
image=scenery/trash.png
name= _ "Trash Pile"
[/item]
[item]
id=village-human-burned1
image=scenery/village-human-burned1.png
name= _ "Burned Human Village"
[/item]
[item]
id=village-human-burned2
image=scenery/village-human-burned2.png
name= _ "Burned Human Village"
[/item]
[item]
id=village-human-burned3
image=scenery/village-human-burned3.png
name= _ "Burned Human Village"
[/item]
[item]
id=village-human-burned4
image=scenery/village-human-burned4.png
name= _ "Burned Human Village"
[/item]
[item]
@ -130,8 +826,22 @@
[/item]
[item]
id=lighthouse
name= _ "Lighthouse"
image=scenery/lighthouse.png
id=whirlpool
name= _ "Whirlpool"
image=scenery/whirlpool.png
[/item]
[item]
id=windmill
image=scenery/windmill-01.png
halo=scenery/windmill-[01~14].png:150
name= _ "Windmill"
[/item]
[item]
id=wreck
image=scenery/wreck.png
name= _ "Wreck"
[/item]
[/item_group]

5
data/core/editor/time-of-day.cfg
View file

@ -1,6 +1,11 @@
#textdomain wesnoth-editor
# Editor time-of-day (lighting settings) presets
[editor_times]
name= _ "None"
id=empty
[/editor_times]
[editor_times]
name= _ "Test"
id=test

6
data/gui/default/window/editor_edit_scenario.cfg
View file

@ -212,7 +212,7 @@
horizontal_alignment = "left"
[label]
definition = "default"
label = _ "Experience Modifier:"
label = _ "Experience modifier:"
[/label]
[/column]
[column]
@ -273,7 +273,7 @@
[toggle_button]
id = "victory_when_enemies_defeated"
definition = "default"
label= _ "victory_when_enemies_defeated"
label= _ "Declare victory once all enemies are defeated"
[/toggle_button]
[/column]
@ -291,7 +291,7 @@
[toggle_button]
id = "random_start_time"
definition = "default"
label= _ "Random Starting Time"
label= _ "Random starting time"
[/toggle_button]
[/column]

4
data/gui/default/window/editor_edit_side.cfg
View file

@ -102,7 +102,7 @@
[label]
definition = "default"
label = _ "Team Identifier:"
label = _ "Team identifier:"
[/label]
[/column]
@ -130,7 +130,7 @@
[label]
definition = "default"
label = _ "Team Name:"
label = _ "Team name:"
[/label]
[/column]

4
src/hotkey/hotkey_item.cpp
View file

@ -241,8 +241,10 @@ void add_hotkey(const hotkey_item& item) {
::get_hotkey(item.get_character(), item.get_keycode(),
item.get_shift(), item.get_ctrl(), item.get_cmd(), item.get_alt());
if (old_hk.active())
if (old_hk.active()) {
old_hk.set_command(item.get_command());
old_hk.unset_default();
}
else
hotkeys_.push_back(item);
}

4
src/hotkey/hotkey_item.hpp
View file

@ -57,6 +57,10 @@ public:
bool is_default() const { return is_default_; }
void unset_default(bool is_not_default = true) {
is_default_ = !is_not_default;
}
/// Return "name" of hotkey. Example :"ctrl+alt+g"
std::string get_name() const;