Commit Graph

48311 Commits

Author SHA1 Message Date
Gunter Labes
bb1510c055 avoid multiple side initialisation
remember side initialisation in the play_controller where it belongs
fixes bug #19161
2011-12-18 15:54:55 +00:00
Anonymissimus
f8c4f1f121 changelog correction 2011-12-18 15:11:19 +00:00
Anonymissimus
68aaf39c11 Revert code-modifying revisions related to bug #19188 conflict-free,
since they break compatibility.

This reverts

2011-12-16T01:24:54Z!anonymissimus@arcor.de
2011-12-16T04:06:47Z!Majora700@gmail.com
2011-12-16T04:08:22Z!Majora700@gmail.com
2011-12-16T04:14:58Z!Majora700@gmail.com
2011-12-16T20:13:27Z!anonymissimus@arcor.de
2011-12-16T20:14:08Z!anonymissimus@arcor.de
2011-12-16T20:48:39Z!Majora700@gmail.com
2011-12-17T09:46:29Z!Majora700@gmail.com
2011-12-18 15:10:16 +00:00
Ali El Gariani
6c12a85cc0 Fix bug #19199 (segfault when local ToD area is rendered early)
Was caused when image cache reallocation triggered during the
construction of a lightmap
2011-12-18 14:46:55 +00:00
Nils Kneuper
2e6d08337d updated German translation 2011-12-18 10:32:57 +00:00
Steven Panek
19c5dae932 Updated the Latin translation. 2011-12-18 06:05:26 +00:00
Simon Forsyth
5133d663b5 OS X release notes 2011-12-18 03:59:05 +00:00
Steven Panek
a287c68732 Updated the changelogs. 2011-12-18 03:27:20 +00:00
Gunter Labes
2c86f7396f removed conflict markers and fixed style issues 2011-12-18 00:15:47 +00:00
Steven Panek
a77a993a5c Reverted revisions 2011-12-17T23:43:03Z!Majora700@gmail.com and 2011-12-17T23:44:02Z!Majora700@gmail.com...
...since it seems that 2011-12-17T23:28:31Z!Majora700@gmail.com fixed bug #19118.
2011-12-17 23:47:41 +00:00
Steven Panek
5e943953fb And fixed the default theme too... 2011-12-17 23:44:02 +00:00
Steven Panek
6b04e4ee45 Made it so that the coordinates do not overlap...
...with the clock status panel on the lowest supported resolutions,
thus fixing bug #19118.
2011-12-17 23:43:03 +00:00
Ali El Gariani
25ad2502de update changelog 2011-12-17 23:29:59 +00:00
Steven Panek
ed5e2c1147 Made it so that AM and PM show up...
...when using the smallest supported resolutions.
2011-12-17 23:28:31 +00:00
Steven Panek
fcc8108c56 Made the Lancer and the Deathblade conform...
...to the current AMLA standards, thus fixing bug #19196.
2011-12-17 23:09:33 +00:00
Simon Forsyth
bd5512489b Remove assertions in lock_surface functions
A surface may be safely locked without being neutral
They also prevent bug #18319 from being resolved
2011-12-17 22:58:20 +00:00
Simon Forsyth
3892835529 Replace tropical forest with Mefisto's new version
There is an unused forested-tropical-hills-tile.png image
It allows a hill tile in the editor after string freeze is over
2011-12-17 21:45:22 +00:00
Simon Forsyth
80269b2295 Update Xcode project file 2011-12-17 20:44:19 +00:00
Mark de Wever
63528912fa Fixes crash when using fullscreen on Mac OS.
Fixes a problem when using the SDL nightly builds (post 1.2.14).

The direct blurring of the screen fails on OS X, since the surface is
not a neutral surface, so only testing for 32 bpp isn't enough. Exports
the neutral surface test from sdl_utils to have a proper test in the
canvas code.

This commit helps fixing bug #18319, but the speed of rendering is still
too slow.

Thanks to Alarantalara for testing the code on OS X.
2011-12-17 20:27:56 +00:00
Anonymissimus
d5c0c6684e mute some MSVC warnings 2011-12-17 20:26:45 +00:00
Gunter Labes
62a59d960f avoid auto-kicking unregistered users 2011-12-17 20:07:28 +00:00
Gunter Labes
0ad3e8ce13 made sockets close-on-exec
avoids leaking FDs, for example on graceful wesnothd restarts
2011-12-17 18:18:51 +00:00
Anonymissimus
053fbc4037 Revert "testwise enable --std=c++0x in CodeBlocks"
This reverts commit 2011-12-14T14:50:39Z!anonymissimus@arcor.de.

There appears to be at least one fatal c++0x bug yet;
std::stable_sort, messing up the campaign selection menu.
2011-12-17 18:10:25 +00:00
Mark de Wever
6c6bf6e3a2 Added the NativeClient port code.
Thanks to Evgeniy Stepanov for providing the patch.
2011-12-17 16:37:19 +00:00
Nils Kneuper
828550e58d updated Hungarian translation 2011-12-17 15:29:28 +00:00
Ali El Gariani
7ca44f7ac6 Big optimization of terrain rendering by removing all empty images.
This make screen update (zooming, ToD changes, etc) several times
faster, gain some fps (esp. for complex map), optimize some animated
terrains (stop refreshing empty parts) and spare some memory
(sometimes, not clear yet)

Also remove the noise in :layers.

Note: This is an improved version of 2010-10-06T16:07:43Z!alinkmaze@gmail.com from the OGL branch
2011-12-17 15:07:07 +00:00
Mark de Wever
4999183fa0 Fix some compiler warnings. 2011-12-17 13:27:33 +00:00
Steven Panek
b116156ef0 Updated the changelog. 2011-12-17 09:48:28 +00:00
Steven Panek
ffb4aa7a06 Made it so that [store_side] also stores current_player. 2011-12-17 09:46:29 +00:00
Steven Panek
44cbafee63 Reverted 2011-12-16T20:13:27Z!anonymissimus@arcor.de through 2011-12-16T20:14:24Z!anonymissimus@arcor.de; redid 2011-12-16T04:06:47Z!Majora700@gmail.com right. 2011-12-16 20:48:39 +00:00
Anonymissimus
e2b5f1694d changelog correction 2011-12-16 20:14:24 +00:00
Anonymissimus
7b9233abe6 fix bug #19188 the way I envisioned it 2011-12-16 20:14:08 +00:00
Anonymissimus
bbaa97e898 Revert 2011-12-16T04:06:47Z!Majora700@gmail.com, 2011-12-16T04:08:22Z!Majora700@gmail.com and 2011-12-16T04:14:58Z!Majora700@gmail.com.
1. The internal type is a std::string, the lua getters/setters should
reflect that like all the existing ones already do instead of making
implicit conversions.

2. It doesn't make sense to convert the already translated string
into a t_string again upon getting it.

3. The setter in team.cpp you added is redundant.

4. The attribute is apparently not really meant to be modified
by lua or wml so a tag is no good idea.
2011-12-16 20:13:27 +00:00
Ali El Gariani
7347c81e19 Re-add image path function ~L() (revert 2011-12-16T03:38:59Z!alinkmaze@gmail.com)
Also adapt it to a recent change and remove an old limitation: now the
lightmap can have any size and is just resized to the image.  This
make it easy to use ~L() on animated units, making it more useful
2011-12-16 18:15:41 +00:00
Nils Kneuper
cd9d141c3a updated French translation 2011-12-16 12:08:05 +00:00
Steven Panek
0908ba7c1b Updated the British English translation. 2011-12-16 10:53:09 +00:00
Elvish_Hunter
06e86684fc LoW: fixed a Lua error in Ka'lian Under Attack, as reported in the forums 2011-12-16 10:47:52 +00:00
Steven Panek
34cef6dced Updated the British English translation. 2011-12-16 04:43:40 +00:00
Steven Panek
8376a5d764 Updated the Old English translation. 2011-12-16 04:36:45 +00:00
Ali El Gariani
b5cf301848 oops, fix test compilation broken by 2011-12-16T03:38:59Z!alinkmaze@gmail.com 2011-12-16 04:24:19 +00:00
Steven Panek
a0336a9be4 Updated the changelogs. 2011-12-16 04:22:50 +00:00
Steven Panek
380bf42665 And modify current_player as necessary in the tutorial's second scenario... 2011-12-16 04:14:58 +00:00
Steven Panek
c023cd71af If Li'sar is selected in the tutorial,
...change the current_player attribute to suit her. Fixes bug #19188.
2011-12-16 04:08:22 +00:00
Steven Panek
8eaa9c2ec6 Made it so that [modify_side] is able to change...
...the current_player attribute; made the Lua stuff return the
attribute in the form of t_strings.
2011-12-16 04:06:47 +00:00
Ali El Gariani
62d2e838c6 Optimize ToD update by skipping an useless step in lightmap application 2011-12-16 03:39:04 +00:00
Ali El Gariani
1e12b3b999 Remove internal image path function ~L() which applied lightmap.
Not used anymore by the ToD engine. I hesitated to let it live there
but just realised that it requires lightmap having same width as the
image, which makes it too limited.
2011-12-16 03:38:59 +00:00
Anonymissimus
c3e5ea2068 changelog update 2011-12-16 01:30:47 +00:00
Anonymissimus
84daf26ecf add lua getter and setter for [side]current_player 2011-12-16 01:24:54 +00:00
Ali El Gariani
a97f15e7c9 Optimize framerate and memory for complex ToD areas
(perf cost is now minimal)

Manipulate light info in a small binary format with a dedicated cache
instead of abusing image path functions for every terrain images.
This is much faster and fix any risks of growing image cache when
overusing ToD effects.
2011-12-15 21:42:00 +00:00
Nils Kneuper
91a4c37692 updated Galician and Lithuanian translation 2011-12-15 21:04:44 +00:00