57522 Commits

Author SHA1 Message Date
Turuk
a062c17ebe Altered WML that allowed for 4 difficulty levels. 2014-06-18 14:50:54 -04:00
Turuk
b7b74b4b96 Altered WML that allowed for 4 difficulty levels. 2014-06-18 14:45:37 -04:00
Turuk
a12340c3d5 Altered WML that allowed for 4 difficulty levels. 2014-06-18 14:42:45 -04:00
Turuk
8e645c4605 Altered WML that allowed for 4 difficulty levels. 2014-06-18 14:30:41 -04:00
Turuk
ac36feeee1 Altered WML that allowed for 4 difficulty levels. 2014-06-18 14:17:19 -04:00
Turuk
85913e2ac2 Altered WML that allowed for 4 difficulty levels. 2014-06-18 14:13:43 -04:00
Turuk
130574cd9a Altered WML that allowed for 4 difficulty levels. 2014-06-18 14:12:23 -04:00
Turuk
9ad308501e Altered WML that allowed for 4 difficulty levels. 2014-06-18 14:07:03 -04:00
Chris Beck
32848679ad Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-18 14:05:45 -04:00
Chris Beck
458c2f0f06 set travis back to gcc 4.6 version
The gcc-4.8 patch requires travis to download and install gcc-4.8
from an ubuntu ppa. This takes a few mintues and the gcc build is
already fairly close to the timelimit, so this change can push
some builds over the edge. Since it doesn't seem to be strictly
necessary right now, I comment out the code for v 4.8 install.
2014-06-18 14:04:33 -04:00
Turuk
46f5ff36d3 Altered difficulties= 2014-06-18 14:03:59 -04:00
Chris Beck
bc4b4a9569 remove declarations of fcns that we were moved
fixes up a4b194c0794d360dc6eff5c464c6634941dff5da
2014-06-18 14:03:47 -04:00
Turuk
a15c39fe17 Changed from 4 to 3 difficulty levels for balancing.
Revamping difficulty levels to aid in upcoming balancing for "expert" campaign.
2014-06-18 14:03:20 -04:00
Chris Beck
c3ad891fba Merge pull request #208 from cbeck88/add_recall_list_mgr
add recall list manager
2014-06-18 13:54:29 -04:00
Chris Beck
a4b194c079 add recall list manager
This commit adds a dedicated recall list manager class.

The purpose of this is to

- Simplify the code that interacts with the recall list. Prior to
the commit most such code was based on iteration with explicit
iterators, and called global helper functions implemented in
unit.cpp to wrap the code that finds a unit in a vector. It turns
out that interacting with the recall list was the *only* use of
that code, so we make it a member function of the recall list
manager and take it out of unit.cpp.

Most of the code that touches the recall list was previously
7 or 8 lines with a for loop, now it tends to be 1 or 2 lines,
although further refactor may be possible.

- Improve encapsulation. This makes it possible to track how
other classes are interacting with the recall list, and may
make it easier to debug recall list problems by adding debugging
output to the class.
2014-06-18 12:54:32 -04:00
Chris Beck
12515a6466 Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-18 11:33:31 -04:00
Chris Beck
000c71a2c2 fixup 9e7dc5ba008298d823c13cff214f7477601b5efd
The scoped_ptr<unit> construct which was used previously in
actions/create.cpp is unnecessary after this commit, and it seems
like it could be related to this error report:

http://wesnoth.org:8080/job/Wesnoth/branch=master,compiler=default,label=Debian7-64/185/consoleText

The most significant change of this commit is that
unit_creator::add_unit now does not make a "temporary" unit
instance from the cfg, and then copy construct it. From source
inspection that step appears to be unnecessary, and it somewhat
obfuscates the meaning of this code in actions/create.cpp
2014-06-18 10:52:40 -04:00
mattsc
9593d10050 Update Xcode project 2014-06-17 17:50:11 -07:00
Chris Beck
393a16e871 favor to return a smart pointer in ai/actions recall_unit 2014-06-17 19:32:26 -04:00
Chris Beck
d119fe7e18 fixup the fixup
this fixes up a0b849596cabf8ed801dacb6707001ad944dc0a5
2014-06-17 19:20:13 -04:00
Chris Beck
a0b849596c fixup 9e7dc5ba008298d823c13cff214f7477601b5efd 2014-06-17 18:47:59 -04:00
Alexander van Gessel
3fe799a091 Change run_wml_tests failure exit code from 1 to 2
xvfb-run returns 1 when it fails, so this way we can differentiate.
2014-06-17 23:40:41 +02:00
Alexander van Gessel
1536aa1021 Actually return the script's output 2014-06-17 23:24:10 +02:00
Chris Beck
6547c7e9e8 remove unit_map include from unit header 2014-06-17 16:33:31 -04:00
Chris Beck
d5aa4d3058 fixup a warning 2014-06-17 16:01:27 -04:00
Chris Beck
1aed8cb3ed use a cheaper version of get_visible_unit when we only want bool
In src/actions/create, move
2014-06-17 15:39:02 -04:00
Alexander van Gessel
05d2fdfe4a Make jenkins-wrap.sh executable 2014-06-17 21:10:30 +02:00
Alexander van Gessel
673934c127 Test wrapper for jenkins
xvfb occasionally fails to start, causing xvfb-run to return 1.
If that happens rerun it up to 9 times.
2014-06-17 20:56:51 +02:00
Chris Beck
9266fd3926 Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-17 14:25:10 -04:00
Chris Beck
3d6bcb4c39 move animation cache from play_controller to only fcn that uses it
This allows us to eliminate two headers and move code out of
play_controller, and keep related code together. The cache is
now a static variable in the only function that calls it.
2014-06-17 14:23:39 -04:00
gfgtdf
6b3af33fc8 fix replay saves 2014-06-17 19:53:11 +02:00
gfgtdf
d1ec28507e more log on corrupt saves 2014-06-17 19:53:10 +02:00
Chris Beck
a8a132692d remove unused member of game_display 2014-06-17 13:30:43 -04:00
Chris Beck
8106be91e5 Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-17 13:17:29 -04:00
Chris Beck
1cc51deb87 remove unit.hpp include from game_display.hpp 2014-06-17 13:17:14 -04:00
Boldizsár Lipka
050235c439 Render everything on the loadscreen using the renderer API.
Only when building against SDL2, obviously.
2014-06-17 18:49:42 +02:00
Boldizsár Lipka
c59414b121 Enable rendering text as a texture. 2014-06-17 18:49:42 +02:00
Boldizsár Lipka
976e439d97 Match function declarations with definitions. 2014-06-17 18:49:42 +02:00
Boldizsár Lipka
fac9ea5617 Render floating images as textures on the storyscreen. 2014-06-17 18:49:42 +02:00
Boldizsár Lipka
26d40c15c9 Render background layers as textures on the storyscreen. 2014-06-17 18:49:41 +02:00
Boldizsár Lipka
c69b5a3bb6 When retrieving dimensions, return the scaled size of the texture. 2014-06-17 18:49:41 +02:00
Boldizsár Lipka
4bbdc09af6 Return an int for the width/height of ttexture.
SDL (and all of our own functions) use ints, so having these functions
return an unsigned value can lead to all kinds of two's complement
troubles.
2014-06-17 18:49:41 +02:00
Boldizsár Lipka
d6ea2e0290 Set the color mod before rendering. 2014-06-17 18:49:41 +02:00
Boldizsár Lipka
20b0ea6ab3 Initialize texture alpha mod to 255 instead of 0. 2014-06-17 18:49:41 +02:00
Boldizsár Lipka
f698ddabdc Remove set_blend_mode from ttexture.
I can't think of any use case when we would use anything else than
SDL_BLENDMODE_BLEND. If anyone can, they can re-add it.
2014-06-17 18:49:40 +02:00
Boldizsár Lipka
616ab5f656 Store alpha value in ttexture and set it before drawing.
Several ttexture instances may share a single SDL_Texture, so having
everyone store their alpha mod directly in the SDL_Texture object is not
viable.
2014-06-17 18:49:40 +02:00
Boldizsár Lipka
752b42c02e Use the correct cache for non-hexed images. 2014-06-17 18:49:40 +02:00
Boldizsár Lipka
10af944c1d Do set the color mod on the actual texture. 2014-06-17 18:49:40 +02:00
Boldizsár Lipka
561cb5bc7d Add a separate cache for brightened images. 2014-06-17 18:49:40 +02:00
Boldizsár Lipka
6181499b1c Don't rotate the logo on the loadscreen.
That was some test code committed by mistake.
2014-06-17 18:49:39 +02:00