koda [Tue, 03 Nov 2015 00:13:44 +0100] rev 11269
Added tag 0.9.22-release for
changeset 9621fdcad965
unc0rr [Mon, 02 Nov 2015 23:23:06 +0300] rev 11268
Let's try to store games info necessary for ratings
nemo [Sun, 01 Nov 2015 15:08:39 -0500] rev 11267
do the same thing for the chute/birdy/saucer block
nemo [Sun, 01 Nov 2015 15:06:55 -0500] rev 11266
Make camera refocus less aggressive. Only if there's a camera target already.
unc0rr [Sun, 01 Nov 2015 18:35:18 +0300] rev 11265
Update versions information
unc0rr [Sun, 01 Nov 2015 16:58:34 +0300] rev 11264
This is .22 release revision
unc0rr [Sat, 31 Oct 2015 21:38:59 +0300] rev 11263
inc(HEDGEWARS_PROTO_VER)
antonc27 <antonc27@mail.ru> [Sat, 31 Oct 2015 04:03:17 +0100] rev 11262
- Finally added rus localization for all User Missions
- Some missed strings added to stub.lua
Note: Maybe some translation checks needed
antonc27 <antonc27@mail.ru> [Fri, 30 Oct 2015 23:06:25 +0100] rev 11261
- Return of stereo sound for mobile!
- 'Justyouwait' voice sound not skipped anymore
antonc27 <antonc27@mail.ru> [Fri, 30 Oct 2015 21:08:05 +0100] rev 11260
- Set iPad version to require fullscreen
Note: Otherwise has 'invalid bundle. iPad multitasking' error on upload to iTunes Connect
antonc27 <antonc27@mail.ru> [Fri, 30 Oct 2015 21:06:03 +0100] rev 11259
- Fix for not compiling Pascal sources when archiving app for AppStore
nemo [Fri, 30 Oct 2015 16:04:51 -0400] rev 11258
refocus camera on roping hog. totally untested.
antonc27 <antonc27@mail.ru> [Fri, 30 Oct 2015 03:14:39 +0100] rev 11257
- Rus localization for Target Practices
antonc27 <antonc27@mail.ru> [Fri, 30 Oct 2015 01:31:32 +0100] rev 11256
- Rus localization for Speed Shoppa Challenges
antonc27 <antonc27@mail.ru> [Fri, 30 Oct 2015 00:03:58 +0100] rev 11255
- Removing of CMake generated files in 'UpdateDataFolder' script
antonc27 <antonc27@mail.ru> [Fri, 30 Oct 2015 00:01:26 +0100] rev 11254
- Better handling of cell's tag in SingleTeamViewController
antonc27 <antonc27@mail.ru> [Thu, 29 Oct 2015 23:59:51 +0100] rev 11253
- Refactoring of SavedViewController:
- - Workaround for cells' wrong tags in SavedViewController when removing saves
- - Disabled editing of save names
antonc27 <antonc27@mail.ru> [Thu, 29 Oct 2015 03:48:42 +0100] rev 11252
- FindTable functionality for HoldTableViewCell and EditableCellView extracted to category
nemo [Wed, 28 Oct 2015 10:01:31 -0400] rev 11251
few more missing nil checks in crate spawn
antonc27 <antonc27@mail.ru> [Wed, 28 Oct 2015 03:41:00 +0100] rev 11250
- Fix for crash while deleting >=2 saved games
Note: SavedGamesViewController certainly needs refactoring
sheepluva [Wed, 28 Oct 2015 01:29:39 +0100] rev 11249
Removed tag Nice one
sheepluva [Wed, 28 Oct 2015 00:06:13 +0100] rev 11248
Added tag 0.9.22-RC for
changeset d9622394ec9c
sheepluva [Tue, 27 Oct 2015 21:11:44 +0100] rev 11247
somebody was so nice to mention me in credits, but misspelled my last name
unc0rr [Tue, 27 Oct 2015 23:04:15 +0300] rev 11246
Also pass script information alongwith winner/achievements info, so that we could potentially have per mode ratings
antonc27 <antonc27@mail.ru> [Tue, 27 Oct 2015 05:11:48 +0100] rev 11245
- Rus localization for portal mission
antonc27 <antonc27@mail.ru> [Mon, 26 Oct 2015 00:54:58 +0100] rev 11244
- Rus localization update for Basic Trainings in ru.lua
- Some missed strings added to stub.lua
sheepluva [Sun, 25 Oct 2015 20:40:27 +0100] rev 11243
changelog update
antonc27 <antonc27@mail.ru> [Sun, 25 Oct 2015 03:14:49 +0100] rev 11242
- Partial rus localization for User Missions and Basic Trainings in ru.lua
- Fully localized on this moment:
- - Bazooka Training
- - Dangerous Ducklings
- Some missed strings added to stub.lua
antonc27 <antonc27@mail.ru> [Sat, 24 Oct 2015 16:01:19 +0200] rev 11241
- Fix for formatting non-english characters, received from engine
antonc27 <antonc27@mail.ru> [Sat, 24 Oct 2015 15:27:47 +0200] rev 11240
- Fix for sending to engine non-english characters
Note: Actually fixes problem with cyrillic team and hogs names
antonc27 <antonc27@mail.ru> [Sat, 24 Oct 2015 03:56:02 +0200] rev 11239
- Fix for loading non-existing missions in MissionTrainingViewController
antonc27 <antonc27@mail.ru> [Sat, 24 Oct 2015 02:26:54 +0200] rev 11238
- Possible fix for loading game styles scripts without .cfg file
antonc27 <antonc27@mail.ru> [Sat, 24 Oct 2015 01:42:31 +0200] rev 11237
- Rus translation for Mutant game style
- Few strings are localized now in Mutant script
sheepluva [Sat, 24 Oct 2015 00:21:15 +0200] rev 11236
fixed: poison clouds could bounce
antonc27 <antonc27@mail.ru> [Fri, 23 Oct 2015 04:02:36 +0200] rev 11235
- Rus localization update for 'Data/Locale/missions_ru.txt'
antonc27 <antonc27@mail.ru> [Fri, 23 Oct 2015 03:15:35 +0200] rev 11234
- Rus localization update for 'Data/Locale/ru.txt'
antonc27 <antonc27@mail.ru> [Fri, 23 Oct 2015 01:49:32 +0200] rev 11233
- Fix for wrong localization key for sound in GeneralSettingsViewController
antonc27 <antonc27@mail.ru> [Fri, 23 Oct 2015 01:46:00 +0200] rev 11232
- Localization for missed strings in RestoreViewController (for eng(as reference) and rus)
antonc27 <antonc27@mail.ru> [Fri, 23 Oct 2015 00:45:57 +0200] rev 11231
- Localization for missed strings in StatsPage (for both eng and rus)
Note 1: Some strings here are contains format characters, translators must not change their!
Note 2: Conjugation with numbers not really handled here.
antonc27 <antonc27@mail.ru> [Fri, 23 Oct 2015 00:06:35 +0200] rev 11230
- Rus localization updated for iOS front-end
- Some missed strings added to English localizable strings for reference
antonc27 <antonc27@mail.ru> [Thu, 22 Oct 2015 22:21:35 +0200] rev 11229
- Some strings localizations for Settings
antonc27 <antonc27@mail.ru> [Thu, 22 Oct 2015 21:57:05 +0200] rev 11228
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru> [Thu, 22 Oct 2015 03:02:43 +0200] rev 11227
- All labels in HelpPageLobby now localizable (with text from IB as localization keys)
antonc27 <antonc27@mail.ru> [Thu, 22 Oct 2015 03:00:22 +0200] rev 11226
- SegmentedControl is localizable now in MapConfig
antonc27 <antonc27@mail.ru> [Thu, 22 Oct 2015 00:46:45 +0200] rev 11225
- simpleGameButton and missionsButton are localizable now in MainMenu
antonc27 <antonc27@mail.ru> [Wed, 21 Oct 2015 23:46:11 +0200] rev 11224
- 'Press the target button to mark the target' message is localizable now
antonc27 <antonc27@mail.ru> [Wed, 21 Oct 2015 21:58:50 +0200] rev 11223
- Workaround for team's name with spaces in StatsPage
antonc27 <antonc27@mail.ru> [Wed, 21 Oct 2015 18:15:19 +0200] rev 11222
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru> [Wed, 21 Oct 2015 02:19:04 +0200] rev 11221
- Fix for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru> [Wed, 21 Oct 2015 00:49:04 +0200] rev 11220
- Refactoring of Missions screen:
- - Now mission's list constructed from 'missions_en.txt'
- - In-place localization for mission's names and descriptions
antonc27 <antonc27@mail.ru> [Tue, 20 Oct 2015 23:56:31 +0200] rev 11219
- Retrieving language ID moved to HWUtils
antonc27 <antonc27@mail.ru> [Tue, 20 Oct 2015 00:51:45 +0200] rev 11218
- Small adjust for cell selection color of Missions screen
antonc27 <antonc27@mail.ru> [Mon, 19 Oct 2015 03:39:47 +0200] rev 11217
- Big refactoring of front-end Settings for both iPhone and iPad:
- - Fixed crash when receiving Memory Warning after dismissing Settings on iPhone
- - Set ARC flags for MGSplitVCs as it now updated for iOS 8
- - All sub-settings VCs now recreated each time they presented
- - SettingsContainerViewController removed
- - Other small improvements
antonc27 <antonc27@mail.ru> [Sat, 17 Oct 2015 20:07:10 +0200] rev 11216
- Better way of creating/using doneButton in Settings
antonc27 <antonc27@mail.ru> [Sat, 17 Oct 2015 00:32:02 +0200] rev 11215
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
Note: Tested only in simulator
antonc27 <antonc27@mail.ru> [Fri, 16 Oct 2015 17:34:06 +0200] rev 11214
- Added new set of tabbar icons for Settings on iPhone
antonc27 <antonc27@mail.ru> [Fri, 16 Oct 2015 02:54:03 +0200] rev 11213
- Fix for autorotation of table view of StatsPageVC
- Adjustment for header's height
antonc27 <antonc27@mail.ru> [Thu, 15 Oct 2015 23:27:56 +0200] rev 11212
- Mortar, Mudball and Land Spray need up/down buttons on mobile
antonc27 <antonc27@mail.ru> [Thu, 15 Oct 2015 22:48:32 +0200] rev 11211
- Workaround for wrong sprite in utility widget when selecting DrillStrike
Note: It is better to extend utilityWidget to handle >=2 sprites/actions
antonc27 <antonc27@mail.ru> [Thu, 15 Oct 2015 21:58:30 +0200] rev 11210
- Target button added to mobile touch controls
Note: Maybe also need to add it to HedgeEditor, dunno...
antonc27 <antonc27@mail.ru> [Thu, 15 Oct 2015 21:13:43 +0200] rev 11209
- Target button added to mobile touch controls
antonc27 <antonc27@mail.ru> [Thu, 15 Oct 2015 20:36:08 +0200] rev 11208
- Timer button added to mobile touch controls
antonc27 <antonc27@mail.ru> [Thu, 15 Oct 2015 01:13:23 +0200] rev 11207
- Fix for wrong path of restored game
Note: http://stackoverflow.com/questions/25884382/ios-8-bundle-path-changes
antonc27 <antonc27@mail.ru> [Wed, 14 Oct 2015 21:25:49 +0200] rev 11206
- Better random number generation for front-end: random() replaced with arc4random_uniform()
antonc27 <antonc27@mail.ru> [Wed, 14 Oct 2015 02:28:32 +0200] rev 11205
- Button's restyling for RestoreViewController
sheepluva [Sat, 10 Oct 2015 18:18:26 +0200] rev 11204
Lua-API: onSuddenDeath hook
nemo [Thu, 08 Oct 2015 10:48:16 -0400] rev 11203
Pass overridden uid into AddGear instead
nemo [Thu, 08 Oct 2015 10:42:00 -0400] rev 11202
restore uid on resurrection as well
sheepluva [Wed, 07 Oct 2015 23:20:31 +0200] rev 11201
TrophyRace: fix nil error warning, caused by needlessly re-retrieving the name of the best hedgehog (which could be dead at that point)
antonc27 <antonc27@mail.ru> [Mon, 05 Oct 2015 20:31:46 +0200] rev 11200
- Fix for locale string in SingleWeaponViewController
- Init of vars in LoadLocaleWrapper in order to get right ammo names
antonc27 <antonc27@mail.ru> [Mon, 05 Oct 2015 19:17:40 +0200] rev 11199
- Fix for locale string passed to engine (like "ru-FR")
sheepluva [Mon, 05 Oct 2015 13:38:25 +0200] rev 11198
preselect baseball bat in Knockball and Basketball
nemo [Sun, 04 Oct 2015 16:30:55 -0400] rev 11197
Avoid waiting past end of turn for smine.
nemo [Sat, 03 Oct 2015 17:02:57 -0400] rev 11196
Add nil check in fake crate spawn for if crate fails to spawn
antonc27 <antonc27@mail.ru> [Mon, 28 Sep 2015 01:31:47 +0200] rev 11195
- GameController framework added to project (required by last version of SDL)
antonc27 <antonc27@mail.ru> [Mon, 28 Sep 2015 01:07:21 +0200] rev 11194
- Bitcode disabled (for Xcode 7)
nemo [Fri, 25 Sep 2015 23:31:16 -0400] rev 11193
Scan from right too. Not sure this is actually helpful, so committing separately.
nemo [Fri, 25 Sep 2015 23:30:21 -0400] rev 11192
This should probably fix feedback that hogs weren't spawning on left side of map.
sheepluva [Wed, 23 Sep 2015 07:49:46 +0200] rev 11191
fp complained about this line being too long
antonc27 <antonc27@mail.ru> [Sun, 20 Sep 2015 03:02:21 +0200] rev 11190
- 'Shoppa Pro' ammo set added to iOS front-end
antonc27 <antonc27@mail.ru> [Sun, 20 Sep 2015 02:56:33 +0200] rev 11189
- Weapon and scheme plist's names(which passed to engine) must contain spaces, not underscores
antonc27 <antonc27@mail.ru> [Sun, 20 Sep 2015 02:52:49 +0200] rev 11188
- 'Construction Mode' ammo set and game parameters added to iOS front-end
antonc27 <antonc27@mail.ru> [Sun, 20 Sep 2015 02:08:12 +0200] rev 11187
- 'Highlander' ammo set added to iOS front-end
antonc27 <antonc27@mail.ru> [Sun, 20 Sep 2015 01:48:18 +0200] rev 11186
- 'One of everything' ammo set added to iOS front-end
sheepluva [Sat, 19 Sep 2015 22:17:50 +0200] rev 11185
tweak tips a little (loosely based on Wuzzy's suggestions)
antonc27 <antonc27@mail.ru> [Fri, 18 Sep 2015 06:03:49 +0200] rev 11184
- Fix for getting the correct fort name in FortsViewController
antonc27 <antonc27@mail.ru> [Fri, 18 Sep 2015 05:37:55 +0200] rev 11183
- Added functionality to select one hat for all hogs at team settings
antonc27 <antonc27@mail.ru> [Fri, 18 Sep 2015 04:33:37 +0200] rev 11182
- Fix for consequent selection of same hat for all hogs in settings
- Small refactoring of HogHatViewController
antonc27 <antonc27@mail.ru> [Thu, 17 Sep 2015 23:53:54 +0200] rev 11181
- Refactoring of MainMenuViewController
sheepluva [Thu, 17 Sep 2015 09:59:58 +0200] rev 11180
speed up TrophyRace deaths
sheepluva [Thu, 17 Sep 2015 07:41:40 +0200] rev 11179
add TODO
nemo [Wed, 16 Sep 2015 08:58:51 -0400] rev 11178
remove racist trydo 😝
antonc27 <antonc27@mail.ru> [Tue, 15 Sep 2015 06:05:11 +0200] rev 11177
- Possibility to send log file by email from app
Note: Ugly ifdef's are necessary, because we don't want to include MessageUI framework into 'Distro Appstore' build scheme
antonc27 <antonc27@mail.ru> [Tue, 15 Sep 2015 04:28:25 +0200] rev 11176
- Refactoring. Separation of game log viewing code to GameLogViewController
antonc27 <antonc27@mail.ru> [Mon, 14 Sep 2015 07:02:06 +0200] rev 11175
- Attempt to fix a crash while selecting 'Random' for map generation
Note 1: It occurs in BezierizeEdge procedure of uLandOutline while generating land preview
Note 2: Crash fixed, but most previews are not generated correctly, e.g. it's a case for bordered map.
nemo [Sun, 13 Sep 2015 18:58:22 -0400] rev 11174
airmine hand sprite by wuzzy. totally temporary...
nemo [Sun, 13 Sep 2015 16:38:53 -0400] rev 11173
aaand make sure the commented out line matches
nemo [Sun, 13 Sep 2015 16:36:39 -0400] rev 11172
Add damage to gear values to mess with
nemo [Sun, 13 Sep 2015 16:24:37 -0400] rev 11171
Oups. 6, not 12 - was testing
nemo [Sun, 13 Sep 2015 16:23:32 -0400] rev 11170
Allow for arbitrary number of airstrike bombs and spacing.
nemo [Sun, 13 Sep 2015 15:36:06 -0400] rev 11169
Move health:= 6 to gear addition so lua can more easily override it.
wuzzy [Sat, 12 Sep 2015 21:13:35 +0200] rev 11168
german translation update (incl. string reordering - blame sheepluva)
wuzzy [Sat, 12 Sep 2015 19:00:52 +0200] rev 11167
german translation updates
antonc27 <antonc27@mail.ru> [Sat, 12 Sep 2015 05:46:59 +0200] rev 11166
Merge
antonc27 <antonc27@mail.ru> [Sat, 12 Sep 2015 05:39:35 +0200] rev 11165
- Revert of 'Reset for previously selected static map'
sheepluva [Sat, 12 Sep 2015 05:20:52 +0200] rev 11164
uVariables: also initialize arrays and records in initModule
antonc27 <antonc27@mail.ru> [Sat, 12 Sep 2015 05:23:28 +0200] rev 11163
- These properties are not necessary to clean when receiving memory warning
antonc27 <antonc27@mail.ru> [Sat, 12 Sep 2015 05:21:21 +0200] rev 11162
- 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.
antonc27 <antonc27@mail.ru> [Sat, 12 Sep 2015 04:12:29 +0200] rev 11161
- 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.
antonc27 <antonc27@mail.ru> [Sat, 12 Sep 2015 04:02:27 +0200] rev 11160
Merge
sheepluva [Fri, 11 Sep 2015 21:42:55 +0200] rev 11159
merge
sheepluva [Fri, 11 Sep 2015 21:41:35 +0200] rev 11158
simplify code
sheepluva [Fri, 11 Sep 2015 09:18:08 +0200] rev 11157
exclude uMatrix from pas2c build
sheepluva [Fri, 11 Sep 2015 08:15:17 +0200] rev 11156
fix pas2c build, it was broken in the long long ago ( 97f9a25024e6 )
sheepluva [Fri, 11 Sep 2015 07:39:01 +0200] rev 11155
pas2c doesn't like {$ENDIF} with argument
sheepluva [Fri, 11 Sep 2015 05:54:17 +0200] rev 11154
make uVariables not depend on implicit one-time initialization by FPC
antonc27 <antonc27@mail.ru> [Fri, 11 Sep 2015 01:05:02 +0200] rev 11153
- ifdef for IPHONEOS in glLoadExtension
sheepluva [Thu, 10 Sep 2015 18:50:39 +0200] rev 11152
stop rc plane prop/engine sound when out of fuel
sheepluva [Thu, 10 Sep 2015 18:22:52 +0200] rev 11151
merge branch ios-revival into default
antonc27 <antonc27@mail.ru> [Thu, 10 Sep 2015 17:51:49 +0200] rev 11150
- ifdef for CMEM
antonc27 <antonc27@mail.ru> [Thu, 10 Sep 2015 17:47:01 +0200] rev 11149
- ifdef for engine exit/halt
antonc27 <antonc27@mail.ru> [Thu, 10 Sep 2015 01:49:15 +0200] rev 11148
- Refactoring in order to remove some warning related to using of int instead of NSInteger
antonc27 <antonc27@mail.ru> [Thu, 10 Sep 2015 01:31:52 +0200] rev 11147
- First attempt to fix crashes on loading 'Styles'
antonc27 <antonc27@mail.ru> [Sun, 06 Sep 2015 04:30:30 +0200] rev 11146
- Fixes for cropped background image on iPhone
antonc27 <antonc27@mail.ru> [Sun, 06 Sep 2015 03:17:22 +0200] rev 11145
- Restyle of 'Simple' and 'Missions' buttons at Main screen
antonc27 <antonc27@mail.ru> [Sat, 05 Sep 2015 23:46:31 +0200] rev 11144
- Added required icons
antonc27 <antonc27@mail.ru> [Sat, 05 Sep 2015 23:12:23 +0200] rev 11143
- arm64 added as valid arch
- 'Skip Install' set to 'YES' for libraries
- 'Build libfpc.a' modified
- fpc compiling options cleared
antonc27 <antonc27@mail.ru> [Thu, 27 Aug 2015 23:52:38 +0200] rev 11142
- Version bump to 2.0
antonc27 <antonc27@mail.ru> [Thu, 27 Aug 2015 23:21:07 +0200] rev 11141
- Fix for crash on loading SingleWeaponViewController in Settings
antonc27 <antonc27@mail.ru> [Thu, 27 Aug 2015 23:19:29 +0200] rev 11140
- 'safeScale' now always 1.0
Note: Really a little bit weird, but seems to work perfectly
antonc27 <antonc27@mail.ru> [Thu, 27 Aug 2015 23:18:29 +0200] rev 11139
- Load fonts on init if not 'mobile'
antonc27 <antonc27@mail.ru> [Tue, 18 Aug 2015 01:11:17 +0200] rev 11138
- Property for port in MapPreviewButtonView
Anton Malmygin <antonc27@mail.ru> [Tue, 18 Aug 2015 01:08:21 +0200] rev 11137
- Using of @autoreleasepool is better
antonc27 <antonc27@mail.ru> [Tue, 18 Aug 2015 00:51:23 +0200] rev 11136
- Fix for iPhone 4S screen size
antonc27 <antonc27@mail.ru> [Sun, 16 Aug 2015 02:32:03 +0200] rev 11135
- Fix for 'hold for delete' for cells in teams table
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 20:49:06 +0200] rev 11134
Merge with ios-rus-localization
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 20:48:13 +0200] rev 11133
- 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
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 20:38:07 +0200] rev 11132
- Improved fix for UI elements positioning at GameConfigViewController
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 17:08:50 +0200] rev 11131
- Localization for SingleSchemeViewController fixed
- Typos in Russian Scheme.strings
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 16:26:00 +0200] rev 11130
- Russian Scheme.strings localized
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 04:23:12 +0200] rev 11129
- Russian Localizable.strings localized
- Few fixes for Russian About.strings
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 04:20:33 +0200] rev 11128
- Fix for localization of detail labels at AboutViewController
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 02:41:35 +0200] rev 11127
- Russian About.strings localized
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 02:24:36 +0200] rev 11126
- Rus localization started
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 02:22:17 +0200] rev 11125
- Russian localization files added
TODO: Actually localize these files
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 01:44:21 +0200] rev 11124
- Small fix for debug view frame
Note: Still need to handle autorotation here
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 01:40:06 +0200] rev 11123
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 00:59:33 +0200] rev 11122
- Fix for show/hide helpPage animations
antonc27 <antonc27@mail.ru> [Sat, 15 Aug 2015 00:22:04 +0200] rev 11121
- HelpPageLobbyViewController updated: various UI fixes, autorotation fixes, help bubbles for iPad grouped
Note: Xib's are automodified by Xcode
antonc27 <antonc27@mail.ru> [Fri, 14 Aug 2015 21:27:55 +0200] rev 11120
- HelpPageLobbyViewController returned to project (back from 2012!), also help bubble images added
antonc27 <antonc27@mail.ru> [Fri, 14 Aug 2015 02:10:53 +0200] rev 11119
- Fix for loading missions descriptions
Note: Much way better is to use NSDictionary here! Must be refactored
antonc27 <antonc27@mail.ru> [Fri, 14 Aug 2015 02:09:46 +0200] rev 11118
- Fix for strange problem with table view in StatsPage - rowHeight is 1 by default. So, fixed by implicit size.
antonc27 <antonc27@mail.ru> [Fri, 14 Aug 2015 02:04:46 +0200] rev 11117
- RestoreViewController functionality uncommented
Anton Malmygin <antonc27@mail.ru> [Fri, 14 Aug 2015 02:02:15 +0200] rev 11116
- Interscreen transitions fixed
antonc27 <antonc27@mail.ru> [Fri, 14 Aug 2015 01:55:42 +0200] rev 11115
- MGSplitViewController updated to last version with iOS 8 fixes
antonc27 <antonc27@mail.ru> [Thu, 13 Aug 2015 13:41:50 +0200] rev 11114
- Fix for main view orientation problems
antonc27 <antonc27@mail.ru> [Thu, 13 Aug 2015 13:40:12 +0200] rev 11113
- Fix for app crash after ending game
Note: Note sure why halt() not working correctly, also must pay attention to memory management here
antonc27 <antonc27@mail.ru> [Thu, 13 Aug 2015 01:34:01 +0200] rev 11112
- Name fixing for buttons
antonc27 <antonc27@mail.ru> [Thu, 13 Aug 2015 01:33:40 +0200] rev 11111
- Using come for internal memory management
Note: This fixed crash with ansisitring deletion while loading 'en.txt' locale
P.S. guys from #fpc suggested what this is just a spoof, not a real fix. maybe need more carefully mange memory here
antonc27 <antonc27@mail.ru> [Thu, 13 Aug 2015 01:31:37 +0200] rev 11110
- 'Generate position dependent code' et to NO. Otherwise crashed at initialization step.
antonc27 <antonc27@mail.ru> [Tue, 11 Aug 2015 02:42:53 +0200] rev 11109
- VALID_ARCHS reduced for all projects
antonc27 <antonc27@mail.ru> [Tue, 11 Aug 2015 00:16:28 +0200] rev 11108
- VALID_ARCHS changed
- Build libfpc.a script changed
Note: Not sure about valid archs
antonc27 <antonc27@mail.ru> [Tue, 11 Aug 2015 00:15:30 +0200] rev 11107
- Small warning fix
antonc27 <antonc27@mail.ru> [Mon, 10 Aug 2015 22:50:34 +0200] rev 11106
- Actually fix for rendering on iOS ]:->
antonc27 <antonc27@mail.ru> [Mon, 10 Aug 2015 22:49:52 +0200] rev 11105
- Fix for hiding launch window after launch and not blocking SDL window on engine anymore
antonc27 <antonc27@mail.ru> [Mon, 10 Aug 2015 22:48:02 +0200] rev 11104
- Some weird staff with bounds commented here
antonc27 <antonc27@mail.ru> [Mon, 10 Aug 2015 22:47:37 +0200] rev 11103
- Bogus 'lodeNiceHogs' disabled
Note: Fiw and uncomment after
antonc27 <antonc27@mail.ru> [Mon, 10 Aug 2015 22:44:51 +0200] rev 11102
- Restore game functionality disabled, because it blocks main screen
Note: Uncomment this after
antonc27 <antonc27@mail.ru> [Sun, 09 Aug 2015 16:20:35 +0200] rev 11101
Added tag Nice one for
changeset 0f5961910e27
antonc27 <antonc27@mail.ru> [Sun, 09 Aug 2015 15:38:00 +0200] rev 11100
- Resolves problem with wrong path to chef hat on iOS
antonc27 <antonc27@mail.ru> [Sun, 09 Aug 2015 15:37:29 +0200] rev 11099
- Fix for wrong start paramIndex in case of Hwlibrary
antonc27 <antonc27@mail.ru> [Sun, 09 Aug 2015 00:04:41 +0200] rev 11098
- Fix for new name of SDL 2 libraries
Note: Actually, seems to work correctly without it, but just to be sure
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 23:01:02 +0200] rev 11097
- Fix for launching with SDL
Note: Worked actually, but this is not in guidelines of SDL...
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 22:55:02 +0200] rev 11096
- Fix for "Exception: Could not load OpenGL from /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib" at start of app
P.S. This error also a lovely one ]:->
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 22:52:24 +0200] rev 11095
- Fix for "error: invalid abbreviation code [115] for DIE at"
More info here: http://forum.unity3d.com/threads/error-in-lastest-xcode.233591/
Note: But in this case we are not be able to read crash reports without dSYM ! So, this need to be improved
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 22:45:23 +0200] rev 11094
- Fix for PascalImports and for GenLandPreview
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 22:08:43 +0200] rev 11093
- Fix for "operator delete[](void*)", referenced from: not found for architecture x86_64"
Note: Don't know why SDL2 mixer complaining about this
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 22:06:03 +0200] rev 11092
- Small reorg of project
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 22:04:56 +0200] rev 11091
- CoreMotion framework added to project for SDL 2
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 22:02:31 +0200] rev 11090
- Fix for "uWorld.s:4736:8: error: base register is 64-bit, but index register is not leal (%rax,%edx),%eax"
Note: I love this kind of errors ]:->
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 21:58:28 +0200] rev 11089
- Fix for ArgParsers.pas:368: 23: Identifier not found "cDefaultPathPrefix"
Note: Just created dummy cDefaultPathPrefix
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 21:50:23 +0200] rev 11088
- Fix for uTouch.pas:365: 34: Identifier not found "nilFingerId"
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 21:45:38 +0200] rev 11087
- Fix for uPhysFSLayer.pas:167: 17: Identifier not found "cFontsPaths"
Note: Just commented staff related to Fonts finding
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 21:42:41 +0200] rev 11086
- Another fix for uRender.pas
Note: SDLGLcontext not visible in scope of uRender, so moving it to uStore
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 21:37:19 +0200] rev 11085
- Fix for compiling 'uRender.pas'
Note: Construction "{$IF GLunit = gles11}" are not valid at all!
Assumptions: We are not using pas2c and using OpenGL ES 1.1
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 21:25:59 +0200] rev 11084
- Missed pascal source files added to project
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 21:22:19 +0200] rev 11083
- Turkish localization removed from Xcode project
Fix for: "Read failed: The data couldn’t be read because it isn’t in the correct format."
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 21:04:47 +0200] rev 11082
- fpc updated to 3.1.1
- Build scripts updated
Note1: fpc must be compiled from sources before! Full instructions here: http://blog.naver.com/simonsayz/220305479793
Note2: Build script for a moment worked only for iPhone simulator 8.x and for new arch (like iPhone 6 or iPad Air)
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 20:58:13 +0200] rev 11081
- 'Default-568h@2x.png' added for retina screen
Note: Weird Xcode staff
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 20:52:30 +0200] rev 11080
- VALID_ARCHS updated for main project
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 20:51:12 +0200] rev 11079
- Xcode projects updated to recommended settings (auto done by Xcode)
- Deployment target now 7.0
antonc27 <antonc27@mail.ru> [Sat, 08 Aug 2015 20:35:35 +0200] rev 11078
- .hgignore file updated for Xcode related files
sheepluva [Thu, 10 Sep 2015 04:59:02 +0200] rev 11077
small code cleanup
unc0rr [Tue, 08 Sep 2015 19:20:58 +0300] rev 11076
more work
unc0rr [Sat, 05 Sep 2015 20:12:49 +0300] rev 11075
Generate handlers for lists
nemo [Fri, 04 Sep 2015 08:14:12 -0400] rev 11074
fix a couple of typos
unc0rr [Thu, 03 Sep 2015 23:33:06 +0300] rev 11073
Generate handlers accepting parameters dummies
Wuzzy [Thu, 03 Sep 2015 15:01:55 -0400] rev 11072
Updated shoppa tournament winners
unc0rr [Thu, 03 Sep 2015 20:59:48 +0300] rev 11071
Merge default
nemo [Thu, 03 Sep 2015 11:51:08 -0400] rev 11070
Add some HHGear nil checks to teleport.
google bug #974
Wuzzy [Thu, 03 Sep 2015 09:00:26 -0400] rev 11069
tip changes, mostly new strategy suggestions
sheepluva [Thu, 03 Sep 2015 01:26:03 +0200] rev 11068
allow holding PRECISE key to switch portal ball colors in reverse order
nemo [Wed, 02 Sep 2015 11:55:37 -0400] rev 11067
Trying to get these scripts to behave properly, still WIP though.
sheepluva [Wed, 02 Sep 2015 16:58:31 +0200] rev 11066
fix internal function name
wuzzy [Wed, 02 Sep 2015 05:59:21 +0200] rev 11065
make tunnels script use MapFeatureSize
sheepluva [Wed, 02 Sep 2015 05:52:02 +0200] rev 11064
some more tweaks
sheepluva [Wed, 02 Sep 2015 04:59:17 +0200] rev 11063
make diagonal maze use map feature size
sheepluva [Wed, 02 Sep 2015 04:49:11 +0200] rev 11062
also expose MapFeatureSize in onPreviewInit
sheepluva [Wed, 02 Sep 2015 04:25:24 +0200] rev 11061
Lua API: expose MapFeatureSize during init
sheepluva [Wed, 02 Sep 2015 04:03:24 +0200] rev 11060
fix on-code documentation of EraseSprite
sheepluva [Wed, 02 Sep 2015 01:25:29 +0200] rev 11059
display circle for custom build dist values, display nothing if no limit. map borders are not taken into account at this point
sheepluva [Wed, 02 Sep 2015 00:39:35 +0200] rev 11058
Lua API: SetMaxBuildDistance([ distInPx ]) -- set to 0 for no limit; call with no param to reset to default
sheepluva [Tue, 01 Sep 2015 23:54:13 +0200] rev 11057
global variable for defining construction distance limit. value smaller 1 means no limit (wip)
unc0rr [Sun, 30 Aug 2015 18:03:44 +0300] rev 11056
Restore player clan on rejoin (
issue #934, not tested)
unc0rr [Sun, 30 Aug 2015 17:12:12 +0300] rev 11055
Fix inverse paused state for spectators joining paused game (not tested)
unc0rr [Thu, 27 Aug 2015 22:03:57 +0300] rev 11054
Check for CMD message a bit further down the control flow
unC0Rr [Thu, 27 Aug 2015 14:47:38 +0300] rev 11053
Don't accept any password from players banned on the website
nemo [Mon, 17 Aug 2015 14:14:58 -0400] rev 11052
add missing state binds in lua
nemo [Mon, 17 Aug 2015 10:56:24 -0400] rev 11051
just some indentation tweaks to help me read this while looking for possible causes of the iOS crasher
unc0rr [Sat, 15 Aug 2015 16:23:00 +0300] rev 11050
Some fixes
Wuzzy <almikes@aol.com> [Sun, 09 Aug 2015 07:20:18 +0200] rev 11049
Update English weapon descriptions
unC0Rr [Fri, 14 Aug 2015 17:07:36 +0300] rev 11048
Break it even more during refactoring
unC0Rr [Wed, 12 Aug 2015 17:30:14 +0300] rev 11047
Generate parameters structures
sheepluva [Mon, 10 Aug 2015 03:53:11 +0200] rev 11046
more copyright fixes
sheepluva [Mon, 10 Aug 2015 02:39:34 +0200] rev 11045
update copyright year in manpage
sheepluva [Sun, 09 Aug 2015 05:19:56 +0200] rev 11044
this should prevent hogs from hovering in air after using hammer
sheepluva [Sun, 09 Aug 2015 04:30:41 +0200] rev 11043
Hammer had been accessing dangling pointers under particular circumstances (e.g. when hitting a mine/barrel right when it exploded)
sheepluva [Sun, 09 Aug 2015 04:02:23 +0200] rev 11042
fix the fix
sheepluva [Sun, 09 Aug 2015 00:49:49 +0200] rev 11041
comment tweaks
sheepluva [Sun, 09 Aug 2015 00:25:35 +0200] rev 11040
tweak prev commit
sheepluva [Sun, 09 Aug 2015 00:19:33 +0200] rev 11039
Hammer changes/fixes: honor extra-damage (
issue #975), round up damage, do correct damage when being spammed in infinite-attack mode
nemo [Fri, 07 Aug 2015 07:30:14 -0400] rev 11038
Fix weapon name -
bug #967
mikade <redgrinner@gmail.com> [Thu, 06 Aug 2015 12:12:42 +0900] rev 11037
HedgeEditor (bring on the bug reports, wahey!)
nemo [Wed, 05 Aug 2015 11:33:02 -0400] rev 11036
oops. melon pieces need friction and elasticity to bounce right.
mikade <redgrinner@gmail.com> [Mon, 03 Aug 2015 17:07:38 +0900] rev 11035
May He Improve Our Graphics Forevermore
mikade <redgrinner@gmail.com> [Mon, 03 Aug 2015 12:24:12 +0900] rev 11034
Add Wuzzy's SpeedShoppa challenges.
Update ChangeLog.txt
unc0rr [Sat, 01 Aug 2015 00:13:05 +0300] rev 11033
Make RESTART_SERVER invokable
unc0rr [Sat, 01 Aug 2015 00:09:59 +0300] rev 11032
Use helper function instead of ton of copypasta
unc0rr [Fri, 31 Jul 2015 00:25:31 +0300] rev 11031
Fixes to 10760 to reduce desyncs on checkers and better heat my room during long dark winter nights
nemo [Thu, 30 Jul 2015 16:28:35 -0400] rev 11030
darken and blur the cupcake a bit so that people stop trying to teleport on it
mikade <redgrinner@gmail.com> [Thu, 30 Jul 2015 22:19:05 +0900] rev 11029
GetHogVoicepack,GetHogFlag,GetHogGrave
Wuzzy [Mon, 27 Jul 2015 11:51:05 -0400] rev 11028
Block bouncing on the anti-portal surfaces
unc0rr [Thu, 23 Jul 2015 19:51:14 +0300] rev 11027
Don't allow too big messages from clients
unc0rr [Tue, 21 Jul 2015 23:51:58 +0300] rev 11026
Put diagnostic message into log when quitting due to end of input in demo replay mode
nemo [Tue, 21 Jul 2015 08:41:06 -0400] rev 11025
just disable landpixels w/ blurry land instead. the mask can be helpful for debugging at least.
nemo [Tue, 21 Jul 2015 08:28:48 -0400] rev 11024
disable land dump when using blurry land setting.
sheepluva [Sun, 19 Jul 2015 13:19:20 +0200] rev 11023
some visual tweaks to art theme. sue. me.
sheepluva [Sun, 19 Jul 2015 04:05:19 +0200] rev 11022
add some chat message colors
sheepluva [Sun, 19 Jul 2015 03:10:00 +0200] rev 11021
fix timebox sprite
sheepluva [Sat, 18 Jul 2015 19:10:57 +0200] rev 11020
fix pickhammer collision when moving upwards, thanks to MK for reporting
sheepluva [Sat, 18 Jul 2015 02:44:36 +0200] rev 11019
always draw border on terrain if there is only a map mask and no map image. this is a workaround for the fact that space campaign masks use white (lfObject) color instead of black (lfBasic)
sheepluva [Fri, 17 Jul 2015 10:06:00 +0200] rev 11018
unpause game when finishing game
sheepluva [Thu, 16 Jul 2015 22:16:35 +0200] rev 11017
change theme used by sniper training, for performance reasons
sheepluva [Thu, 16 Jul 2015 21:50:59 +0200] rev 11016
remove 2 training missions as suggested in
issue #868
nemo [Thu, 16 Jul 2015 08:39:35 -0400] rev 11015
CRLF purge
sheepluva [Wed, 15 Jul 2015 00:27:12 +0200] rev 11014
small german string fix
mikade <redgrinner@gmail.com> [Tue, 14 Jul 2015 20:06:07 +0900] rev 11013
ups, remove random testing vars
mikade <redgrinner@gmail.com> [Tue, 14 Jul 2015 20:01:15 +0900] rev 11012
tentative/lazy fixes for unC0Rr's evil
sheepluva [Tue, 14 Jul 2015 03:45:27 +0200] rev 11011
update german translation
sheepluva [Tue, 14 Jul 2015 02:01:58 +0200] rev 11010
merge
wuzzy [Tue, 14 Jul 2015 01:56:47 +0200] rev 11009
update for "that sinking feeling"
sheepluva [Mon, 13 Jul 2015 23:30:12 +0200] rev 11008
fix some typos
wuzzy [Mon, 13 Jul 2015 22:10:01 +0200] rev 11007
german lua strings translation
sheepluva [Mon, 13 Jul 2015 11:01:01 +0200] rev 11006
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva [Mon, 13 Jul 2015 06:19:51 +0200] rev 11005
just ignore gfDivideTeams if more/less than 2 teams. instead of quitting with fatal error
sheepluva [Sun, 12 Jul 2015 23:15:39 +0200] rev 11004
chat: make sure that CTRL is the /only/ modifier key pressed when detecting ctrl+a etc
sheepluva [Sun, 12 Jul 2015 08:20:33 +0200] rev 11003
small changelog update
nemo [Sat, 11 Jul 2015 18:36:06 -0400] rev 11002
remove teamgone. desyncs now. less interesting without the animation, perhaps something should be flagged to replace it
sheepluva [Sat, 11 Jul 2015 18:28:26 +0200] rev 11001
please avoid # in filenames
nemo [Thu, 09 Jul 2015 13:27:56 -0400] rev 11000
Fix build w/o S3D and video recording. untested.
nemo [Tue, 07 Jul 2015 19:19:43 -0400] rev 10999
merge
wuzzy [Sat, 04 Jul 2015 21:48:02 +0200] rev 10998
german translation update
nemo [Tue, 07 Jul 2015 19:19:18 -0400] rev 10997
update hl for .22 airmines
sheepluva [Sat, 04 Jul 2015 03:43:41 +0200] rev 10996
fix Rubberduck grave
sheepluva [Wed, 24 Jun 2015 01:23:37 +0200] rev 10995
fallback to Default voicepack if specified voicepack is not available
nemo [Tue, 16 Jun 2015 10:08:07 -0400] rev 10994
bit friendlier if the uVariables values get changed
nemo [Fri, 12 Jun 2015 17:28:20 -0400] rev 10993
Just to prevent airmines from stealing camera when they blow up... but really what is needed I think is forcing camera to stay on current hedgehog if you are the active player. either all the time, or at least if you are on rope/saucer.
sheepluva [Thu, 11 Jun 2015 03:31:33 +0200] rev 10992
hog number display: no blinking
unc0rr [Wed, 10 Jun 2015 23:21:30 +0300] rev 10991
Time is stored in bytestring now
unc0rr [Wed, 10 Jun 2015 23:05:38 +0300] rev 10990
Buggy executeMany?
nemo [Mon, 08 Jun 2015 08:21:09 -0400] rev 10989
ambiguous
sheepluva [Sun, 07 Jun 2015 04:40:02 +0200] rev 10988
mention hoggywood and cake in the changelog
sheepluva [Sat, 06 Jun 2015 23:57:12 +0200] rev 10987
fix flower grave
sheepluva [Sat, 06 Jun 2015 23:28:07 +0200] rev 10986
fix statue grave
sheepluva [Sat, 06 Jun 2015 22:10:11 +0200] rev 10985
fix chat lines losing color information on texture reload
unc0rr [Thu, 04 Jun 2015 19:57:04 +0300] rev 10984
More ifdefs \o/ (fix build even more)
unc0rr [Wed, 03 Jun 2015 23:24:56 +0300] rev 10983
Lazy fix for server build
koda [Tue, 02 Jun 2015 19:53:30 +0100] rev 10982
Added tag 0.9.21-release, fab746a3597e for
changeset 7e55468ffe38
koda [Wed, 03 Jun 2015 14:50:54 +0100] rev 10981
Update .hgignore file
koda [Wed, 03 Jun 2015 14:52:30 +0100] rev 10980
merge, mah friend, long time no see
mikade <redgrinner@gmail.com> [Wed, 03 Jun 2015 22:16:03 +0900] rev 10979
- some new mission icons
- add variable portal limiter (and effects) to TechRacer
- allow variable (not just infinite) ufo fuel
- possibly break stuff some
- more whitespace?
nemo [Wed, 03 Jun 2015 07:30:12 -0400] rev 10978
cursor x/y when targeting for mikade's visual effects. this is not synced
koda [Tue, 02 Jun 2015 19:51:04 +0100] rev 10977
Fix building hedgewars-server
koda [Tue, 02 Jun 2015 18:37:40 +0100] rev 10976
Allow skipping the bundle step after install on OSX
koda [Tue, 02 Jun 2015 18:10:46 +0100] rev 10975
Make sure that the png library name is always defined
koda [Tue, 02 Jun 2015 17:57:15 +0100] rev 10974
Fix libsdl bundling on OSX when library rather than framework is used
koda [Tue, 02 Jun 2015 01:58:10 +0100] rev 10973
Move OSX SDL library configuration from SDLh to proper CMakeLists
koda [Tue, 02 Jun 2015 01:28:21 +0100] rev 10972
Fix retina rendering on OSX
This does not actually improve any graphics, but at least OSX native
GUI elements won't look pixellated any more.
koda [Mon, 01 Jun 2015 14:30:22 +0200] rev 10971
Fix building on OSX when autoupdate is disabled
sheepluva [Tue, 26 May 2015 23:29:53 +0200] rev 10970
LuaAPI: fix OnHogAttack the incorrect AmmoType (amNothing) under certain conditions. Thanks for CheezeMonkey for reporting this
nemo [Wed, 27 May 2015 10:37:12 -0400] rev 10969
add a bit more spacing around stars, add pad parameter to increase spacing between objects
mikade <redgrinner@gmail.com> [Wed, 27 May 2015 23:00:56 +0900] rev 10968
- reorder waypoint preview
- make infinite UFO fuel map-dependant
mikade <redgrinner@gmail.com> [Wed, 27 May 2015 22:34:11 +0900] rev 10967
- preview generation for rubbers, air-mines, crates, barrels
- add map previews for the other 6 TechRacer maps
- make TechRacer (more or less) work out the box
- randomize map by clicking on preview (when map unspecified)
unC0Rr [Tue, 26 May 2015 12:00:39 +0300] rev 10966
merge
sheepluva [Tue, 26 May 2015 10:42:17 +0200] rev 10965
merge git head and hg head
unC0Rr [Tue, 26 May 2015 11:59:46 +0300] rev 10964
Make sure to have gstMoving flag cleared
nemo [Mon, 25 May 2015 16:53:52 -0400] rev 10963
call setScript update if scheme changes, due to scriptparams
sheepluva [Mon, 25 May 2015 22:50:38 +0200] rev 10962
merge
nemo [Mon, 25 May 2015 16:40:04 -0400] rev 10961
Also preview waypoints
sheepluva [Mon, 25 May 2015 22:32:32 +0200] rev 10960
some changelog additions, not complete yet
nemo [Mon, 25 May 2015 15:48:07 -0400] rev 10959
Pass ScriptParams to preview to support techracer. Proof of concept for techracer, generate a preview for m=4
sheepluva <sheepluva@users.noreply.github.com> [Mon, 25 May 2015 14:26:54 +0200] rev 10958
Merge pull request #34 from CaF2/master
Changed to continental supplies from the DLC, because its better :P
nemo [Mon, 25 May 2015 14:31:06 -0400] rev 10957
prevent damage colouring of indestructible terrain
caf2 <florian.evaldsson@telia.com> [Mon, 25 May 2015 13:53:12 +0200] rev 10956
Changed to continental supplies from the DLC, because its better :P
nemo [Sun, 24 May 2015 15:44:21 -0400] rev 10955
change from default of 4 (like land mines) to 0, since it was breaking old scripts.
nemo [Sun, 24 May 2015 15:13:03 -0400] rev 10954
Bunch of flags off forum, reviewed/renamed by wuzzy and sheepluva
unc0rr [Tue, 21 Jul 2015 23:46:52 +0300] rev 10953
Put types into a separate file
nemo [Fri, 22 May 2015 13:39:12 -0400] rev 10952
don't decrement 0 timer for air mines...
unc0rr [Thu, 21 May 2015 00:19:06 +0300] rev 10951
- Move protocol handling events to main thread through qt's main loop
- Reorganize code a bit
mikade <redgrinner@gmail.com> [Thu, 21 May 2015 18:21:55 +0900] rev 10950
- (Finally) automatically load points for all current TechRacer maps
- Hack / break some stuff
- Suspend two of the crappier maps
unc0rr [Mon, 18 May 2015 00:20:09 +0300] rev 10949
merge default
mikade <redgrinner@gmail.com> [Sat, 16 May 2015 19:15:08 +0900] rev 10948
your guess is as good as mine
mikade <redgrinner@gmail.com> [Sat, 16 May 2015 19:08:45 +0900] rev 10947
Add two new maps, improve an old one
Fix a few maps so they can be converted into HWMAP format
mikade <redgrinner@gmail.com> [Thu, 14 May 2015 23:09:21 +0900] rev 10946
extensive changes
mikade <redgrinner@gmail.com> [Wed, 13 May 2015 23:01:00 +0900] rev 10945
hopefully fix some placements
unc0rr [Tue, 12 May 2015 22:38:33 +0300] rev 10944
- Fix order of messages, also don't duplicate last timestamped message
- Comment out useless line in uTeams
mikade <redgrinner@gmail.com> [Tue, 12 May 2015 22:09:25 +0900] rev 10943
migrate maps, new map, minor fixes
nemo [Mon, 11 May 2015 13:53:08 -0400] rev 10942
This probably fixes bug #839 - mine time was hardcoded to 3000 in Attack, instead of using the "0 as undefined" input that other places were using. When
re653e96b0ec3 started paying attention to the input parameter, this previously ignored value became a problem.
unc0rr [Mon, 11 May 2015 19:58:54 +0300] rev 10941
- Take girder height into account (fix
issue #908)
- Fix off-by-2 error in girder placement
- Some tweaks to allow for more girders placed
mikade <redgrinner@gmail.com> [Sat, 09 May 2015 14:30:01 +0900] rev 10940
Added param for rounds in techracer.
Also some support for hand-drawn map placed stuff.
sheepluva [Fri, 08 May 2015 15:36:19 +0200] rev 10939
reduce volume a bit more. also fix engine hint
nemo [Fri, 08 May 2015 09:16:21 -0400] rev 10938
50% volume on music to make sheepluva happy
sheepluva [Thu, 07 May 2015 17:57:57 +0200] rev 10937
add simple build instructions
unC0Rr [Thu, 07 May 2015 17:29:12 +0300] rev 10936
Long awaited hwmap<->txt converter, which took less than hour to make
unc0rr [Mon, 18 May 2015 00:07:52 +0300] rev 10935
Move SDLNet_TCP_Send to its own thread
mikade <redgrinner@gmail.com> [Thu, 07 May 2015 21:56:21 +0900] rev 10934
fml
unc0rr [Sun, 17 May 2015 00:14:30 +0300] rev 10933
Some more work on flib network
mikade <redgrinner@gmail.com> [Thu, 07 May 2015 21:48:19 +0900] rev 10932
oops
unc0rr [Fri, 15 May 2015 23:28:31 +0300] rev 10931
Parse net commands, answer to pings
mikade <redgrinner@gmail.com> [Thu, 07 May 2015 21:44:19 +0900] rev 10930
one more map, extra param
unc0rr [Wed, 13 May 2015 23:21:40 +0300] rev 10929
Mockup of protocol parser
sheepluva [Tue, 05 May 2015 12:48:25 +0200] rev 10928
merge: merge the git merge head into hg tip, with anothera hg merge. merge. merge. merge. merge. meeeerrrrgeeee.
unc0rr [Mon, 11 May 2015 00:27:16 +0300] rev 10927
Fix jumpts table, build array of handlers (wip)
sheepluva [Mon, 04 May 2015 18:32:33 +0200] rev 10926
chat: simplify some code and fix bugs I noticed during testing
unc0rr [Sat, 09 May 2015 23:30:19 +0300] rev 10925
Produce some useful code
unc0rr [Mon, 04 May 2015 18:39:00 +0300] rev 10924
Less code - less bugs (fix pas2c build)
sheepluva <sheepluva@users.noreply.github.com> [Mon, 04 May 2015 23:52:56 +0200] rev 10923
Merge pull request #32 from gunchleoc/master
New gd (Scottish Gaelic) translation of main ts file.
unc0rr [Mon, 04 May 2015 17:49:15 +0300] rev 10922
merge default
sheepluva [Fri, 01 May 2015 00:17:38 +0200] rev 10921
chat: further tweaks and cleanups
sheepluva [Thu, 30 Apr 2015 21:53:41 +0200] rev 10920
different implementation for utf-8 char detection/handling
sheepluva [Thu, 30 Apr 2015 18:59:54 +0200] rev 10919
chat: generate utf8 info e.g. for pasted contents
mikade <redgrinner@gmail.com> [Sat, 02 May 2015 11:47:55 +0900] rev 10918
fix techracer map 3
another small test map
unc0rr [Fri, 01 May 2015 23:22:23 +0300] rev 10917
- ?Fix? nemo's attempt in
r959219241c67
- Wrap mode: camera comes to followgear by the shortest path (better implementation, than sheepluva's
re0d7d499c851)
- Wrap mode: keep less than 50% of the screen grayed
unc0rr [Fri, 01 May 2015 22:01:14 +0300] rev 10916
merge
mikade <redgrinner@gmail.com> [Fri, 01 May 2015 22:23:37 +0900] rev 10915
ups, forgot we need to make TechRacer aware of airmines
mikade <redgrinner@gmail.com> [Fri, 01 May 2015 22:08:13 +0900] rev 10914
new test for lols
removed hwp and old maps
gunchleoc <fios@foramnagaidhlog.net> [Sat, 18 Apr 2015 10:32:12 +0100] rev 10913
New gd translation of main ts file.
unc0rr [Wed, 29 Apr 2015 17:17:40 +0300] rev 10912
Catch exceptions in accept() call
vittorio.giovara@gmail.com [Mon, 27 Apr 2015 17:21:58 +0000] rev 10911
Do not set rpath when binaries are installed in the standard search path
$ rpmlint hedgewars
hedgewars.i686: E: binary-or-shlib-defines-rpath /usr/bin/hwengine ['$ORIGIN/../lib/', '$ORIGIN/', '/usr/lib/']
hedgewars.i686: E: binary-or-shlib-defines-rpath /usr/lib/libphyslayer.so ['$ORIGIN/../lib/', '$ORIGIN/', '/usr/lib/']
hedgewars.i686: E: binary-or-shlib-defines-rpath /usr/bin/hedgewars ['$ORIGIN/../lib/', '$ORIGIN/', '/usr/lib/']
unc0rr [Sat, 11 Apr 2015 17:37:43 +0300] rev 10910
Add ceil() function to fpcrtl of pas2c
unc0rr [Sat, 11 Apr 2015 15:34:07 +0300] rev 10909
Silly fixes for silly pas2c
unc0rr [Mon, 04 May 2015 17:48:57 +0300] rev 10908
Try another approach, WIP
unc0rr [Fri, 10 Apr 2015 23:58:05 +0300] rev 10907
Switch to mysql-simple, as hdbc package seems to be abandoned and anyway never satisfied me
unc0rr [Wed, 29 Apr 2015 23:52:18 +0300] rev 10906
Rendering some code
nemo [Fri, 10 Apr 2015 11:14:53 -0400] rev 10905
bouncy/noportal check after spawn
unc0rr [Tue, 28 Apr 2015 23:26:12 +0300] rev 10904
Some more work on network client implementation
nemo [Fri, 10 Apr 2015 10:36:17 -0400] rev 10903
tweak erase
unc0rr [Tue, 28 Apr 2015 11:49:48 +0300] rev 10902
Will use own tree type
nemo [Wed, 08 Apr 2015 23:59:35 -0400] rev 10901
also erase
unc0rr [Sat, 25 Apr 2015 23:46:09 +0300] rev 10900
Some hedgewars coding a week keeps doctor away
nemo [Wed, 08 Apr 2015 15:10:44 -0400] rev 10899
fix copypasta typo, failure to bump offset of lf params
unc0rr [Wed, 22 Apr 2015 23:33:16 +0300] rev 10898
Some futher work on flib net client part
nemo [Wed, 08 Apr 2015 15:04:48 -0400] rev 10897
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
unc0rr [Thu, 16 Apr 2015 23:31:13 +0300] rev 10896
Start network support: only setting up a connection for now
nemo [Sun, 05 Apr 2015 16:41:39 -0400] rev 10895
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
unC0Rr [Tue, 14 Apr 2015 11:18:14 +0300] rev 10894
Racer challenge map #17
mikade <redgrinner@gmail.com> [Sun, 05 Apr 2015 12:44:54 +0900] rev 10893
fix error in Nobody Laugh
unc0rr [Sat, 11 Apr 2015 22:39:29 +0300] rev 10892
Make ammo scheme work
nemo [Fri, 03 Apr 2015 16:46:14 -0400] rev 10891
enable bounce on rubber for air bombs. give them the missing elasticity they needed for the code there to work properly.
unc0rr [Sat, 11 Apr 2015 17:23:56 +0300] rev 10890
Oops, forgot this file
nemo [Fri, 03 Apr 2015 16:39:09 -0400] rev 10889
give melon pieces a radius. is why they weren't bouncing.
unc0rr [Wed, 08 Apr 2015 23:39:18 +0300] rev 10888
Ammo schemes list, almost works
nemo [Fri, 03 Apr 2015 15:20:08 -0400] rev 10887
Make FP tunnel 2px wider.
unc0rr [Thu, 02 Apr 2015 21:09:56 +0300] rev 10886
- Merge default
- *cough* sorry, but also in this commit: move *.qml files into qrc, include qmlFrontend into cmake build, also exclude QTfrontend
unc0rr [Wed, 01 Apr 2015 22:46:52 +0300] rev 10885
racer challenge map #16
unC0Rr [Wed, 01 Apr 2015 10:17:01 +0300] rev 10884
Fix off-by-1 error
sheepluva [Wed, 01 Apr 2015 02:42:37 +0200] rev 10883
terminate engine and output fatal error message if hedgehogs are added incorrectly
unc0rr [Tue, 31 Mar 2015 23:14:09 +0300] rev 10882
- Fix ping timeouts after incorrect "/vote" commands (protocol violation)
- Add "/info" command
- Add "/maxteams" command to specify desired maximum number of teams in your room
unc0rr [Tue, 31 Mar 2015 23:01:53 +0300] rev 10881
"/force" command for server admin to force voting result
unc0rr [Tue, 31 Mar 2015 22:50:12 +0300] rev 10880
Send notice when accepting vote
unc0rr [Tue, 31 Mar 2015 22:37:04 +0300] rev 10879
Don't change hedgehogs total number to a value > 48 as result of voting.
sheepluva [Tue, 31 Mar 2015 03:41:36 +0200] rev 10878
small pixel jizz tweak
sheepluva [Tue, 31 Mar 2015 02:30:29 +0200] rev 10877
alternative explosion border smoothing
sheepluva [Tue, 31 Mar 2015 00:15:00 +0200] rev 10876
draw birdy's feathers in low quality mode too
sheepluva [Wed, 25 Mar 2015 21:30:04 +0100] rev 10875
only display cake timer if it is low
sheepluva [Wed, 25 Mar 2015 20:30:52 +0100] rev 10874
allow gear specific data (with gear type specific type). applied to cake
sheepluva [Tue, 24 Mar 2015 21:18:05 +0100] rev 10873
still messing with rendering
unc0rr [Tue, 24 Mar 2015 22:51:49 +0300] rev 10872
Hints for bottom feeder, which were somehow lost
sheepluva [Tue, 24 Mar 2015 19:25:03 +0100] rev 10871
rendering tweaks cont.
sheepluva [Tue, 24 Mar 2015 16:52:35 +0100] rev 10870
rendering tweaks cont.
sheepluva [Tue, 24 Mar 2015 12:48:55 +0100] rev 10869
rendering tweaks/cleanup cont.
sheepluva [Mon, 23 Mar 2015 02:03:45 +0100] rev 10868
show correct default if current team is local team
sheepluva [Sun, 22 Mar 2015 22:06:44 +0100] rev 10867
fix segfault caused by last commit if spectating
sheepluva [Sun, 22 Mar 2015 21:40:16 +0100] rev 10866
make using hog speech a bit more comfortable
nemo [Fri, 20 Mar 2015 15:00:52 -0400] rev 10865
remove switch from allowed utilities. 14:57 <@unC0Rr> way too OP
sheepluva [Thu, 19 Mar 2015 21:23:56 +0100] rev 10864
don't modify collision data when applying visual edge smoothing
sheepluva [Wed, 18 Mar 2015 21:52:13 +0100] rev 10863
fallback to first color in colors array if there is no valid color specified
unc0rr [Wed, 18 Mar 2015 23:18:52 +0300] rev 10862
Don't spawn team widget sorter on each frame when in lag. Issue 'spectate 0' instead, and only on first lag occasion.
unc0rr [Wed, 18 Mar 2015 23:13:37 +0300] rev 10861
Also update wind indicator on lag when joining midgame
sheepluva [Wed, 18 Mar 2015 21:03:53 +0100] rev 10860
changed/fixed alpha blending in copyToXYFromRect
unc0rr [Wed, 18 Mar 2015 22:57:29 +0300] rev 10859
Only allow one instance of vgtSmoothWindbar also
unc0rr [Tue, 17 Mar 2015 23:57:26 +0300] rev 10858
Don't do anything if sorter was replaced, even for one tick only. Hopefully fixes
issue #907, but not confirmed, though very highly plausible.
unC0Rr [Mon, 16 Mar 2015 11:12:18 +0300] rev 10857
Script parameter to adjust winning score for Mutant
nemo [Sun, 15 Mar 2015 22:01:10 -0400] rev 10856
team coloured, just for the heck of it, based on a param. also del airmine, 'cause, probably not fun here. you're invuln anyway.
nemo [Sun, 15 Mar 2015 16:14:43 -0400] rev 10855
merge ☹
unC0Rr [Fri, 13 Mar 2015 14:09:44 +0300] rev 10854
Racer challenge map #15
sheepluva [Sun, 08 Mar 2015 03:04:06 +0100] rev 10853
and ofc fix pas2c build
sheepluva [Sun, 08 Mar 2015 02:40:32 +0100] rev 10852
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva [Sun, 08 Mar 2015 01:51:27 +0100] rev 10851
chat/copypaste: some adjustments and sanity checks
sheepluva [Sun, 08 Mar 2015 01:04:41 +0100] rev 10850
copy to/paste from system clipboard (via frontend)
sheepluva [Fri, 06 Mar 2015 21:24:21 +0100] rev 10849
copy&paste (wip), currently using only a local clipboard
nemo [Sun, 15 Mar 2015 16:14:13 -0400] rev 10848
Allow rope tinting
unc0rr [Tue, 03 Mar 2015 22:22:29 +0300] rev 10847
amNothing is fine to use in any type of race too
sheepluva [Sun, 01 Mar 2015 21:06:27 +0100] rev 10846
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva [Sun, 01 Mar 2015 20:38:52 +0100] rev 10845
quick word deletion while holding ctrl (qt style)
sheepluva [Sun, 01 Mar 2015 20:14:23 +0100] rev 10844
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva [Sun, 01 Mar 2015 17:32:26 +0100] rev 10843
whoops, pas2c did not notice this missing ;
sheepluva [Sun, 01 Mar 2015 17:12:02 +0100] rev 10842
since fonts can be loaded in late, update cursor position before first chat display
sheepluva [Sun, 01 Mar 2015 16:45:24 +0100] rev 10841
make team key play well with new cursor
sheepluva [Sun, 01 Mar 2015 16:38:18 +0100] rev 10840
add newline after warning
sheepluva [Sun, 01 Mar 2015 16:32:14 +0100] rev 10839
make sure cursor drawing position does not get messed up by screen resize
sheepluva [Sun, 01 Mar 2015 15:56:00 +0100] rev 10838
teach pas2c how to insert() shortstrings
sheepluva [Sun, 01 Mar 2015 15:04:31 +0100] rev 10837
pas2c does not like setlength called with a shortstring apparently
sheepluva [Sun, 01 Mar 2015 04:15:11 +0100] rev 10836
selections
sheepluva [Sat, 28 Feb 2015 22:20:53 +0100] rev 10835
fix chat input history not restoring utf8-related info
sheepluva [Sat, 28 Feb 2015 17:29:07 +0100] rev 10834
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
unC0Rr [Thu, 26 Feb 2015 15:38:10 +0300] rev 10833
Racer challenge map #14
unC0Rr [Wed, 18 Feb 2015 14:44:59 +0300] rev 10832
Racer challenge #13
nemo [Tue, 17 Feb 2015 16:05:54 -0500] rev 10831
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo [Tue, 17 Feb 2015 12:09:27 -0500] rev 10830
Make hedgewars frontend not change scheme/weps to Default if script cfg doesn't match a known scheme. That is, will leave on whatever is selected. Also set a bunch of schemes where we don't care what the scheme/weps are to *
nemo [Tue, 17 Feb 2015 10:04:32 -0500] rev 10829
avoid airmines too when spawning
nemo [Tue, 17 Feb 2015 09:50:22 -0500] rev 10828
bit more friction. remove gstSubmersible clearing. was for the old "sea" thing that is totally gone now. As a general attribute, better to let other stuff clear it as needed.
nemo [Mon, 16 Feb 2015 13:58:32 -0500] rev 10827
make mines submersible
nemo [Sun, 15 Feb 2015 21:27:27 -0500] rev 10826
oops, forgot this annoying thing
nemo [Sun, 15 Feb 2015 15:35:46 -0500] rev 10825
0s mine time
nemo [Sun, 15 Feb 2015 15:34:32 -0500] rev 10824
make air mines respawn on climbhome
unc0rr [Mon, 16 Feb 2015 22:33:15 +0300] rev 10823
Introducing cbAmmo
nemo [Sat, 14 Feb 2015 22:25:31 -0500] rev 10822
hook up to frontend
unc0rr [Mon, 09 Feb 2015 00:37:59 +0300] rev 10821
Fix schemes loading
nemo [Sat, 14 Feb 2015 17:47:28 -0500] rev 10820
Fix bug, undo debug level in server, set air mine number to something non-debug
unc0rr [Sun, 08 Feb 2015 00:10:05 +0300] rev 10819
Send selected scheme config on engine initialization (WIP)
nemo [Sat, 14 Feb 2015 17:34:12 -0500] rev 10818
Add placement of airmines in engine outside of hog proximity. Has a bug, only protecting 1st team. Also fix a spelling error and rename gstHHChooseTarget to gstChooseTarget
unc0rr [Sat, 07 Feb 2015 23:26:14 +0300] rev 10817
merge with default
unc0rr [Sat, 07 Feb 2015 23:25:33 +0300] rev 10816
merge
unc0rr [Sat, 07 Feb 2015 11:53:08 +0300] rev 10815
Fix pas2c?
unc0rr [Sat, 07 Feb 2015 00:19:54 +0300] rev 10814
This should help with second rejoin bug. (reverting previous workaround over frontend bug and making a new one)
unC0Rr [Fri, 06 Feb 2015 16:08:02 +0300] rev 10813
One more medium template
nemo [Sat, 31 Jan 2015 23:14:12 -0500] rev 10812
fix typo
nemo [Sat, 31 Jan 2015 22:18:40 -0500] rev 10811
I guess the params shouldn't be all or nothing.
nemo [Sat, 31 Jan 2015 22:13:44 -0500] rev 10810
add some config params - speed,accel,delaytime,delayheight,nocake. water rise speed, water rise acceleration, time delay from start of turn for water rise, height delay for same, and disable cake. also set start boulder to indestructible
nemo [Sun, 25 Jan 2015 16:10:20 -0500] rev 10809
Add generic getter/setter for a bunch of more obscure gear structure values
nemo [Sun, 25 Jan 2015 14:48:02 -0500] rev 10808
Add a couple of more variable bindings, make all the set visual gear values optional, to allow skipping trailing params or specifying ones in the middle as nil to not set. Should make using it more convenient in simple cases.
nemo [Sat, 24 Jan 2015 13:49:57 -0500] rev 10807
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo [Wed, 21 Jan 2015 16:00:08 -0500] rev 10806
more turn-based-y
nemo [Sun, 18 Jan 2015 22:48:23 -0500] rev 10805
inherit mines time div 4
sheepluva [Mon, 19 Jan 2015 01:18:43 +0100] rev 10804
feedback/linux: fix wrong mem size being reported if mem > 4GB. thanks to tomreyn for reporting this issue
nemo [Sun, 18 Jan 2015 17:14:37 -0500] rev 10803
merge 0.9.21, hopefully without screwing anything up due to this having been left for a while + parallel commits that occurred...
nemo [Sun, 18 Jan 2015 16:57:32 -0500] rev 10802
Use the larger scaled airmine sprite originally intended, add some antidickery measures.
unc0rr [Mon, 19 Jan 2015 00:12:26 +0300] rev 10801
Fix here too
nemo [Sun, 18 Jan 2015 16:01:09 -0500] rev 10800
more tweakery
nemo [Sun, 18 Jan 2015 15:12:54 -0500] rev 10799
initialise trackSpeed, add nil check before resetting seek timer
nemo [Sun, 18 Jan 2015 15:03:35 -0500] rev 10798
er... didn't mean to leave this line in
sheepluva [Sun, 18 Jan 2015 20:59:37 +0100] rev 10797
begin/end
nemo [Sun, 18 Jan 2015 14:48:23 -0500] rev 10796
merge
sheepluva [Sun, 18 Jan 2015 15:36:36 +0100] rev 10795
fix pas2c (airbomb code: "not" statement in boolean expression was without parentheses)
nemo [Sun, 18 Jan 2015 14:47:25 -0500] rev 10794
radius and sprite drawing tweaks to match the still temporary sprite. also a begin/end sheepluva suggested
sheepluva [Sat, 17 Jan 2015 21:41:01 +0100] rev 10793
oops. I committed hat fix to .21 branch
nemo [Sun, 18 Jan 2015 14:18:06 -0500] rev 10792
Toss in scaled down underwater SD mine as "air mine" pending, er, cybernetic butterflies or whatever
nemo [Sat, 17 Jan 2015 10:07:12 -0500] rev 10791
tweak a few params. still something wtf going on when on rope
sheepluva [Sat, 17 Jan 2015 14:26:25 +0100] rev 10790
merge