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

62423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gfgtdf
65b2eb2a7e Merge pull request #520 from gfgtdf/lua_carryover 
side specific variables.
 2015-10-11 18:51:21 +02:00
Charles Dang
fe7b30fafa Restrict "Enter User Command" to game scope only 
The hotkey was assigned three scopes in order to appear under the General tab.
However, as it has no effect outside the game, it makes no sense for it to appear there.
 2015-10-12 00:56:48 +11:00
Charles Dang
7a6293a86b Display name of current map in window title 2015-10-12 00:19:57 +11:00
Celtic Minstrel
c12ccfa30b Lua API: Keep stack clean after gathering message dialog options 2015-10-10 12:43:34 -04:00
CelticMinstrel
b68ea239d5 Merge pull request #521 from Wedge009/msvc_debug_fix 
Ensure var_end is not beyond res.end()
 2015-10-10 00:52:22 -04:00
Charles Dang
cc5f614bc0 HttT S1: removed unused variable 2015-10-10 15:21:09 +11:00
Wedge009
a2404cad01 Ensure var_end is not beyond res.end() 
MSVC debug mode complains that var_end cannot be dereferenced if it hits the end of the string.
 2015-10-10 14:45:37 +11:00
Ignacio R. Morelle
048c23cb3a hotkeys: Use a matching arrow icon style for submenus 2015-10-09 20:46:59 -03:00
Ignacio R. Morelle
d744a88808 Merge branch 'feature/editor-mru-master' 2015-10-09 19:55:24 -03:00
Ignacio R. Morelle
916ec18069 Update changelog 2015-10-09 19:55:10 -03:00
Ignacio R. Morelle
e186057336 editor: Make Recent Files limit customizable and increase default to 10 2015-10-09 19:47:52 -03:00
Ignacio R. Morelle
25a5facce3 editor: Add Recent Files menu with recently loaded/saved files 
File paths are recorded into the game preferences up to a (currently
hardcoded) limit of 6 and opening or saving maps adds or bumps existing
entries to the top. We may allow users to change the MRU limit in
Advanced Preferences in a later commit.

Adds two translatable strings.

In order to fit file paths in the menu without filling up the whole
screen sideways, we use only the file names for now. Because identical
file names could prove to be an actual issue later, I intend to look
into ellipsizing paths correctly in a later step.

(Note that I'm piggybacking on the crummy submenu support we already had
in the themable UI so that this can be safely backported to 1.12. It's
decidedly not optimal usability-wise, but it'll have to do for now.)
 2015-10-09 19:47:38 -03:00
Charles Dang
dfabf72030 Revert "Remove multiplayer/ inclusion from editor" 
This reverts commit 872444a28c1e6e3d98543e180bed235edb09bd3f.
 2015-10-10 03:47:01 +11:00
Charles Dang
0dbaabbb3e Split 6p Team Survival map into own file 2015-10-09 15:27:39 +11:00
Charles Dang
872444a28c Remove multiplayer/ inclusion from editor 2015-10-09 15:22:14 +11:00
Charles Dang
ae305e9cc7 Don't switch map contexts when opening the map currently being viewed 2015-10-09 15:15:27 +11:00
Charles Dang
0fe3bbd362 Merge branch 'master' of github.com:wesnoth/wesnoth 2015-10-09 15:07:09 +11:00
Charles Dang
610aa9a2da Merge pull request #519 from Vultraz/master 
Make Edit Side dialog to use new share_vision tristate
 2015-10-09 15:06:43 +11:00
gfgtdf
5438ec8a48 side specific variables. 
http://gna.org/bugs/?23490

This makes it possible to store variables inside the side with the lua
functions get/set_side_variable. These variables are carried over along
other side specific data(units, gold)
 2015-10-08 22:29:17 +02:00
Charles Dang
2319bd26ab Merge branch 'master' of github.com:wesnoth/wesnoth 2015-10-09 06:45:33 +11:00
Celtic Minstrel
285f8c80e2 Allow mixing [literal], [value], and even [split] in [set_variables] 2015-10-08 15:40:31 -04:00
gfgtdf
a77fada784 add access to tables via unit.variables 
unit.variables now uses the same functionality as
wesnoth.get/set_variable (just for the unit variable instead of the game
variables) which makes it possible to access table values. Its also
posible to access subvariables as
unit.variables["list1[2].list2.length"]
 2015-10-08 21:37:29 +02:00
Charles Dang
1a6161a8ab Make Edit Side dialog to use new share_vision tristate 2015-10-08 17:13:09 +11:00
Charles Dang
1cf271e01e Add setter methods for share_vision 2015-10-08 17:09:41 +11:00
Celtic Minstrel
f224e2a073 Fix WML unit tests 2015-10-07 20:09:57 -04:00
Charles Dang
ae1ebd09cd Minor cleanup regarding border size 2015-10-08 05:59:52 +11:00
Charles Dang
35b227bbc2 Add [terrain_mask] mask_file= key to load mask at runtime 
Served same function as [replace_map] map_file=
 2015-10-08 05:42:35 +11:00
CelticMinstrel
57c79de7b3 Merge pull request #518 from CelticMinstrel/var-default 
Make closing | mandatory in $var?default| syntax
 2015-10-07 14:20:04 -04:00
Celtic Minstrel
9859091c7c Convert test scenario maps to new format 2015-10-07 14:19:48 -04:00
Celtic Minstrel
1b22a974c2 Make [terrain_mask]border default to yes and imply the required border size 2015-10-07 14:12:32 -04:00
Charles Dang
68363b3e21 Convert benchmark scenario maps to new format 2015-10-08 05:09:14 +11:00
Charles Dang
a96253982b Team Survival: convert masks to new format 2015-10-08 05:09:13 +11:00
Charles Dang
f932da26be TSG S6b: convert inline masks to new format 2015-10-08 05:09:13 +11:00
Charles Dang
31e822d7c6 EI: convert remaining maps to new format 2015-10-08 05:09:12 +11:00
Charles Dang
8e58764517 TRoW: convert maps to new format 2015-10-08 05:09:11 +11:00
Charles Dang
fe3057173b SotBE: convert maps to new format 2015-10-08 05:09:10 +11:00
Charles Dang
6cdc849aa2 L S8: convert inline mask to new format 2015-10-08 05:09:10 +11:00
Charles Dang
7f8645ebc0 L: convert maps to new format 2015-10-08 05:09:09 +11:00
Charles Dang
d6a31d2be1 HttT: split S17 mask into its own file and converted it to new format 2015-10-08 05:09:05 +11:00
Charles Dang
a97cd1c74e HttT: convert maps to new format 2015-10-08 05:07:36 +11:00
Charles Dang
6009729fd1 DM: convert maps to new format 2015-10-08 05:07:35 +11:00
Charles Dang
9972213520 SoF: convert maps and masks to new format 2015-10-08 05:07:34 +11:00
Charles Dang
b253a331b5 DW S2: convert inline mask to new format 2015-10-08 05:07:34 +11:00
Celtic Minstrel
a2125ad3fd Make closing | mandatory in $var?default| syntax 2015-10-07 13:35:58 -04:00
Charles Dang
b8c5641baf DW: convert maps to new format 2015-10-08 04:12:51 +11:00
gfgtdf
dd1b681d59 add support for overlays to lua units poxies 2015-10-07 18:44:36 +02:00
Charles Dang
abd5dfdcc0 Remove handling of maps' usage= key 2015-10-07 20:24:55 +11:00
Charles Dang
798c59c7bd Replace most instances of a single-hex [terrain_mask] action with [terrain] 
One file is deliberately not converted until we get a dedicated mask test
 2015-10-07 17:00:53 +11:00
Charles Dang
2a466bd567 Remove handling of [map] as a tag 2015-10-07 16:30:27 +11:00
Celtic Minstrel
21e06ef482 Add accuracy/parry to Lua unit attacks table 2015-10-06 22:49:38 -04:00