my first merge :(

div 0 check

added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.

more server stubs

Pretension to switch to draw map page

add some connection facility to netserver

Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)

merge

audio_session is giving problems with multitasking so disabling it for now fix build

Finnished up the lua translations by adding training maps, campaign is ignored for now

disable large maps also on iphone3gs and ipodtouch3g, they fail to load sometimes

add the appirater class for getting more positive reviews enabled full multitasking for iphone (but only with ios >= 4.2) fixed a glitch that would leave stuff onscreen while ammo menu open

also updated TrophyRace to new system

lua access to data dir by GetDataPath and made a new scripting translation system with Locale.lua as library and .lua files under Locale. Updated maps Basketball and Knockball to this new system.

Frontend: * Fixed missing icon files on Win32

Add a stub for draw map page

return RGBA

clan color fetch

merge

add missing setter for botlevel

Updated Chinese translation

Pass hardcoded drawn map from frontend into engine \o/

removing all ; from lua script as an act of temporary rage and perfectionism

standardise name

pngcrush the new 2x previews. This "make the preview look a bit crisper at same size in iphone 4" is now costing us 2,916,716 bytes

Stub to recieve /draw command

- Pass map drawing data to engine - Hardcode one map for test purposes

forgot to update these files

Add drawn map into the list of map generators

fix crasher (somehow, might be glitchy)

merge

these should probably be expressly integer

band/bor/bnot to support Lua 5.1 lack of binary ops

Restore millisecond precision for mines time

Eh. Since you asked. AddAmmo hook for Lua

would help if I put it in the right routine

Add script hook onNewTurn to the end of AfterSwitchHedgehog. This should signal the very start of a new turn, immediately after CurrentTeam is switched.

code cleanup

Add QAspectRatioLayout borrowed from http://wiki.forum.nokia.com/index.php/CS001309_-_Maintaining_square_form_for_a_widget_in_Qt to maintain width == height * 2 aspect ratio for map drawing widget

team selection completely refactored, now has animation and more performance use a semi transparent black background color (on powerful devices) other smaller improvements and bugfixes

rendering optimisations. remove the recursive flames in explosions (might need more due to the gravity change in the new flames) but more usefully, eliminate a number of redundant Tint calls

Forts: reduce preview size and add hi-res one

try this mikade

merge

Always keep last point of drawn polyline

disable say, just don't do anything. trying to avoid spew on spectator join

string length checks

fix hsa/hta/hya

trying to unbreak hog speech

remove currentteam check

Allow hog speech when not your turn. Currently is set to 40% opacity (could be fainter) and drawn behind the hogs instead of in front. Also allows hog targetting using a number.

changing Tree Map theme to Halloween (this time on the right branch >_>)

update schemes for ios

added porkey and sheep hats

add a simple check to prevent loading sounds when device is muted

write some version information inside the application

merge

Halfplement decode/drawing routine

- Change painted map file format - Stub for uLandPainted.pas

add nil check