aaand make sure the commented out line matches

Add damage to gear values to mess with

Oups. 6, not 12 - was testing

Allow for arbitrary number of airstrike bombs and spacing.

Move health:= 6 to gear addition so lua can more easily override it.

german translation update (incl. string reordering - blame sheepluva)

german translation updates

Merge

- Revert of 'Reset for previously selected static map'

uVariables: also initialize arrays and records in initModule

- These properties are not necessary to clean when receiving memory warning

- We don't need to explicitly propagate vc lifecycle messages Note: This actually fix crash related to [SDL_uikitwindow release], which appears after receiving memory warning during playing one game, finishing it and getting back to GameConfigViewController.

- Reset for previously selected static map Note: If static map doesn't reset, library continue to use it, even if user select generated maze map from game settings.

Merge

merge

simplify code

exclude uMatrix from pas2c build

fix pas2c build, it was broken in the long long ago ( 97f9a25024e6 )

pas2c doesn't like {$ENDIF} with argument

make uVariables not depend on implicit one-time initialization by FPC

- ifdef for IPHONEOS in glLoadExtension

stop rc plane prop/engine sound when out of fuel

merge branch ios-revival into default

- ifdef for CMEM

- ifdef for engine exit/halt

- Refactoring in order to remove some warning related to using of int instead of NSInteger

- First attempt to fix crashes on loading 'Styles'

- Fixes for cropped background image on iPhone

- Restyle of 'Simple' and 'Missions' buttons at Main screen

- Added required icons

- arm64 added as valid arch - 'Skip Install' set to 'YES' for libraries - 'Build libfpc.a' modified - fpc compiling options cleared

- Version bump to 2.0

- Fix for crash on loading SingleWeaponViewController in Settings

- 'safeScale' now always 1.0 Note: Really a little bit weird, but seems to work perfectly

- Load fonts on init if not 'mobile'

- Property for port in MapPreviewButtonView

- Using of @autoreleasepool is better

- Fix for iPhone 4S screen size

- Fix for 'hold for delete' for cells in teams table

Merge with ios-rus-localization

- Fix for retrieving 'Maze' preview genration Note: We use now GCD instead of pthread for launch preview generation from engine side (it is now done with RunEngine, not direct call to GenLandPreview) Note 2: For a moment LandPreview without Alpha used

- Improved fix for UI elements positioning at GameConfigViewController

- Localization for SingleSchemeViewController fixed - Typos in Russian Scheme.strings

- Russian Scheme.strings localized

- Russian Localizable.strings localized - Few fixes for Russian About.strings

- Fix for localization of detail labels at AboutViewController

- Russian About.strings localized

- Rus localization started

- Russian localization files added TODO: Actually localize these files

- Small fix for debug view frame Note: Still need to handle autorotation here

- Fix for initial wrong UI positioning for GameConfigViewController

- Fix for show/hide helpPage animations

- HelpPageLobbyViewController updated: various UI fixes, autorotation fixes, help bubbles for iPad grouped Note: Xib's are automodified by Xcode

- HelpPageLobbyViewController returned to project (back from 2012!), also help bubble images added

- Fix for loading missions descriptions Note: Much way better is to use NSDictionary here! Must be refactored

- Fix for strange problem with table view in StatsPage - rowHeight is 1 by default. So, fixed by implicit size.

- RestoreViewController functionality uncommented

- Interscreen transitions fixed

- MGSplitViewController updated to last version with iOS 8 fixes

- Fix for main view orientation problems