59964 Commits

Author SHA1 Message Date
Charles Dang
238a489444 Use [transform_unit] for TRANSFORM_UNIT 2015-01-06 23:40:46 +11:00
Charles Dang
8a620dd5f1 Use [filter_condition] in RECALL_AI_SIDE 2015-01-06 19:33:13 +11:00
Charles Dang
75e7d41425 Use [filter_condition] in second part of LIMIT_CONTEMPORANEOUS_RECRUITS 2015-01-06 19:05:31 +11:00
Charles Dang
10023d79a6 Use [not] instead of [else] hack in IF_DEAD 2015-01-06 18:58:23 +11:00
Charles Dang
f7ff591fe5 Use [clear_menu_item] instead of the [set_menu_item] workaround where applicable 2015-01-06 18:52:38 +11:00
Chris Beck
7adde8af9c lua: change a reference variable to a non-reference type
This line was not an error -- it is legal in C++ to bind a const
reference to a temporary value. It's only slightly more confusing
than usual in this case because the string it is built from is
a C-string owned by lua, and the temporary std::string object is
implicit.

I don't believe this commit will even make any difference in the
compiled code, it's only slightly simpler and more readable.
2015-01-06 00:00:04 -05:00
Charles Dang
7a9a13c80d Drop border_size= and usage= keys from NO_MAP_DATA 2015-01-06 15:39:36 +11:00
Charles Dang
2eff60bc42 Use [filter_condition] in AI_CANT_PLAY 2015-01-06 15:36:42 +11:00
Chris Beck
748f872091 lua: make it easier to disable strict mode global variables
After this commit, the "strict mode" lua variable errors may be
disabled with

  ilua.strict = false

and reenabled with

  ilua.strict = true

There will typically be no noticeable performance difference from
previously to this commit.

This is a bit simpler than the other methods described which
include using pcall or resetting the metatable of _G.
2015-01-05 14:58:09 -05:00
Chris Beck
567f135f1e Merge branch 'maybe_fix_23115' 2015-01-05 13:15:10 -05:00
Chris Beck
eaa078a86d initialize wml menu item handlers when they are set, not in ctor
this commit causes wml menu items to have their events registered
not during construction but only when "init_handler" is called.
it refactors the wmi_container object to do this when it
constructs new items via the [set_menu_item] path.

this is necessary because the items might be constructed before
the event queue even exists, and we want them to be able to
persist and be reactivated when a new campaign scenario starts.

more testing is necessary to determine if all code paths, including
carryover and reloading, are still working after this commit, and
the earlier commit 6fc1ac1bb224cddec5ccbb7f7865b69b1b093a01

See also discussion of bug #23115.
2015-01-05 12:47:32 -05:00
gfgtdf
486fc8ed71 fixup HEAD 2015-01-05 17:29:46 +01:00
gfgtdf
201d83f608 fix [store_side] to allow explicit indexes
[store_side] variable= some_variable[0] ... [/store_side] would result in a wesnoth.set_variable(some_variable[0][0]. ...)  call which we don't allow in master after https://github.com/wesnoth/wesnoth/pull/231. 1.12 would just ignore the second index in this case. I decided to rather fix [store_side] than to restore the 1.12 behaviour of set_variable (which wouldn't be harder).
2015-01-05 17:11:27 +01:00
Charles Dang
46fc0d4d93 Fixup HEAD, small formatting bit I missed 2015-01-05 20:57:05 +11:00
Charles Dang
3b43c7dcf1 Ran wmlindnet on unit tests. Some formatting had to be manually corrected 2015-01-05 20:42:12 +11:00
Chris Beck
18b5059b23 add some [time_area] unit tests 2015-01-05 02:34:09 -05:00
Ignacio R. Morelle
f61a0fa28e Merge pull request #358 from aquileia/VC_proj
Update wesnoth.vcproj
2015-01-05 03:09:16 -03:00
aquileia
a59440fe9e Update wesnoth.vcproj 2015-01-05 07:01:40 +01:00
Charles Dang
70e040791f Added a fortune 2015-01-05 13:09:27 +11:00
Boldizsár Lipka
a7a6aec3e5 Align overlays to unit's default_anim_image rather than absolute_image. 2015-01-04 20:25:55 +01:00
Charles Dang
1cab8b127f Eliminate a useless copy variable in intf_add_time_area 2015-01-04 23:32:37 +11:00
Charles Dang
e1e5169c95 Get [time_area] id from the config instead of passing it as a lua arg
This fixes [time_area] id= inadvertently becoming required, when it should be optional
2015-01-04 23:25:49 +11:00
Charles Dang
e9ed01ee5f Fixup HEAD
Restored a comma I accidentally deleted and fixed a minor style inconsistency
2015-01-04 23:19:11 +11:00
Charles Dang
8c7d6fecb7 Better code formatting for cpp_callbacks list
Especially used spaces as opposed to tabs
2015-01-04 22:37:24 +11:00
Charles Dang
dc807a0ab6 Always consider border hexes when filtering locations 2015-01-04 18:08:27 +11:00
Charles Dang
3f40d2f6e7 Fixup d38a656f41d1 , use WIN32 instead of GNUWIN32 2015-01-04 17:09:28 +11:00
Chris Beck
d38a656f41 xBRZ: try to fix a compiler warning on tdm-gcc 2015-01-04 00:53:52 -05:00
Chris Beck
36592738a2 move graphincludes projectfile to utils/
This is an old project to analyze header inclusions, described in
email from Yann Dirson here:

https://mail.gna.org/public/wesnoth-dev/2014-07/msg00009.html
2015-01-03 21:53:34 -05:00
Chris Beck
6ac21df1a8 cosmetic: tiny up punctuation in unit ctor initializer lists
See commit message for 7aea1c732a66e237eecfc5fd37665b760d8f0daf
why I did this
2015-01-03 21:36:06 -05:00
Charles Dang
01c10af623 T S1: don't show the 'You wouldn’t do anything stupid' dialog only once 2015-01-04 00:31:15 +11:00
Charles Dang
22f158e57d T S1: don't say you can always undo 2015-01-03 22:20:02 +11:00
Charles Dang
e10dfeb92c T: eliminate the 'gender' variable by using the SUF gender= key 2015-01-03 21:34:36 +11:00
Charles Dang
bf1a9b0752 T S1: don't make the objective summary bullets small 2015-01-03 20:01:26 +11:00
Charles Dang
3661f0ad3d T S1: improved movement lesson I wrote yesterday 2015-01-03 19:52:26 +11:00
Charles Dang
a50225922c T: converted character selection dialog to a custom GUI2 one 2015-01-03 15:35:46 +11:00
Chris Beck
7aea1c732a cosmetic: tidy up punctuation in controller ctor initializer lists
Moves the : and , to lead the lines rather than end them. This
makes the initializer lists a bit more readable, as it lines up
these punctuations and separates them from the initializer
expressions. It seems to be mordante's style in most of the GUI2
code to do it this way. It also has the advantage that each line
is paired with its matching punctuation mark, so if you need to
add or rearrange things, you never need to edit a line solely to
move a comma around, reducing the noise in the diffs.
2015-01-02 20:20:28 -05:00
Chris Beck
d356e8d53f play_controller: forward declare statistics context 2015-01-02 19:56:57 -05:00
Chris Beck
ba094eff71 persist manager: move ctor, dtor out of header
This allows to remove an unnecessary inclusion. Because the
persist manager is included directly by the play controller header,
this eliminates unnecessary inclusions in many files.
2015-01-02 19:29:39 -05:00
Chris Beck
3ff112831a unit_types: make experience_accelerator not an inner class
This allows to forward declare it, and avoid including
unit_types.hpp unnecessarily in many files via the header
play_controller.hpp.
2015-01-02 19:05:38 -05:00
Chris Beck
6a3321d0db fix bug #23130 (xp modifier not working), add unit tests
Reverts commit e85c37e161795794e1ae6d2c6b59377a16988c10 which was
an error.

I chose to use a scoped_pointer this time around because the
definition of play_controller should not actually depend on the
complete definition of unit_type.
2015-01-02 18:03:24 -05:00
Chris Beck
43a136fac1 Update INSTALL
notes about libintl option in scons
2015-01-02 14:43:52 -05:00
Chris Beck
66f69529b0 Merge pull request #351 from cbeck88/remove_bfs_option_ii
scons: remove boostfilesystem build option, replace with "libintl"
2015-01-02 14:34:40 -05:00
mattsc
1a58cf7706 Update Xcode project file 2015-01-02 06:48:14 -08:00
Charles Dang
5772004b2c T S1: tweak quintain conjure sequences 2015-01-02 23:14:43 +11:00
Charles Dang
0a95afb134 T: more logical order for [side] keys 2015-01-02 23:05:52 +11:00
Charles Dang
5fd385d542 T S1: only talk about leader crowns 2015-01-02 23:00:08 +11:00
Charles Dang
ac2a6ac9fd T: added proper team names for the good guys (internal and user-visible) 2015-01-02 22:42:07 +11:00
Charles Dang
6deb5a4883 T: hide dummy sides 2015-01-02 22:36:47 +11:00
Charles Dang
ad1f4b9641 T: added em-dash before 'Part I/II' in scenario name 2015-01-02 22:33:06 +11:00
Charles Dang
9f7a9a8965 T S1: light playlist instead of 'play ALL the music!' 2015-01-02 22:30:23 +11:00