log

age author description
Mon, 12 May 2014 00:13:39 +0200 Grumpy7 ODMFace::IsBackfaceCulled to ODMFace::IsBackfaceNotCulled, cleaned up a bit
Sun, 11 May 2014 23:17:23 +0200 Grumpy7 OutdoorLocation::UpdateSunlightVectors removing some unnecessary typecasts
Sun, 11 May 2014 23:12:36 +0200 Grumpy7 OutdoorLocation::GetTravelDestination cleaned up a bit
Sun, 11 May 2014 22:55:26 +0200 Grumpy7 OutdoorLocation::_47F04C and OutdoorLocation::_47F097 to OutdoorLocation::IsMapCellFullyRevealed and OutdoorLocation::IsMapCellPartiallyRevealed
Sun, 11 May 2014 22:49:19 +0200 Grumpy7 OutdoorLocation::UpdateDiscoveredArea cleaned up
Thu, 01 May 2014 12:59:50 +0200 Grumpy7 Merge
Thu, 01 May 2014 12:59:27 +0200 Grumpy7 some more function shuffling
Sat, 19 Apr 2014 23:56:01 +0600 Ritor1 for eliminate memory flow in video
Wed, 16 Apr 2014 17:36:47 +0600 Ritor1 MovieRelease();
Sat, 12 Apr 2014 02:29:26 +0600 Ritor1 alSourceStop(mSourceID);
Thu, 10 Apr 2014 17:35:26 +0600 Ritor1 Merge
Thu, 10 Apr 2014 17:35:10 +0600 Ritor1 m
Thu, 10 Apr 2014 17:34:50 +0600 Ritor1 Elements of VideoPlayer structure moved
Wed, 09 Apr 2014 22:58:22 +0200 Grumpy7 Moving more functions out of unsorted_subs
Wed, 09 Apr 2014 21:58:46 +0200 Grumpy7 Readding unsorted_subs to UIMapbook.cpp
Wed, 09 Apr 2014 21:58:09 +0200 Grumpy7 Removing a few unsorted_subs includes
Wed, 09 Apr 2014 21:51:06 +0200 Grumpy7 Moving zlib wrappers to separate headers
Wed, 09 Apr 2014 21:49:35 +0200 Grumpy7 Adding include guards to new UI headers
Wed, 09 Apr 2014 21:45:07 +0200 Grumpy7 Finishing moving all known UI functions to their appropriate headers
Wed, 09 Apr 2014 21:30:45 +0200 Grumpy7 Adding GUIButton.h
Wed, 09 Apr 2014 21:22:06 +0200 Grumpy7 Created header files for UI cpp files
Tue, 08 Apr 2014 17:39:59 +0600 Ritor1 VideoPlayer cleaning
Mon, 07 Apr 2014 19:15:31 +0600 Ritor1 Слияние
Mon, 07 Apr 2014 19:15:13 +0600 Ritor1 for MultimediaPlayer
Sun, 06 Apr 2014 21:27:02 +0200 Grumpy7 Moving functions from unsorted_subs.h pt6
Sun, 06 Apr 2014 21:12:24 +0200 Grumpy7 Moving functions from unsorted_subs.h pt5
Sun, 06 Apr 2014 12:57:04 +0200 Grumpy7 Adding Registry.h/.cpp to project
Sun, 06 Apr 2014 12:56:49 +0200 Grumpy7 Moving registry access stuff to Registry.h/cpp
Sun, 06 Apr 2014 12:50:35 +0200 Grumpy7 Moving functions from unsorted_subs.h pt4
Sun, 06 Apr 2014 12:37:28 +0200 Grumpy7 Moving functions from unsorted_subs.h pt3
Sat, 05 Apr 2014 20:27:09 +0200 Grumpy7 Moving some function declarations from unsorted subs to Actor.h and SpriteObject.h
Sat, 05 Apr 2014 20:14:15 +0200 Grumpy7 LightsStack_StationaryLight_::AddLight moved to LightStack.cpp
Wed, 02 Apr 2014 23:21:34 +0200 Grumpy7 header file include cleanup
Wed, 02 Apr 2014 22:05:35 +0600 Ritor1 int -> uint
Wed, 02 Apr 2014 21:05:19 +0600 Ritor1 unused local variables I commented
Wed, 02 Apr 2014 20:53:47 +0600 Ritor1 Слияние
Wed, 02 Apr 2014 20:53:35 +0600 Ritor1 m
Wed, 02 Apr 2014 01:21:05 +0200 Grumpy7 Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
Tue, 01 Apr 2014 23:44:27 +0200 Grumpy7 Merge
Tue, 01 Apr 2014 23:43:05 +0200 Grumpy7 EventCastSpell extracting comming code from projectile spell events
Tue, 01 Apr 2014 23:32:14 +0200 Grumpy7 EventCastSpell removing unused vars
Tue, 01 Apr 2014 23:20:15 +0200 Grumpy7 EventCastSpell removing duplicate code for handling empty pObjectList->pObjects array or not finding the correct value + moving everything into the main switch
Tue, 01 Apr 2014 22:19:57 +0200 Grumpy7 some EventCastSpell cleanups - removing labels, changing some numbers to enums
Fri, 28 Mar 2014 12:32:18 +0600 Ritor1 for bloodsplat
Thu, 27 Mar 2014 23:30:02 +0100 Grumpy7 Merge
Thu, 27 Mar 2014 23:28:54 +0100 Grumpy7 _43AFE3_calc_spell_damage moved to spells.h, cleaned it up a bit
Sun, 23 Mar 2014 19:55:59 +0600 Ritor1 for draw terrain
Sat, 22 Mar 2014 18:06:41 +0600 Ritor1 near_clip error
Fri, 21 Mar 2014 01:12:52 +0600 Ritor1 draw terrain distance
Thu, 20 Mar 2014 18:44:27 +0600 Ritor1 stuff.h
Thu, 20 Mar 2014 17:38:29 +0600 Ritor1 far_clip and near_clip for draw terrain
Thu, 20 Mar 2014 09:13:42 +0600 Ritor1 add stuff.h
Wed, 19 Mar 2014 17:30:14 +0600 Ritor1 Draw terrain
Wed, 19 Mar 2014 10:09:42 +0600 Ritor1 add files
Tue, 18 Mar 2014 23:50:35 +0600 Ritor1 for Bloodsplat
Tue, 18 Mar 2014 17:34:33 +0600 Ritor1 Слияние
Tue, 18 Mar 2014 17:34:26 +0600 Ritor1 MediaPlayer.cpp
Mon, 17 Mar 2014 22:53:24 +0100 Grumpy7 Merge
Mon, 17 Mar 2014 22:52:52 +0100 Grumpy7 ActorDamageFromMonster moved into Actor class
Mon, 17 Mar 2014 22:49:54 +0100 Grumpy7 ActorDamageFromMonster minor cleanups
Mon, 17 Mar 2014 17:44:32 +0600 Ritor1 button for MMT_Menu
Mon, 17 Mar 2014 09:32:23 +0600 Ritor1 pngtest.c remove
Sun, 16 Mar 2014 21:05:41 +0100 Grumpy7 ... and this one too
Sun, 16 Mar 2014 21:04:49 +0100 Grumpy7 Merge
Sun, 16 Mar 2014 21:04:39 +0100 Grumpy7 forgot to commit this one
Sun, 16 Mar 2014 21:04:00 +0100 Grumpy7 mm7_6.cpp include cleanup
Sun, 16 Mar 2014 21:03:36 +0100 Grumpy7 mm7_7 made redundant, exctracted the 2 useful functions, commented out the rest of the file
Sun, 16 Mar 2014 20:28:44 +0100 Grumpy7 stru319::DoesDmgTypeDoDamage moved to Actor class
Sun, 16 Mar 2014 19:58:02 +0100 Grumpy7 stru319::GetMagicalResistance renamed to stru319::DoesDmgTypeDoDamage
Mon, 17 Mar 2014 01:29:15 +0600 Ritor1 ConvertPNG continue
Mon, 17 Mar 2014 01:24:09 +0600 Ritor1 Слияние
Mon, 17 Mar 2014 01:22:20 +0600 Ritor1 wow
Mon, 17 Mar 2014 01:21:55 +0600 Ritor1 libpng
Mon, 17 Mar 2014 01:20:15 +0600 Ritor1 LoadTexture cleaned and add ConvertPNG function
Sun, 16 Mar 2014 19:43:28 +0100 Grumpy7 Merge
Sun, 16 Mar 2014 19:42:29 +0100 Grumpy7 stru319::CalcMagicalDamageToActor moved to Actor class
Sun, 16 Mar 2014 19:37:28 +0100 Grumpy7 stru319::CalcMagicalDamageToActor small cleanups
Sun, 16 Mar 2014 19:11:52 +0100 Grumpy7 stru319::PlayerHitOrMiss moved to Player class, cleaned up a bit, stru319::ActorHitOrMiss moved to Actor class, cleaned up a bit
Sun, 16 Mar 2014 19:34:51 +0600 Ritor1 add MMT.cpp and MMT.h
Sun, 16 Mar 2014 03:08:26 +0100 Grumpy7 byte_5111F6 to byte_5111F6_OwnedArtifacts, changed magic numbers to enums in GetItemTextureFilename
Sun, 16 Mar 2014 02:59:52 +0100 Grumpy7 GetItemTextureFilename cleaned up
Sat, 15 Mar 2014 23:42:51 +0100 Grumpy7 GenerateItemsInChest cleaned up a bit, unified the two switches
Sat, 15 Mar 2014 19:53:14 +0100 Grumpy7 some cleanups in ItemsTable::GenerateItem
Sat, 15 Mar 2014 12:24:20 +0100 Grumpy7 sub_4BE571 changed to sub_4BE571_AddItemToSet + cleaned up, dword_F8B1DC changed to dword_F8B1DC_currentShopOption + moved out of mm7_data
Sat, 15 Mar 2014 01:32:56 +0100 Grumpy7 Tokenizing ItemsTable::LoadPotions and ItemsTable::LoadPotionNotes()
Fri, 14 Mar 2014 23:33:07 +0100 Grumpy7 StorylineText::Initialize using tokenizer
Fri, 14 Mar 2014 23:06:24 +0100 Grumpy7 SpellStats::Initialize using tokenizer
Fri, 14 Mar 2014 23:55:50 +0600 Ritor1 AI_RandomMove cleaned
Fri, 14 Mar 2014 22:41:35 +0600 Ritor1 pMMT_MainMenu_BtnExit coordinates
Fri, 14 Mar 2014 22:26:52 +0600 Ritor1 mm7 game sound
Fri, 14 Mar 2014 17:59:06 +0600 Ritor1 MMT_MainMenu
Fri, 14 Mar 2014 13:58:51 +0600 Ritor1 submenu Other
Fri, 14 Mar 2014 10:47:22 +0600 Ritor1 ActorHasItems
Fri, 14 Mar 2014 09:32:42 +0600 Ritor1 Слияние
Fri, 14 Mar 2014 09:32:25 +0600 Ritor1 small cleaning
Fri, 14 Mar 2014 02:03:41 +0600 Ritor1 FindIcon cleaned
Thu, 13 Mar 2014 23:56:37 +0600 Ritor1 Слияние
Thu, 13 Mar 2014 23:56:31 +0600 Ritor1 DrawMessageBox
Tue, 11 Mar 2014 22:55:43 +0100 Grumpy7 Merge
Tue, 11 Mar 2014 22:55:15 +0100 Grumpy7 fixing rnd chest bug
Sun, 09 Mar 2014 22:39:59 +0600 Ritor1 EventProcessor cleaned and ODM_NearClip fix
Sat, 08 Mar 2014 23:53:09 +0600 Ritor1 Слияние
Sat, 08 Mar 2014 23:53:00 +0600 Ritor1 EventProcessor cleared
Sat, 08 Mar 2014 22:23:27 +0600 Ritor1 Слияние
Sat, 08 Mar 2014 22:23:20 +0600 Ritor1 m
Sat, 08 Mar 2014 17:53:38 +0100 Grumpy7 some more items.cpp init bugfixing
Sat, 08 Mar 2014 17:29:36 +0100 Grumpy7 Fixing warnings in items.cpp
Sat, 08 Mar 2014 16:04:44 +0100 Grumpy7 Fixing a bug in tokenization
Thu, 06 Mar 2014 00:41:04 +0100 Grumpy7 Using new tokenizer in Items.cpp initialize function
Tue, 04 Mar 2014 00:02:21 +0100 Grumpy7 Adding MapInfo.cpp, moving a few functions there
Mon, 03 Mar 2014 23:49:23 +0100 Grumpy7 sub_410D99_get_map_index cleaned up
Thu, 27 Feb 2014 00:36:31 +0100 Grumpy7 simplifying a loop in immolation effect
Thu, 27 Feb 2014 00:30:03 +0100 Grumpy7 _46A89E_immolation_effect moved into Party
Thu, 27 Feb 2014 00:27:58 +0100 Grumpy7 immolation cleaned up a bit
Wed, 26 Feb 2014 23:35:46 +0100 Grumpy7 Merge
Wed, 26 Feb 2014 23:35:23 +0100 Grumpy7 adding _CRT_SECURE_NO_WARNINGS to get rid of a few hundrer annoying warnings + adding count parameter to swprintf
Wed, 26 Feb 2014 20:10:50 +0600 Ritor1 Слияние
Wed, 26 Feb 2014 20:10:43 +0600 Ritor1 for StackLight_TerrainFace
Wed, 26 Feb 2014 01:26:22 +0100 Grumpy7 moved MerchandiseTest to ItemGen::MerchandiseTest
Wed, 26 Feb 2014 01:20:07 +0100 Grumpy7 dword_F8B1B0_MasteryBeingTaught adding 2 else ifs
Wed, 26 Feb 2014 01:18:42 +0100 Grumpy7 changing shopt stealing condition a bit
Wed, 26 Feb 2014 01:15:58 +0100 Grumpy7 Merge
Wed, 26 Feb 2014 01:14:18 +0100 Grumpy7 shop stealing cleaned up a bit
Tue, 25 Feb 2014 20:02:06 +0600 Ritor1 for RasterLine2D
Mon, 24 Feb 2014 16:54:21 +0600 Ritor1 TE monster attack
Mon, 24 Feb 2014 16:19:09 +0600 Ritor1 Слияние
Mon, 24 Feb 2014 16:19:01 +0600 Ritor1 for NextTurn()
Sun, 23 Feb 2014 18:44:01 +0100 Grumpy7 restoring deleted line in mm7_4.cpp
Sun, 23 Feb 2014 18:40:29 +0100 Grumpy7 dword_F8B1B0_MasteryBeingTaught removing redundant case bodies
Sun, 23 Feb 2014 15:54:00 +0100 Grumpy7 dword_F8B1B0 to dword_F8B1B0_MasteryBeingTaught, some final touches to _4B254D_SkillMasteryTeacher
Sun, 23 Feb 2014 15:42:15 +0100 Grumpy7 _4B254D_SkillMasteryTeacher unrolling switches
Sun, 23 Feb 2014 14:12:07 +0100 Grumpy7 _4B254D_SkillMasteryTeacher adding case, removing nested ifs, adding some comments
Sun, 23 Feb 2014 12:55:01 +0100 Grumpy7 _4B254D_SkillMasteryTeacher getting rid of uninitialized var use
Sun, 23 Feb 2014 03:07:46 +0100 Grumpy7 adding int_get_vector_length calls where the calls were inlined
Sun, 23 Feb 2014 00:34:38 +0100 Grumpy7 fixing inverted guild greetings
Sat, 22 Feb 2014 19:55:54 +0100 Grumpy7 sub_4B1523_showSpellbookInfo moved to UIShops
Sat, 22 Feb 2014 19:47:34 +0100 Grumpy7 fixing accidental .proj file commit
Sat, 22 Feb 2014 19:44:49 +0100 Grumpy7 sub_4B1523 to sub_4B1523_showSpellbookInfo, changed input type, some vars renamed
Sat, 22 Feb 2014 18:25:53 +0100 Grumpy7 Merge
Sat, 22 Feb 2014 18:25:18 +0100 Grumpy7 dword_AE336C to NPCStats::dword_AE336C_LastMispronouncedNameFirstLetter,
Fri, 21 Feb 2014 18:02:20 +0600 Ritor1 add this->field_0 = 0; in OtherOverlay::Reset()
Thu, 20 Feb 2014 22:26:13 +0600 Ritor1 LoadSound
Thu, 20 Feb 2014 12:20:49 +0600 Ritor1 occasionally pRenderer->pBillboardRenderListD3D array elements are not correct (0xcdcdcdcd) fix
Wed, 19 Feb 2014 22:30:39 +0100 Grumpy7 Merge
Wed, 19 Feb 2014 22:26:10 +0100 Grumpy7 some more pvs warning fixes
Wed, 19 Feb 2014 13:01:36 +0600 Ritor1 LoadCursor fix
Tue, 18 Feb 2014 19:43:54 +0600 Ritor1 smk video draw
Tue, 18 Feb 2014 16:18:20 +0600 Ritor1 for video
Mon, 17 Feb 2014 19:41:49 +0600 Ritor1 for mouse continue
Mon, 17 Feb 2014 17:28:06 +0600 Ritor1 for mouse
Sun, 16 Feb 2014 21:49:39 +0600 Ritor1 for video
Sat, 15 Feb 2014 22:00:13 +0600 Ritor1 expand button
Sat, 15 Feb 2014 16:00:19 +0600 Ritor1 window->GetWidth() continue
Fri, 14 Feb 2014 18:08:30 +0600 Ritor1 fog fix and change 640,480 - window->GetWidth(), window->GetHeight()
Thu, 13 Feb 2014 23:02:32 +0600 Ritor1 GameResultsApply() full refactored
Thu, 13 Feb 2014 17:34:47 +0600 Ritor1 Draw arcomage
Thu, 13 Feb 2014 01:02:04 +0600 Ritor1 LoadTextureFromLOD
Wed, 12 Feb 2014 20:51:37 +0600 Ritor1 Слияние
Wed, 12 Feb 2014 20:51:31 +0600 Ritor1 m
Wed, 12 Feb 2014 17:32:47 +0600 Ritor1 DrawCardsRectangles continue
Wed, 12 Feb 2014 16:33:12 +0600 Ritor1 for video in homes
Thu, 06 Feb 2014 17:20:12 +0600 Ritor1 fixpoint_mul
Thu, 06 Feb 2014 00:38:03 +0600 Ritor1 DrawSpriteObjects_ODM() cleaned
Wed, 05 Feb 2014 17:24:38 +0600 Ritor1 _44100D_should_alter_right_panel()
Wed, 05 Feb 2014 00:59:33 +0600 Ritor1 sub_407A1C cleaning continue
Tue, 04 Feb 2014 17:29:04 +0600 Ritor1 DoInteractionWithTopmostZObject cleaned
Mon, 03 Feb 2014 23:07:15 +0100 Grumpy7 Merge
Mon, 03 Feb 2014 23:06:14 +0100 Grumpy7 Finishing keyboard.cpp stuff
Mon, 03 Feb 2014 00:58:12 +0100 Grumpy7 Keyboard.cpp removing the huge cases and separating data and code
Sun, 02 Feb 2014 21:53:29 +0600 Ritor1 RasterLine2D()
Sun, 02 Feb 2014 00:10:40 +0600 Ritor1 draw FlyAction and WaterWalk icons
Fri, 31 Jan 2014 17:30:36 +0600 Ritor1 UIMSG_SpellBook_PressTab continue
Fri, 31 Jan 2014 00:37:26 +0100 Grumpy7 Some more PVS error fixing
Thu, 30 Jan 2014 23:03:04 +0100 Grumpy7 fixing a few bugs reported by PVS
Thu, 30 Jan 2014 22:11:28 +0100 Grumpy7 Merge
Thu, 30 Jan 2014 22:09:10 +0100 Grumpy7 sub_47C3D7_get_fog_related_stuff to sub_47C3D7_get_fog_specular cleanup, IsTerrainSlopeTooHigh restoring commented out min,min/max,max implementation, some small changes in OnMapLoad, sub_4465DF_check_season attempted to pick the best readabilty/maintainability tradeoff
Thu, 30 Jan 2014 20:13:23 +0600 Ritor1 PLAYER_SKILL_BLASTER
Thu, 30 Jan 2014 17:41:54 +0600 Ritor1 pInventoryItemList->Reset()
Wed, 29 Jan 2014 22:08:04 +0600 Ritor1 CastSpell fix
Wed, 29 Jan 2014 17:26:24 +0600 Ritor1 CastSpell continue
Tue, 28 Jan 2014 22:41:49 +0600 Ritor1 CastSpell continue
Tue, 28 Jan 2014 17:25:58 +0600 Ritor1 CastSpell continue
Mon, 27 Jan 2014 17:33:34 +0600 Ritor1 CastSpell continue
Mon, 27 Jan 2014 00:13:01 +0600 Ritor1 CastSpell continue
Fri, 24 Jan 2014 18:01:51 +0600 Ritor1 SPELL_WATER_RECHARGE_ITEM
Thu, 23 Jan 2014 23:35:10 +0600 Ritor1 CastSpell
Thu, 23 Jan 2014 17:31:12 +0600 Ritor1 _46А6АС_GetActorsInViewport
Thu, 23 Jan 2014 00:18:05 +0600 Ritor1 _427E01_cast_spell continue
Wed, 22 Jan 2014 18:53:47 +0600 Ritor1 pSavegameList->Reset()
Wed, 22 Jan 2014 17:34:05 +0600 Ritor1 _427E01_cast_spell continue
Wed, 22 Jan 2014 00:05:10 +0600 Ritor1 savegame fix
Tue, 21 Jan 2014 18:45:00 +0600 Ritor1 pParty->vPrevPosition.y = 1816; and pParty->vPrevPosition.z = 0;
Tue, 21 Jan 2014 18:32:43 +0600 Ritor1 Слияние
Tue, 21 Jan 2014 18:32:23 +0600 Ritor1 autosave continue
Tue, 21 Jan 2014 16:37:23 +0600 Ritor1 autosave continue
Tue, 21 Jan 2014 00:59:21 +0600 Ritor1 savegame and loadgame continue
Mon, 20 Jan 2014 17:25:01 +0600 Ritor1 indoor cleaning continue
Mon, 20 Jan 2014 09:22:16 +0600 Ritor1 Слияние
Mon, 20 Jan 2014 09:22:09 +0600 Ritor1 m
Mon, 20 Jan 2014 00:02:22 +0600 Ritor1 small cleaning
Fri, 17 Jan 2014 22:44:57 +0600 Ritor1 Слияние
Thu, 16 Jan 2014 23:49:04 +0600 Ritor1 ODM_ProcessPartyActions continue
Fri, 17 Jan 2014 17:58:48 +0600 Ritor1 fixpoint_mul in different functions and others
Thu, 16 Jan 2014 17:34:48 +0600 Ritor1 isFileOpened
Thu, 16 Jan 2014 00:08:27 +0600 Ritor1 fixpoint_mul in ProcessPartyActions
Wed, 15 Jan 2014 17:35:41 +0600 Ritor1 fall_speed
Tue, 14 Jan 2014 17:29:20 +0600 Ritor1 ODM_ProcessPartyActions continue
Mon, 13 Jan 2014 17:32:00 +0600 Ritor1 remove TestClass.h
Mon, 13 Jan 2014 17:30:22 +0600 Ritor1 for 3DSoundProvider
Mon, 13 Jan 2014 14:31:25 +0600 Ritor1 uDefaultPartyHeight = 192
Fri, 10 Jan 2014 17:56:19 +0600 Ritor1 m
Fri, 10 Jan 2014 17:42:57 +0600 Ritor1 Слияние
Fri, 10 Jan 2014 17:42:37 +0600 Ritor1 GetItemBonusEnchantment
Thu, 09 Jan 2014 17:29:17 +0200 Nomad Render decoupling.
Thu, 09 Jan 2014 14:36:48 +0200 Nomad Render decoupling.
Thu, 09 Jan 2014 02:34:20 +0200 Nomad Some Render decoupling.
Thu, 09 Jan 2014 01:37:34 +0200 Nomad Removed DirectDraw2 compatibility.
Wed, 08 Jan 2014 22:29:11 +0200 Nomad Cleaned some variables.
Wed, 08 Jan 2014 17:25:34 +0600 Ritor1 SortVectors_x, SortVerticesByX and SortVerticesByY
Wed, 08 Jan 2014 15:01:58 +0600 Ritor1 SortByScreenSpaceX and SortByScreenSpaceY for Vis fix
Tue, 07 Jan 2014 22:15:45 +0600 Ritor1 ODM_ProcessPartyActions continue
Mon, 06 Jan 2014 22:46:11 +0600 Ritor1 FACE_PRESSURE_PLATE
Mon, 06 Jan 2014 20:01:21 +0600 Ritor1 restore broken filters
Mon, 06 Jan 2014 19:29:59 +0600 Ritor1 Слияние