upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-29 20:16:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,991 Commits 56 Branches 373 Tags
Commit Graph

67991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hironori Fujimoto
1a2deea6bb updates to manual 
- update hotkey of command mode
- remove description about default weapon choice
  (recent wesnoth don't choose weapon only by maximum take damage)

Closes #922 (GNA24681), closes #939

[ci skip]
 2017-03-18 17:40:07 -04:00
Shiki
1c0d5eb943 changed weapon name= key to flail, like it is for the shock trooper (#959) 
[ci skip]
 2017-03-18 17:38:44 -04:00
ln-zookeeper
b033316ed8 Updated changelog 2017-03-18 23:02:40 +02:00
ln-zookeeper
07de0a02db Use small forests also when adjacent to the off-map terrain 2017-03-18 22:50:11 +02:00
Celtic Minstrel
2acd25e1d3 Update changelog 
[ci skip]
 2017-03-18 16:34:05 -04:00
ln-zookeeper
74a7e43182 TB S3: Used old wooden floor for parts of the castle interior 2017-03-18 21:42:06 +02:00
Celtic Minstrel
4c26e470f6 Merge pull request #940 from sevu/deep_waters_are_deep 
Fix regressions with zombies

[ci skip]
 2017-03-18 14:41:00 -04:00
Shiki
45d7cc1459 Changed description of the UMC plague ability. (#947) 
[ci skip]
 2017-03-18 14:40:12 -04:00
Charles Dang
d215946cac Updated RELEASE_NOTES 2017-03-19 05:36:37 +11:00
Celtic Minstrel
3d63f66dbb wmlparser.py: stricter determination of whether strings are translatable (fixes #907) 2017-03-18 14:31:36 -04:00
Charles Dang
daefe8e63b Don't reset zoom level every time a game is loaded (FR #25592) 
Note this doesn't apply across app sessions, but it's an improvement.
 2017-03-19 05:15:25 +11:00
Charles Dang
64a369ef6f Addon Manager: made Exit button normal size 2017-03-19 04:52:42 +11:00
Jyrki Vesterinen
4d069bc8c2 Fix MSVC release builds 
Regressed in commit e0b85e5ddad793dee0b1e9e8cf0770e351c7eba4.
 2017-03-18 19:45:50 +02:00
Charles Dang
d465879c89 MP Create Game: allow Leave button to fill all available space 2017-03-19 04:40:23 +11:00
Celtic Minstrel
6b0cca611f SotA: Set up for translations 
This adds an initial pot-file as well as the three pre-existing translations:
    Hungarian, Japanese, Russian

I wasn't sure what to do about translations that don't yet exist, but the
"scons pot-update" target seems to fail if they're missing, so I've
created blank placeholder files for them.
 2017-03-18 13:37:10 -04:00
Celtic Minstrel
733ce215fd Update changelog 2017-03-18 13:37:10 -04:00
gfgtdf
31ac470a93 Update RELEASE_NOTES 2017-03-18 17:43:36 +01:00
Severin Glöckner
a6643c60c1 added special notes telling about the defense cap of the mounted variant 
[ci skip]
 2017-03-18 16:36:20 +01:00
Severin Glöckner
49b4ca9ee0 fix regression of a701a2e (movement/defense on deep water for some variations) 
since da255ab all death animations use exactly 4 specific frames, simplyfied macros
NBASE_NAME -> BASE_NAME
undef soulless macros too

[ci skip]
 2017-03-18 16:36:20 +01:00
ln-zookeeper
578171bb92 Updated changelogs 2017-03-18 13:37:32 +02:00
Jyrki Vesterinen
3dfd421191 Address some cppcheck suggestions 
I addressed the suggestions in files which I know well enough to feel
highly comfortable to edit them.

Thanks to @matthiaskrgr for the cppcheck run.
 2017-03-18 12:28:41 +02:00
Jyrki Vesterinen
2c00677d4b Add lexical_cast.hpp to wesnothlib.vcxproj 2017-03-18 12:26:44 +02:00
Charles Dang
49ec75829e Campaigns: wmlindent run 2017-03-18 20:11:14 +11:00
Charles Dang
5a62b43dc8 wmllint: added SotA to mainline campaigns list 2017-03-18 20:08:39 +11:00
Celtic Minstrel
f0c127915b Allow wesnoth.select_unit() to deselect the unit 
Since @vultraz recently decided to remove this feature from wesnoth.deselect_hex.
 2017-03-18 17:35:51 +11:00
Celtic Minstrel
0c42107d0b Merge pull request #946 from sigurdfdragon/more_keys_for_store_side 
Add more keys to store_side
 2017-03-17 19:46:24 -04:00
sigurdfdragon
cc1e51565d Changelog entry for additional [store_side] keys 2017-03-17 19:26:20 -04:00
sigurdfdragon
0ea5ae07ce Add more keys to store_side 2017-03-17 19:26:20 -04:00
Wedge009
67677055bb Merge branch 'master' of https://github.com/wesnoth/wesnoth 2017-03-18 08:59:44 +11:00
Wedge009
96edc218ff Avoid unused variable warning on WIN32 by removing the entire control socket block instead of just the file open section. 2017-03-18 08:59:18 +11:00
Charles Dang
1c54a70c40 Connect Engine: removed unused function relating to GUI1 drag-and-drop side reordering 2017-03-18 08:02:04 +11:00
gfgtdf
336ad22e45 fixup comment 2017-03-17 22:00:35 +01:00
gfgtdf
21ad59bf9e add a todo comment 2017-03-17 21:58:54 +01:00
gfgtdf
2406ad4f66 add some debug output 2017-03-17 21:43:46 +01:00
Jyrki Vesterinen
16fefa26a7 Fix MSVC compiler warnings 2017-03-17 21:40:20 +02:00
Celtic Minstrel
b16728c78e Fix [heal_unit] not restoring statuses by default (GNA25605) 2017-03-17 10:58:06 -04:00
Celtic Minstrel
96c79ba6b3 Nuke another use of snprintf 2017-03-17 10:53:18 -04:00
Celtic Minstrel
1de48a6cb6 fixup! Fix the broken unit test 2017-03-17 10:49:31 -04:00
Wedge009
b78f13810a Didn't properly save all the files before committing 60f05e32. :/ 
[ci skip]
 2017-03-17 17:04:38 +11:00
Wedge009
60f05e3284 Update VC project files for e1658881 and 18a7e802. 
[ci skip]
 2017-03-17 16:19:27 +11:00
Jeffrey 'Sigurd' Westcoat
ce14f56fb9 Fixup cfc4c5c425819fd9650864195e71f13613ff88fe (#958) 2017-03-17 00:23:54 -04:00
Celtic Minstrel
77e2e1c315 Run pot-update 
Note: While this does update the pot-files, other functions of pot-update (such as asciidoc) were not run.
 2017-03-17 00:17:23 -04:00
Celtic Minstrel
e5f92fef08 Fix the broken unit test 
At the very least, this should allow it to compile...
 2017-03-16 21:43:19 -04:00
Jeffrey 'Sigurd' Westcoat
dff4b7805a SotA: Reorder traits so loyal is first (#957) 
To match convention in mainline.
 2017-03-16 20:33:45 -04:00
mattsc
930fb368c5 Update Xcode project 2017-03-16 17:05:46 -07:00
Charles Dang
2d7ac7c887 File Dialog: disable horizontal scrollbar for Bookmarks list 
This was probably disabled while the dialog had issues with long filename labels. Now that that's fixed,
this *should* be safe to enable.
 2017-03-17 10:39:33 +11:00
Charles Dang
cfc4c5c425 Game Stats: apply red formatting to negative gold 2017-03-17 10:04:54 +11:00
Charles Dang
18a7e80243 Removed GUI2 Addon Description and Filter Options dialog 
These have been rolled into the new GUI2 addon manager.
 2017-03-17 08:52:01 +11:00
Celtic Minstrel
2454059f76 Fix -Wreorder warning 2017-03-16 17:40:00 -04:00
Celtic Minstrel
6bf76d940b Include header files in pot-updates 
It would probably be better to avoid using translatable strings in headers,
but certain people keep doing so anyway, so this is more future-proof.
 2017-03-16 17:21:55 -04:00