upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-14 15:04:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,333 Commits 60 Branches 374 Tags
Commit Graph

63333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sigurdfdragon
88f4237cb8 AOI S7: Simplfy advisor search to match version in AOI utils/macros.cfg 2016-02-15 23:24:37 -05:00
sigurdfdragon
61d4d8f83c AOI S6: Fix bug where mage recall & dialog won't trigger. 
This occurs whenever you only have Silver Mages left.Reported in the forums.
https://forums.wesnoth.org/viewtopic.php?f=41&t=20321#p363025
 2016-02-15 23:17:53 -05:00
Charles Dang
3c944c3bb2 Merge pull request #598 from Elvish-Hunter/dejavu-2.35 
Updated DejaVu fonts to version 2.35
 2016-02-16 09:31:05 +11:00
ln-zookeeper
df9cecd558 Changed gray and tropical water to work by overlays, not color-shift 
This heavily decreases memory use, with relatively little impact on visuals, which can be refined further still.
 2016-02-15 23:38:49 +02:00
gfgtdf
644f5e7386 attempt to fix [set_variables] 
https://gna.org/bugs/?24412
 2016-02-15 18:00:47 +01:00
gfgtdf
ff9a9e017a fix listboxes having problems to find sort toggle buttons in different columns. 2016-02-15 18:00:45 +01:00
gfgtdf
09e88c89d1 remove a useless prprocessor guard 
in inclusion of test/multiplayer/ is already guarded with a #ifdef
MP_TEST so there is no point in using #ifdef MP_TEST in that file.
 2016-02-15 18:00:43 +01:00
gfgtdf
50725cabe3 add a setter for a units level in lua proxy units 2016-02-15 18:00:41 +01:00
gfgtdf
3f681c1412 dont allow empty indexes in wml variables 
wesnoth.get_variable("a[].b") now gives an error, previously it was the
same as wesnoth.get_variable("a[0].b")
 2016-02-15 18:00:39 +01:00
gfgtdf
ba154d07b9 fix assertion failure and OOS when attacking with DSU active 
undo_stack.clear() shouldn't be called from outside the synced contect
since it might fire sigted events and similar.

The attack handle in synced_commands.cpp already calls clear() so its
enought to just rmeove it here.
 2016-02-15 18:00:37 +01:00
gfgtdf
6e0f8ed6d7 fix assertion failure when loading mp saves 2016-02-15 18:00:35 +01:00
gfgtdf
b753e54b03 fixup comment 2016-02-15 17:58:34 +01:00
gfgtdf
c425e62a20 add support to search in border in wesnoth.find_path 2016-02-15 17:58:30 +01:00
gfgtdf
4e46c7cc28 fix issues with [unit] in [side] in mp connect. 
this code here might write to the wrong config. 'type' and 'gender' are
also writen below to the correct config. This fixes an error that
prevented 2p Drak forecast to load.
 2016-02-15 17:58:27 +01:00
Elvish_Hunter
4f2c15a065 Updated DejaVu fonts to version 2.35 
The following codepoints were added:
* 1735 - 1736
* 1739
* 1744
* 3647
* 8381
* 9886 - 9887
* 43000 - 43001
* 64471 - 64472
* 64475 - 64479
* 64484 - 64487
 2016-02-15 17:39:39 +01:00
Elvish_Hunter
b9380e88c1 wmltools3: fixed a bug reported by Robertdebrus in PR #596 
The bug consisted in the accidental removal of the 'vcdir' constant, still used by wmlindent and wmllint-1.4.
 2016-02-15 00:12:47 +01:00
Charles Dang
0537fc2391 tpreferences: fixed phantom entry remaining after removing last acquaintance from list 2016-02-15 07:47:04 +11:00
Celtic Minstrel
f4c3d97f55 Update XCode project (again) 2016-02-14 15:17:02 -05:00
Celtic Minstrel
534299e645 Update XCode project 2016-02-14 15:02:55 -05:00
Ignacio R. Morelle
5f5f7a185f gui2/tpreferences: Correct copyright 2016-02-14 16:37:04 -03:00
Ignacio R. Morelle
5e6da3f9aa gui2/tpreferences: Fix button labels case 2016-02-14 15:50:04 -03:00
Ignacio R. Morelle
94454d587a config/cache: More cleanup 2016-02-14 02:47:47 -03:00
Ignacio R. Morelle
d843e4543c config/cache: More cleanup 
No functional changes, except for additional debug output in one case.
Also merged a few nested conditional blocks.
 2016-02-14 02:01:10 -03:00
Ignacio R. Morelle
ce61639007 config/cache: Move auxiliary function to anon namespace 2016-02-14 01:41:33 -03:00
Ignacio R. Morelle
f490794370 config/cache: Drop unused code 2016-02-14 01:37:05 -03:00
Ignacio R. Morelle
cd35cc2065 config/cache: Formatting/indentation 
No functional changes.
 2016-02-14 01:36:37 -03:00
Ignacio R. Morelle
85688780c5 gui2/tgame_cache_options: Disable Clean/Purge buttons if cache is empty 2016-02-14 01:04:30 -03:00
Ignacio R. Morelle
f5ba6a0e9e gui2/tgame_cache_options: Remove Purge prompt 
As gfgtdf pointed out, it's rather pointless.
 2016-02-14 00:58:30 -03:00
ln-zookeeper
93a7f5e599 Fixed the last character of [objectives] note= getting eaten 2016-02-14 02:12:01 +02:00
Celtic Minstrel
1873b38243 Demote [option] deprecated message even further 2016-02-13 18:42:02 -05:00
Celtic Minstrel
d28365730b Demote [option] deprecated message to log 2016-02-13 18:23:07 -05:00
Charles Dang
8d6ca11241 Check that window is initialized when setting fullscreen 2016-02-13 21:30:52 +11:00
Ignacio R. Morelle
bd8066313c gui2/tmp_alerts_options: Substantial dialog design cleanup 
This primarily consists of rearranging things slightly to make the
dialog more visually balanced, and moving text out of (non-functional)
tooltips into a more visible explanation area.

The control buttons at the bottom also get some additional padding above
so that the Defaults button doesn't look somehow visually tied to the
toggle buttons row directly above it.

Also, fixed macro definitions to match the conventions laid out in
data/gui/default/macros/_initial.cfg.
 2016-02-13 06:22:15 -03:00
ln-zookeeper
0f47daf88c Removed a lot of the breeding details 2016-02-13 01:17:28 +02:00
Charles Dang
f43ed4161e taddon_list: cleaned up layout to bring it in line with production design 2016-02-13 10:09:56 +11:00
Charles Dang
63763774bc GUI WML cleanup: strip unless size_text keys as well as ones with empty attributes 2016-02-13 09:35:06 +11:00
Charles Dang
0394fe0a34 tpreferences: display descriptions of advanced preferences if available 2016-02-12 08:34:42 +11:00
aquileia
7815744c61 vcproj: Add preference_dialog 
Additionally, remove duplicate entry in src/Sconscript
 2016-02-11 18:01:30 +01:00
Charles Dang
20350715ea Don't display Orb Color option for now 2016-02-12 01:13:33 +11:00
Charles Dang
e186a18846 Merge pull request #594 from sigurdfdragon/Help_Typo_Fix_Great_Ocean 
Help: Fix typo in Help -> Encyclopedia -> Geography -> Great Ocean.
 2016-02-11 16:54:26 +11:00
sigurdfdragon
56ea3a7d24 Help: Fix typo in Help -> Encyclopedia -> Geography -> Great Ocean. 2016-02-10 20:18:47 -05:00
Charles Dang
2b47d9582a tpreferences: use plain-text label for infinite autosaves 2016-02-11 08:52:59 +11:00
Charles Dang
9d77100e2c tpreferences: fixed Animate Map toggle not working 2016-02-11 08:05:10 +11:00
ln-zookeeper
b6d2a685d3 Streamlined the WML for the basic terrain base and transition rules 2016-02-10 20:33:46 +02:00
Charles Dang
edbd84d0b6 Revert "ttree_view_node: bind label selection event to toggle if label is not present" 
This reverts commit 5f67eee678e082b75aa67b83952572db8a096827.

This commit caused problems with toggling the list folded or unfolded. Will readd once
a better solution is found
 2016-02-11 00:27:38 +11:00
Charles Dang
34838f3819 tcampaign_selection: fixed some bad_lexcical_cast assertions 2016-02-11 00:19:50 +11:00
Charles Dang
7740fe1f87 tpreferences: update file copyright 2016-02-10 23:49:35 +11:00
Charles Dang
77e2eb8228 tpreferences: display proper symbol for infinite autosaves 2016-02-10 23:47:13 +11:00
Charles Dang
5d60f991a1 Merge pull request #581 from Vultraz/prefs_dialog_refactor 
GUI2 prefs dialog refactor
 2016-02-10 21:09:18 +11:00
Charles Dang
0ff4830f8d Allow preferences::remove_acquaintance to return a bool success value 
Also made use of the new value in tpreferences
 2016-02-10 19:51:09 +11:00