Merge

copypasta fail

Ban .svg, .psd, .sifz from being present in 'make package_source' output

off by 1 error in resurrector index

Some fixes

merge (stupid reflexive pull -u)

engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine

Useless

last-minute pl updates

fixed breakage of game schemes

Updated spanish translation

merge

Add 0.9.14 and 0.9.15-dev mapping

distribute health evenly amongst graves instead of randomly - avoid situation where a grave stays dead

Apply typo fix also here

Remove "-dev" suffix

ok... combine a tick check with texture percentage check. this should be a lot less frequent

Fix typo in russian translation, update english translation with plural forms

Also switch saucer from updating every N ticks to updating as-needed.

update translation files for the 4265 text change

Switch to Damage - Tag is already in use

translation update for the release

remove floating point/rounding

bugfix. correct crossplatform tips

only update flamethrower texture when the percentage changes

improve behaviour of resurrection. pull in 4254 and 4259 which replace random with index

raised version number

pull bugfix into 0.9.14 avoid major performance hit when using flamethrower

exposing Henek's no wind flag

Fix typo

yay i'm free to break things again!

Make server listen on ipv4 interface only

drillstrike! might require the drill patch to improve behavior

merge this two safe commits from trunk to release branch

iphone interface

added getrandom and addcaption to lua

Revert to old server in branch 0.9.14

Move resurrection to utilities, reduce its probablit a bit to match other utilities, rename the "hint" prop since it really isn't being used as a hint anymore. That can be put back if it changes.

er. and cast to TAmmoType, which burp's routine still requires :)

Forgot burp's new ammo routine

Fix a long-standing bug with ammo due to gstMoving being set on gears generically, causing an incorrect ammo type to be set. This caused crashes and incorrect ammo types.

by default selecting a game mode will select a weapon with the same name, and viceversa; toggable for every game

added function GetHogTeamName to lua, makes TeamsCount more useful

added TeamsCount and TotalTurns to lua as requested by mikade

hide crosshair when switching to no weapon

make weapons on rope/parachute/UFO inherit momentum of the hog. needs testing of course

tweak interface, there is no need to manually add new weapons and schemes to the filter list

added two games modes and one weaponset

removed altuse property for sticky mines

Even more png optimizations

More png optimizations

Optimized graphics by size using 'optipng -o5 -np -nc -nb *.png'

compensate a bit for the reduction in power by increasing target height, avoids bouncing off terrain.

Revert yet again for breaking stuff. No more chances on this. If there'd been a release, this would have been twice with serious breakage. P.S. - as per koda's complaint last time, only reverted the non-iphone, probably means iphone is now broken. Oh well.

No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time

changelog

restore circle

added missing game modifiers to lua

merge again? :o

fix so gfDisableWind can infact be used in lua

added flag gfDisableWind to be used in lua scripts

Fix wrong order in results screen when players team up

merge

inactivate sudden death if both health decrease and water rise is 0 and lower sudden death turns to 50 again

fix preview for the FlightJoust test map (not for release)

smaller update (color and modes)

Darken blue, brighten cyan to make more distinguishable, replace gold with peach. Should hopefully resolve objections about colour distinguishability

this time i got it right, i'm sure of it; TEST ANYWAYS

revert 4200:dd54999c2822 - it was breaking schemes. koda. just leave this alone until next release

no need to clear this flag

revamp gamemodes section in the ifrontend and update ios game modes move minestime and turntime *1000 away from frontend and move it in engine (preserving lua compatibility)

better end of turn in infinite attack mode. NEEDS TESTING.

oops, remove weapon delays for clean slate - or else crates get frustrating

keep Clean Slate mode closer to default. the increased health in crates and the increased damage isn't really needed.

swedish translation tweaks

swedish translation

JAWOHL! German translations

Merge README and CREDITS files into CREDITS

SOMEONE SET US UP THE BOM!

remove BOM from ja.txt, fix line endings

err better wait after relase for this one

move turnstime and minestime * 1000 outside frontend and place it in engine

japanese gets some love

Credit comunity submitted content

hee hee

pt again

Fix stats messages Add ru description

merge

fix about.cpp and update swedish locale

Fix vertical Sky line with some cards in Castle theme

pt_BR, the return. also fix line ending screwups

remove last warnings from xcodeproj update credits

spanish translation

merge

fix stray offset in resurrector, make resurrector use time

My wife now

Fix rev dec8aafc6414 (not tested)

Small fix to russian translation

lupdate

Fix a typo

Fix 4162:49ad7bea4a33 by renaming the file too

Fix some more messages

Fix i18n of plural forms

merge

Restore es and pl translations to TrophyRace map

spanish translation

Don't use operator /=

merge

portuguese update for map lua

updated chinese translation

renaming gtAmmo_Bomb and gtAmmo_Grenade

merge

* Updated German translation * Removed campaign button

Fix hanging in air after whip or bat attack

some updates

Polish updade

update and fix some lua stuff

Remove more int64 casts

Don't call getrandom() from parameters to a function. The order of calls is undefined, so desyncs are probable.

REmove stupid int64 conversions, provide real fixes to compiler hints

Fix freepascal version detector to ask only version from compiler rather than all help on parameters

Fix some warnings

more portuguese

Prevent escape

more polish

2 more variables to control water rise and health loss during sudden death.

Prevent vgtFlake's rotation angle to grow too high in its absolute value

add Timeless and Fort game modes, tweaks to other modes

perform an additional check on gamestart

update ios port with new health modes, increase sd turns, new game modes, fixed bugs that prevented the creation of AI controlled teams, revisited update modes

Decouple forts from divide/mines/explosives, since those can be set individually these days

Forgot to disable these in 4116:877ecc9d9d82

Small tweak to Nature/LandTex Change icon.png too, you idiot!

Fix watermelon fragments stray pixels. Clean Nature/Landtex.svg a little

help pages for iphone

Remove the last vestiges of the shoppa hack by adding 2 spinners for percentage health and amount of health in crate, also update translations and increase SD spinner (some users have requested it)

more portugese

2 minor bugfixes. fix shoppa hack, strip translation from 2 scheme/weapon filters - breaks otherwise. They aren't dynamic yet.

revert attempts to block switching weapon while targetting in infinite attack mode. just getting too messy. probably best to allow any weapon to be targetted, and store the target in the gear and draw it there instead of uworld, but I'm leaving this alone

and again with the polish

I need to keep track of CurAmmoGear or else I trap people who clicked on the bee target

polish update

swedish updates, new goals and such

This should make bee and other targetted things behave more reliably in infinite attack mode. Blocks switching of weps if a target point is active.

merge

merge

Add some more game goals. Sorry translators.

add F1-F10 to the default binds to fix weapon selection in trainings/missions and such

Replace the deprecated Basketball mode with Clean Slate mode which uses a few of the new scheme options

frontend french update - still some unfinished blocks

Release custom hats into the wide wide world

scale down larger buttons to match the others

updated swedish translation

Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button

update translation files

New title and campaign mode images

merge

fix issue #2 - taunts during AI turns

more button updates, wait for hogs in infinite attack mode stop moving before clearing their damage (just used an arbitrary small interval)

Forgot to make the reset of ReadyTimer match. Also, new icon for Reset Weapons mode

portugese translation for opendesktop files

adding qm files and hwengine.desktop to .hgignore

some changelog changes

make the support page more portable fix the respondsToSelector calls and update modes

fix copypasta

it locale for opendesktop update ios gamemodes

Oops, didn't see this one. Thanks sheepluva

Make health machine effects impact health reset

some crappy german translation, feel free to improve :P

spanish opendesktop translations

Move LandBackTex to break simmetry as nemo suggested Optipng new Nature's LandTex

adjust the range for mines to allow disabling with 0 now that the toggle button is gone.

new maps: ShoppaKing and TrophyRace

slovak opendesktop translations

copypasta(TM) saves the day (nemo's bugfix part2)

clear gmAttack on attach to prevent a particularly nasty abuse found by the shoppa users.

Extend shoppa hack to disable health crates to saucer and portal modes as well

Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.

oops

health reset mode ftw (replaces gfmines)

i give up and disable rotation on the iphone; also fix smaller compilation issues

swedish localisation for opendesktop files

polish localisation for opendesktop files

text tweaks

argh. typo.

this line doesn't use WorldDx

more portal tweaks (closer exit position, cake stuff, etc)

set as default type, add icon. going to assume the icon was installed already. should happen in most packaging out there.

disable file association on mac for now

merge

er. needs bin/

add absolute path to hwengine

New land texture for Nature theme

check for subs first

Add opendesktop association of files for non-windows. NEEDS TESTING.

Add a misc folder to contain some files for attempting a local registration of hwengine against hedgewars demo and save files on request. Still needs the addition of the frontend code to mkdir -p in .local, copy the files, call update-mime-info and such

better support for wimpier i-devices

shorter strings for low-resolution friendliness

Updated mission translations

merge

rotation stuff for iphone now works

Avoid a flicker of tags if jiggling a hog, remove a bunch of calls to hwRound and hwSign

we had it with you intolerant portals\!

also update health bars when one joins a netgame

polish update

again w/ the swedish

moar swedish

fix encoding and stupid file host behaviour

polish update, fix encoding

more swedish updates

Merged changes

Mummy hat

Terminator glasees hat

Samus hat

Infernal horns hat

Disguise hat

Elvis hat

Hats

Hat

Hats

Hats

Trophyrace scripted map

Sticks map

swedish update

Shoppaking map

Evil chiken fort

Jungle theme with a few touches by Palewolf (missing droplets/splash, wrong background size)

polish language patch

various portal tweaks, also: nemo's gear jiggling is back

fix issue #63 and draw health bars right away for savefiles

call initIPC for savefiles only on iOS

merge

making indentation consistent (noticed while debugging)

Cancel out dX/dY to handle the invulnerability case

Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation

Oops. Restore the check as well

Restore pending proper removal and cleanup from frontend. Otherwise we'll just confuse the users.

fix entity

don't think resurrection is beta anymore

text updates

potential fix for issue #86: 'Objects behind a portal will sometimes go through the portal.' please test

set hasGone to prevent resurrection.

make aura match cross colour, add a faint aura to resurrected hogs. basically mucking about w/ burp's weapon again.

Only set zombie hat if the hog didn't have a hat. I'm keeping my dinos dammit!

add some phone rumbling to big explosions, airbomb and sinegun really have mine timer go up to 5 seconds

translation file updates

can move the new ammo menu freely

remove the steam community group from one of the tips/hints/whatever

fix background for the about and saves controller

German translation

move functions called by pascal code outside controller

merge

Portal: don't port RCPlanes for now, they are too wide anyway :P

update pt translation

Resurrector: respect modified Gear position for resurrection range circle

Resurrector: Levitate hog + show cross

merge…

Resurrector: Use zombie-hat for resurrected hogs

clear poison on death

A few lines were missing from spanish locale

burp can always remove this if he doesn't like it. just making it a bit more interesting.

Kill off hog immediately on using up health, use more common formatting, call render less often

Trying to help burp along, here...

This should only allow switching from portal gun and the like.

Avoid doing this stuff twice, even if CheckForWin is called twice

An initial arabic translation. The game engine strings, unfortunately, are not mirrored. A bug should probably be filed on that. It maybe necessary to actually flip the text texture generated by SDL.

Chinese update

Finnish update

Slovakian update

Portugese update

fix an annoying bug that didn't allow returning to the ifrontend

merge

one more interface trick, force max resolution possible when in fullscreen

Only FollowGear for the pilot.

update branch with latest head, most likely breaking water color in stereo mode

disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines) increase max mine timer to 5 seconds

merge

merge

engine: reorder GameFlags and update files, frontend and other stuff ifrontend: load scheme descriptions from file and automate them a little correct order is schemes, ammo, hogs properly fix an autoreleased uiswitch

restore king mode

Updated spanish locale

make napalm strike a bit less irritating

the ios port is also iphone compatible

SmokeTrace: animation got aborted before last animation frame was displayed

fix/tweak let clouds reflect wind speed and direction again + stronger

Added tag list for changeset 82e4a5ef18f7

initialise to team count

Resurrector Weapon: Add ammo icon, sound, hedgehog picture (from Tiy).

Added tag Hedgewars-iOS-1.1 for changeset adffb668f06e

add a default description to the new ammomenu

Set default ready timer to 0 to see if desyncs come back.

my turn to merge

Remove this - doesn't seem to do anything useful after all.

merge

some more memory opt

use labels instead of images, should save ram and space

ios version bump and other minor things

add name, caption and description to the new ammomenu

updated PT locale

goodbye Barrelhouse and Island forts, we've had a good time together but now we must move on

fix some glitches

optimizations to new ammomenu and overlay

less warning, no rotation glitch, more comments

Resurrector weapon: do not make it end turn, add description, add doStepHedgehogMoving while resurrecting

Rope optimisation. Remove a space in sdl keys that seems like a bug - issue #70

i fix up the new ammo menu finally

(none)

minor stuff

set CurAmmoType to a temp var so I don't have to worry about it switching inside the routine so that I can actually put OnUsedAmmo where it belongs.

Ok. Let's disable the right one this time. In fact, let's just remove newgrave entirely - no point in half-measures.

Disable newgrave - conflicts with resurrection

Extend the >0 / amNothing check

merge

Call OnUsedAmmo *after* doing the normal CurAmmoType stuff so CurAmmoType actually points to the right bloody weapon

Add dummy amResurrector sprite

New Weapon: Resurrector (TODO: ammo icon + sprites)

Add debug message about # cmd

Constrain to <= to avoid a bug on bottom edge reported by Henek

Remove bit of debug code from prior, don't switch weapons on end of turn (stick with whatever the last weapon was)

Don't use AfterAttack in saucer - CurAmmoType is switched at this point

update some numerus forms for english

restore the delay between shots

Skip "hurry" message if turn is 10s or less

You win fillammostore

Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too.

Hopefully fix bee/air attacks w/o screwing anything else up. Set mines to trigger immediately in infinite attack mode (better not use 0s mines)

moved some utilities to a separate column with round buttons some improvements to rotation handling, overlay appears later so device shouldn't be stressed removed some code and autoset to default only when textfield is empty (for weaps and schemes)

Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.

split the flag tableview in worldwide and community

Add the standard delay (1.25 seconds) between attacks on inf attack mode, as well as checks for damage and win. There is probably some better way to do this. Weapons still need fixing.

some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)

Some screwing around in try to fix space leak. No luck yet.

Enable resetting of weapons after each turn - useful in combination with a limited weaponset and unlimited attacks

Check on an infinite attacks mode, still many problems in actual weapons

forgot the mapping

Add per-hog ammo option, initial stubs for infinite attack and weapon reset, fix a bug in ammo switching

Tank fort

integrate nicely with external display

some optimizations to drawing and fetching data of new ammomenu

merge

Some optimizations

fix issue #24 and issue 81

bug #83 - move test of disabled land objects into AddObjects

made the new menu toggable

merge

polishing the cocoa ammomenu a little, still requires work

Engine: * Temporary fix to log file writing when running from command line (standalone demo/savegame playback) Frontend: * Added a button to the settings menu to associate demos and savegames (.hwd/.hws) with the engine in Windows Explorer and other programs such as web browsers (Win32 only)

Set ammo to amNothing after using up the current ammo. This should reduce noob fail where they blow themselves up w/ bazooka.

remove a useless field from weaponfile format added some properties and memory checks use a notification instead of delegation for starting the game

Inline most of uFloat (saves ~7.5% opcount on a test game), inline a few very short candidates in uMisc, comment out some unused functions in uMisc

move all mobile-related functions in their own module, provides a structure for future mobile ports

strip CRLF

use dynamic data from engine instead of using hardcoded values

Missing file extensions for icons was screwing up Qt 4.7

WIP for an objc ammomenu implementation

various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames) added the patch for compiling SDL

iPad Video Out support (+less warnings +code update for latest SDL)

Hungarian locale

updated lua loading in the ifrontend and also fixed masked maps

Engine/Frontend: * Changed the Lua file loading to take paths relative to the data dir instead of absolute paths to ensure demo/savegame portability

Update translations, add a hungarian stub for edge_hog who is volunteering

playing a bit with colors

implemented endless turns support and added Timeless scheme (also fixed a crasher) new save button from Tiy other minor stuff

Correct bug in flight ceiling for birdy as well, increase clip on velocity to 1.9 (shouldn't cause problems with most collision checks still), apply clip to both + and -

Engine: * Write log files to different files in a new sub directory depending on "game mode"

merge

have engine try for a second position when map loading fails (in this way it's possible to move Missions data to any path) remove nsstringextra and implement raw dump when needed

further rework of MapConfigViewController, lists missions correctly (they don't load fine yet)

move all preview drawing code into its own class (for a simplified and more readable MapConfigViewController)

remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater

Can't use cHealthDecrease here for these two 'cause it isn't a generic "do some damage to hog" flag, but is rather set when SD starts

Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.

enable Lua for iOS (hooks for frontend to be done) add an activity indicator while loading demo

merge

finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)

pimp-my-savagame-table

have Saves restart net when loaded, also resumes music fix saving on hwmobile

Show database errors in stderr

slight shading adjustment

merge

implemented reloading savefiles

captions are scaled down when they're bigger than screen

Engine: * (Commit frenzy) Added SetGearMessage(gear : integer, message : integer) to Lua script calls - this should allow easy "script control" of hogs (untested) * Renamed GearGetMessage() to GetGearMessage()

compilation bugfix and scaling down textures when bigger than screen