git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11627 4a71c877-e1ca-e34f-864e-861f7616d084

Fixes ticket:2150

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11630 4a71c877-e1ca-e34f-864e-861f7616d084

…ories are disabled.

Using random icons for now, until the right icons are drawn.

… to Ryo Ohki

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11631 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11632 4a71c877-e1ca-e34f-864e-861f7616d084

- Weaken Flak Cannon and Sunburst a lot more. I'm pretty sure this change makes them too weak, but when introducing new weapons it's better to make them too weak than too strong.
- Increase HP of a bunch of VTOL weapons
- Slightly buff Hurricane/Whirlwind

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11635 4a71c877-e1ca-e34f-864e-861f7616d084

Check if there's a \n at the end, if not, append one. Before, it checked for a
\n anywhere in the string, and if there was, wouldn't append one.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11640 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11641 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11642 4a71c877-e1ca-e34f-864e-861f7616d084

This will prevent warnings when the archives don't exist (for clean builds),
and remove files from the archives that have been removed from the repo (for
unclean builds).

Backport of r11552 and r11554.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11643 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11644 4a71c877-e1ca-e34f-864e-861f7616d084

Closes Warzone2100#1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11646 4a71c877-e1ca-e34f-864e-861f7616d084

Closes Warzone2100#2157.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11647 4a71c877-e1ca-e34f-864e-861f7616d084

… (doesn't make sense lore-wise, and did too much friendly fire to be useful).

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11648 4a71c877-e1ca-e34f-864e-861f7616d084

…and force localOptionsReceived to be true as well, since that is what controls the drawing routines.

Fixes ticket:2136

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11650 4a71c877-e1ca-e34f-864e-861f7616d084

…ifferently now.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11651 4a71c877-e1ca-e34f-864e-861f7616d084

…th units shooting through the ground.

refs ticket:2152


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11652 4a71c877-e1ca-e34f-864e-861f7616d084

…o. :P)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11653 4a71c877-e1ca-e34f-864e-861f7616d084

…lease cycle with the other patches mentioned in that ticket.

refs ticket:2151


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11654 4a71c877-e1ca-e34f-864e-861f7616d084

Closes Warzone2100#2163.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11656 4a71c877-e1ca-e34f-864e-861f7616d084

Closes Warzone2100#2090.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11657 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11658 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11663 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11664 4a71c877-e1ca-e34f-864e-861f7616d084

Motivation of this patch was because of some whiny guy on IRC. ;)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11668 4a71c877-e1ca-e34f-864e-861f7616d084

Closes Warzone2100#2098.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11673 4a71c877-e1ca-e34f-864e-861f7616d084

…ax amount allowed.

Fixes ticket:2175

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11674 4a71c877-e1ca-e34f-864e-861f7616d084

… up.

Will apply the patch that fixes the issue when I find it.


refs ticket:2174

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11675 4a71c877-e1ca-e34f-864e-861f7616d084

Randomness from http://whatthecommit.com/ :
things occurred


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11682 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11684 4a71c877-e1ca-e34f-864e-861f7616d084

…tween spawn periods.

Fixes ticket:2174

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11692 4a71c877-e1ca-e34f-864e-861f7616d084

refs ticket:2171

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11693 4a71c877-e1ca-e34f-864e-861f7616d084

refs ticket:2171

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11694 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11695 4a71c877-e1ca-e34f-864e-861f7616d084

…y, it really should be fixed in the scripts, however, this will not harm anything, just note that the current limit is MAX_FACTORY which is currently 5.

This will *not* fix savegames that already went past the limit!

NOTE: Our next release after 2.3.5 will have it fixed in the scripts.

refs ticket:2173

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11697 4a71c877-e1ca-e34f-864e-861f7616d084

refs ticket:2171

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11698 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11700 4a71c877-e1ca-e34f-864e-861f7616d084

…t that there was a error.

It will only do this once every ~30 secs since the last LOG_ERROR was generated to prevent spamming.

This is to help windows and mac users know that there was a error condition, and they need to check their logs.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11702 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11703 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11705 4a71c877-e1ca-e34f-864e-861f7616d084

…rzi" (kick icon) "CinC" (VTOL/NO VTOL icon) and "n2large0shirt" (Cyborg / no Cyborg icon)

Thanks to Mysteryem for cleaning up the icons and doing some modifications as well so they all match the theme.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11710 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11711 4a71c877-e1ca-e34f-864e-861f7616d084

Cleanup: At old .pie and some .txt Files |
Adding needed Texpages: To make sure that it runs correctly in the future

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11712 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11713 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11718 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11726 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11727 4a71c877-e1ca-e34f-864e-861f7616d084

Refs Warzone2100#2199.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11729 4a71c877-e1ca-e34f-864e-861f7616d084

Closes Warzone2100#2199.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11731 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11732 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11733 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11734 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11736 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11742 4a71c877-e1ca-e34f-864e-861f7616d084

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11744 4a71c877-e1ca-e34f-864e-861f7616d084

… Closes ticket:2202

fixes ticket:2209

…. Update ChangeLog.

(cherry picked from commit 6e3821c)

… char hash.

(cherry picked from commit 9b9d178)

Was hard to see it was broken, since the po/ directory keeps getting modified, so "(modified locally)" is often correct.
(cherry picked from commit ba7100f)

The --count option was introduced in f69c501832ecd6880602c55565508e70c3a013d5 in git v1.7.2-rc1.
(cherry picked from commit 405ae28)

(cherry picked from commit 22cda4f)

Also some other git related housekeeping.

…rom.

(cherry picked from commit 9b10824)

Patch Author: Safety0ff
fixes ticket:2300

Original detective work done by Ai_Tak (ticket:1656)

Signed-off-by: buginator <buginator@gna.org>
(cherry picked from commit 1a6fb8a)

Closes Warzone2100#2261.
(cherry picked from commit 255a0e2)

DejaVu fonts: 2.31 -> 2.32
freetype: 2.3.12 -> 2.4.3
gettext: 1.18.1 -> 1.18.1.1
libogg: 1.2.0 -> 1.2.1
libpng: 1.2.44 -> 1.4.4
libvorbis: 1.3.1 -> 1.3.2
(cherry picked from commit fe941ab)
(cherry picked from commit 064edb1)

refs ticket:1581
fixes ticket:2313
fixes ticket:2234

Fix rearming pads so they actually rearm at the speed they're intended to. Also make rearming upgrades affect rearming pad repair speed. Replaces REARM_PAD.currentPtsAdded with REARM_PAD.timeLastUpdated, but savefiles should still be compatible.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8865 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 75569d1)

Conflicts:

	src/game.c
	src/structure.c
(cherry picked from commit 6421c81)

Closes Warzone2100#2316.

…ELEVATION_SCALE.

Changelog: Fix projectiles going through terrain due to bad terrain height calculations.
Changelog: Fix terrain shading.

…chs due to players not agreeing who owned what.

The check against selectedPlayer was incorrect, it caused clients with max trucks + 1 to not believe anyone could give trucks to anyone else.

Introduced in e6cd099.

Changelog: Really fix truck limit when giving trucks.

…ctures when looking at their targets.

This reverts commit 34112c9.

…system.

Closes Warzone2100#2300.

Some distributions disallow this (newer Ubuntu for example), so the gdb call
didn't output anything useful. Based on a patch by Safety0ff.

Closes Warzone2100#2098.

… to compile with -O2 but without -Wno-error.

This looks like a huge commit, because it touches lots of files.

…y too many times. Based on patch by Buggy.

Throw in a few checks for changing player position or team, too.

Closes ticket:2346.

Changelog: Fixed crash for all players when the last player clicks "Ready" too many times.

Refs Warzone2100#2098 & Warzone2100#2316.

Closes Warzone2100#1347.

Closes Warzone2100#2366.

Refs Warzone2100#2367.

Closes Warzone2100#2376.

(cherry picked from commit d2a1422)

…riptive and locale-dependent. Patch by Emdek, closes ticket:2303

(cherry picked from commit e41fa8f)

Closes Warzone2100#2387.

Closes Warzone2100#1347.

… continue treat them as binary for merges though

Hopefully fixes ticket:2416.

1 case of:
W_FORMINIT sForminit;
memset(&sFormInit, 0, sizeof(W_BUTINIT));

4 cases of:
W_FORMINIT sButinit;
memset(&sButInit, 0, sizeof(W_BUTINIT));

Closes Warzone2100#2418.

Closes Warzone2100#2408.

freetype 2.4.4
libogg 1.2.2
libpng 1.4.5

…e power, from 5*FPS/(N+1) to 25/second.

Previous code was insane, despite some previous attempts at improving the indentation of the code, and meant that players with better graphics cards could build, produce and research 5x-10x faster.

Changelog: Construction, production and research speeds are no longer linearly dependent on framerate on high oil maps.

Some damaged droids wouldn't retreat when setting the droid retreat level (and probably didn't get the setting, either).

Changelog: Setting droid retreat on damage now works, even if selecting more than 100 droids.

Closes Warzone2100#2437.

Closes Warzone2100#2442.

Redundantly, the data length was redundantly sent twice, which was redundant.

Changelog: Usernames such as "Meów" will no longer be truncated at the first unicode character to "Me" when restarting Warzone 2100.

…cilities.

Changelog: Fixed delivery point placement for cyborg factories and repair facilities.

…ming people clicked wherever the mouse moves to later.

In theory, this should make the UI usable, even on machines that don't consistently get 10000 FPS.

Because WZ widgets are weird, just make the widgets pretend that the mouse stopped moving after clicking or releasing in a given frame.

If you click twice in the same frame, the second widget will still greedily steal the mouse click from the first widget.

Changelog: Try to improve UI responsiveness under low framerates.

…"multiop" menu.

Weird stuff could happen, such as the client thinking it's a host when it isn't.

Changelog: Fix clients getting confused when trying to leave a game before it starts by pressing the Escape key.

…KEYUP.

This is due to a seemingly undocumented bug and/or feature in SDL, where SDL_EventState and SDL_SetEventFilter mysteriously discard all pending events.

The following SDL code in SDL_EventState and SDL_SetEventFilter discards all pending events, with a comment saying it does so:
    while ( SDL_PollEvent(&bitbucket) > 0 )
        ;
There appears to be no documentation of this fact anywhere outside the comment in the SDL code.

I am not aware of any logical reason why enabling events with SDL_EventState should cause less events to be received than otherwise.

…werBar() functions into a 45-line intDisplayBar() function.

Changelog: Print distances and speeds in terms of tiles.

…playing bars.

Fixes ticket:912.

Changelog: Fix health bars displayed over empty terrain, when set to always display energy bars.

If starting a T3 game, leaving the game, and joining a T1 game, the player would have an 18% construction speed advantage over the other players.

Changelog: Fix construction speed upgrades being preserved even between games.

…ove weird casts.

… own buildings or units.

(cherry picked from commit e181461)

…our of two new ones. First is armed with seraph missiles,

the second with both seraph missiles and gauss cannon on a dragon body.

Closes Warzone2100#2443.

(cherry picked from commit 826a0ef)

… use.

…down 5%. Cannon damage to buildings and hardpoints up 10% and to bunkers up 25%

…ampaign

lib/framework/wz2100icon.h created from the 32x32 icon from
icons/warzone2100.ico by the Gimp's C code export.

Closes Warzone2100#2465.

(cherry picked from commit f378c9e)

Can be set as "DOWNLOADS=/where/ever/you/want" in win32/__BUILD_CONFIG.USER.

(cherry picked from commit ce3de81)
(cherry picked from commit 7d18ab8)

Use wzhost.wz2100.net instead of fontys.nl.

(cherry picked from commit 7232b97)

(cherry picked from commit caee6e3)