upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-29 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,295 Commits 56 Branches 373 Tags
Commit Graph

64295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Celtic Minstrel
d3374d3670 WML tags fixup 2016-04-04 20:10:52 -04:00
Celtic Minstrel
19fe2aa817 using -> typedef in some cases 
This is because MSVC 2013's using-alias support is buggy
 2016-04-04 18:29:39 -04:00
Celtic Minstrel
a791909544 Split the more complicated WML tags into separate Lua files 2016-04-04 17:03:38 -04:00
Celtic Minstrel
2d72d1512b Attempt to fix Travis build 2016-04-04 17:00:41 -04:00
Celtic Minstrel
74fd5395a9 Fix "set wesnothd path" preference 2016-04-04 15:55:05 -04:00
Celtic Minstrel
1bdce5b937 Fix build 
This fixes my build and should also fix the Travis builds.
 2016-04-04 15:55:04 -04:00
Celtic Minstrel
4f2367648e Update XCode project 2016-04-04 15:55:01 -04:00
Celtic Minstrel
ca6ec3b900 NULL -> nullptr 2016-04-04 15:55:00 -04:00
Celtic Minstrel
ff3e1bf83a Variadic config methods to combine remove_attribute or clear_children calls 2016-04-04 15:54:59 -04:00
Celtic Minstrel
38010fd991 Revert "remove unused queued_event parameter from WML_HANDLER_FUNCTION" 
This reverts commit 310ba26704873a89268d7dfef10f384a12ab2559.
 2016-04-04 15:54:57 -04:00
Charles Dang
0a7190c605 Updated cb projfile 2016-04-04 13:11:05 +11:00
Charles Dang
5d28a2caa5 Updated min_allowed_height to 600 2016-04-04 13:10:11 +11:00
gfgtdf
f96b4ad11f mix msvc build 
msvc doesn't accept NULL/0 in the std::function constructor
 2016-04-04 00:10:01 +02:00
Charles Dang
1492a237a1 Revert "Attempt to fix travis" 
This reverts commit 182732a04ce77a96ee1d2f81e6dde9b7de926a41.
 2016-04-04 02:40:28 +11:00
Charles Dang
e97b4f60e3 tloadscreen: use blank spaces for animation size label 
This reserved space for the label while removing the slight glimpse
of the full string when the loadscreen first shows.
 2016-04-04 02:37:46 +11:00
Charles Dang
182732a04c Attempt to fix travis 2016-04-04 02:28:09 +11:00
Charles Dang
aa449ee304 Removed two unnecessary boost includes 2016-04-04 02:23:45 +11:00
Charles Dang
37f29408d5 GUI2 tests: remove small resolution test sizes 2016-04-04 02:23:18 +11:00
Charles Dang
0ca4e6c943 Convert uses of boost functional to standard library variants 
This commit converts the following function calls:

* boost::bind                          -> std::bind
* boost::function and boost::functionN -> std::function
* boost::ref and boost::cref           -> std::ref and std::cref
* boost::bad_function_call             -> std::bad_function_call

In the process, it was discovered that std::bind has trouble with overloaded
functions. There were two such cases in the code:

* gui2::twindow had an ancient unused overload to draw(). The overload was removed.
* gui2::trepeating_button was binding tdispatcher::fire. This case was converted
  to a lambda.
 2016-04-04 02:20:52 +11:00
Charles Dang
1df91e0119 tbutton: provide alpha color values to satisfy schema 2016-04-03 23:45:27 +11:00
Charles Dang
2122973a42 ttext_box: reduced cursor height a little 2016-04-03 23:43:52 +11:00
Charles Dang
d3a825156e tgame_version: bump max dimensions to fit Lato font sizes 2016-04-03 23:39:42 +11:00
Charles Dang
0708069cc2 New design for vertical scrollbars (horizontal pending) 2016-04-03 23:32:04 +11:00
Charles Dang
00b571a8e1 Use large buttons for main panel in titlescreen 2016-04-03 21:16:57 +11:00
Charles Dang
0cdd8b7180 GUI2: draw buttons procedurally and increase default size 2016-04-03 21:16:56 +11:00
gfgtdf
479f1b3d52 also allow c++1y in SConstruct 2016-04-03 02:38:54 +02:00
gfgtdf
bc84ecf743 Attempt to fix gcc compilation 2016-04-03 02:07:49 +02:00
gfgtdf
1cc86a14af simplify start_local_game_commandline 
This makes start_local_game_commandline use the same functions that are
also used during normal gamestate inilisation in create_engine.

This specially fixes recuitlists in games stated via -m which was broken
since 09d40339168e322e4a1ab5dda3273db9ecfdb07b
 2016-04-03 00:56:36 +02:00
Celtic Minstrel
b8441bba24 Update scons and CMake 2016-04-02 16:05:28 -04:00
Celtic Minstrel
ca512b20c2 Fix several more cases of missed BOOST_FOREACH and FOREACH 2016-04-02 16:01:34 -04:00
Celtic Minstrel
7c37ad57bd Two new [message] features 
- ~LEFT() does the opposite of ~RIGHT(), but takes higher priority;
  use it to force an image to the left that's normally on the right
  (eg female silver mage)
- image=~RIGHT() means "use normal portrait, but on the right"
 2016-04-02 15:15:31 -04:00
mattsc
20b07c6379 Micro AIs: internal changes to AI and CA ID handling 
This is needed to fix some corner cases of multiple Micro AI changes
during a scenario, such as for the bats in the Goto test scenario.
 2016-04-02 07:54:57 -07:00
Charles Dang
9fc19a9fbd Convert two remaining cases of BOOST_FOREACH to range-for 2016-04-03 01:07:52 +11:00
Celtic Minstrel
0688e6df8f Formula engine: Expose WML unit/side variables 2016-04-02 09:39:09 -04:00
Celtic Minstrel
5c9923daba Formula engine: Add pair() function 2016-04-02 09:39:07 -04:00
Celtic Minstrel
cc7c124744 Merge branch 'lua_formula_bridge' 
Allows calling WFL code from Lua
 2016-04-02 09:38:59 -04:00
Celtic Minstrel
b503b6cfe1 Lua formula bridge now recognizes location objects 2016-04-02 09:38:56 -04:00
Celtic Minstrel
5fdad345f2 Formula engine: Generalize system of defining and instantiating functions 2016-04-02 09:38:52 -04:00
Celtic Minstrel
5bb6c30b05 Lua API: Add wesnoth.compile_formula which returns a callable userdata 2016-04-02 09:38:49 -04:00
Celtic Minstrel
ac4479090f Add a comparator function for lua_callable 2016-04-02 09:38:47 -04:00
Celtic Minstrel
38198e9151 Move config_callable to callable_objects.hpp and add a comparator function 2016-04-02 09:38:45 -04:00
Celtic Minstrel
4d1c9bdd43 Add wesnoth.eval_formula which compiles and evaluates a formula in the formula engine 2016-04-02 09:38:43 -04:00
Celtic Minstrel
bfc6744b03 Workaround for MSVC2013's buggy atomic 2016-04-02 09:38:38 -04:00
Celtic Minstrel
fe818f8005 Add Lua API function to set the current time of day 2016-04-02 09:38:34 -04:00
Celtic Minstrel
ca382018b7 BOOST_FOREACH -> range for 2016-04-02 09:38:29 -04:00
Celtic Minstrel
104ccf6e36 Remove obsolete class from FormulaAI 
This class appears to stem from the days when FormulaAI was implemented as a separate AI algorithm,
rather than as an engine of the composite AI. Apart from one function which didn't access anything in
the class (and has been moved elsewhere), the class was entirely unused.
 2016-04-02 09:38:22 -04:00
Nils Kneuper
adb0abfb6d add boost-thread to cmake recipe, part2 2016-04-02 10:24:17 +02:00
Nils Kneuper
f758706ea2 fixed compiling with CMake in a hacky way 
* Switched from C++98 to C++11 (as announced on the dev-ml)
* Added support for boost-thread

The current implementation is hacky and not clean. It at least builds on
my gentoo ~amd64 system.
 2016-04-02 10:15:54 +02:00
Charles Dang
c5ac29d505 Revert use of std::to_string in config 
to_string has problems with floating point types
 2016-04-02 11:05:59 +11:00
gfgtdf
aaf9cb406f fix a c++11 todo 2016-04-01 22:35:23 +02:00