Fri, 22 Mar 2013 16:16:40 +0200 |
Nomad |
stru154
|
Fri, 22 Mar 2013 13:24:12 +0200 |
Nomad |
MonsterPopup preview doll fixed
|
Fri, 22 Mar 2013 11:19:09 +0200 |
Nomad |
Missing file
|
Fri, 22 Mar 2013 11:18:51 +0200 |
Nomad |
Moved unused CPU detection stuff to a separate file.
|
Fri, 22 Mar 2013 10:52:19 +0200 |
Nomad |
Some data movements.
|
Fri, 22 Mar 2013 00:27:11 +0200 |
Nomad |
Fixed few errors in blv walking commit.
|
Fri, 22 Mar 2013 00:06:50 +0200 |
Nomad |
Merge
|
Fri, 22 Mar 2013 00:02:31 +0200 |
Nomad |
Big time Travel ouverhaul
|
Fri, 22 Mar 2013 01:29:46 +0600 |
Ritor1 |
Слияние
|
Fri, 22 Mar 2013 01:29:25 +0600 |
Ritor1 |
little continue
|
Thu, 21 Mar 2013 16:09:59 +0600 |
Ritor1 |
Слияние
|
Thu, 21 Mar 2013 16:09:44 +0600 |
Ritor1 |
ODM_GetFloorLevel & BLV_GetFloorLevel
|
Wed, 20 Mar 2013 17:49:15 +0600 |
Ritor1 |
Слияние
|
Wed, 20 Mar 2013 17:48:51 +0600 |
Ritor1 |
m
|
Tue, 19 Mar 2013 23:41:29 +0600 |
Ritor1 |
Слияние
|
Tue, 19 Mar 2013 23:41:14 +0600 |
Ritor1 |
m
|
Mon, 18 Mar 2013 01:51:31 +0600 |
Ritor1 |
Слияние
|
Mon, 18 Mar 2013 01:50:50 +0600 |
Ritor1 |
m
|
Sat, 16 Mar 2013 17:42:59 +0600 |
Ritor1 |
Слияние
|
Sat, 16 Mar 2013 17:42:28 +0600 |
Ritor1 |
m
|
Sat, 16 Mar 2013 09:33:12 +0600 |
Ritor1 |
Слияние
|
Sat, 16 Mar 2013 09:32:56 +0600 |
Ritor1 |
m
|
Thu, 21 Mar 2013 23:11:54 +0400 |
Gloval |
Merge
|
Thu, 21 Mar 2013 23:10:57 +0400 |
Gloval |
some cleaning
|
Thu, 21 Mar 2013 20:30:17 +0200 |
Nomad |
Town portal screen + misc gui const replacements
|
Thu, 21 Mar 2013 12:37:49 +0200 |
Nomad |
Items (blue dots) on minimap fixed
|
Thu, 21 Mar 2013 10:35:13 +0200 |
Nomad |
Dropped items in blv
|
Thu, 21 Mar 2013 10:21:46 +0200 |
Nomad |
Decorations in blv
|
Tue, 19 Mar 2013 21:53:21 +0400 |
Gloval |
Rough function rearranging to new files
|
Mon, 18 Mar 2013 21:50:20 +0000 |
zipi |
memory allocation partly reworked
|
Tue, 19 Mar 2013 01:36:47 +0400 |
Gloval |
Merge
|
Tue, 19 Mar 2013 01:33:35 +0400 |
Gloval |
monster parser almost complete.
|
Mon, 18 Mar 2013 20:19:20 +0000 |
zipi |
sub_4BDAAF clean
|
Mon, 18 Mar 2013 22:53:56 +0400 |
Gloval |
frame_table parser, new files for UI func
|
Sun, 17 Mar 2013 22:46:18 +0200 |
Nomad |
Some occasional crashes in PaletteManager and sprite loading fixed.
|
Sun, 17 Mar 2013 18:32:09 +0400 |
Gloval |
Merge
|
Sun, 17 Mar 2013 18:31:54 +0400 |
Gloval |
monster table continue fixinf
|
Sun, 17 Mar 2013 14:25:00 +0000 |
zipi |
GUIButton Release
|
Sun, 17 Mar 2013 13:57:46 +0000 |
zipi |
GUIWindow::Release clean
|
Sun, 17 Mar 2013 11:59:37 +0000 |
zipi |
sub_444564 clean and fix right click on map screen
|
Sun, 17 Mar 2013 12:47:19 +0400 |
Gloval |
monster table init rework started
|
Sun, 17 Mar 2013 01:50:34 +0400 |
Gloval |
map render fixes
|
Sat, 16 Mar 2013 21:57:32 +0400 |
Gloval |
viewport.cpp added
|
Sat, 16 Mar 2013 14:33:23 +0200 |
Nomad |
Bsp render seems to work
|
Sat, 16 Mar 2013 01:25:15 +0400 |
Gloval |
ui fixing
|
Sat, 16 Mar 2013 01:12:03 +0400 |
Gloval |
Merge
|
Sat, 16 Mar 2013 01:11:39 +0400 |
Gloval |
some ui cleanup
|
Sat, 16 Mar 2013 01:44:38 +0600 |
Ritor1 |
Indoor Portal
|
Fri, 15 Mar 2013 19:03:53 +0600 |
Ritor1 |
Слияние
|
Fri, 15 Mar 2013 19:03:38 +0600 |
Ritor1 |
m
|
Fri, 15 Mar 2013 18:29:06 +0600 |
Ritor1 |
Слияние
|
Fri, 15 Mar 2013 18:28:37 +0600 |
Ritor1 |
m
|
Wed, 13 Mar 2013 18:54:30 +0600 |
Ritor1 |
Слияние
|
Wed, 13 Mar 2013 18:54:19 +0600 |
Ritor1 |
m
|
Tue, 12 Mar 2013 23:26:58 +0600 |
Ritor1 |
Слияние
|
Tue, 12 Mar 2013 23:26:43 +0600 |
Ritor1 |
m
|
Fri, 15 Mar 2013 15:58:18 +0200 |
Nomad |
fixed stru10::49C9E3 (cause for attempting to get cross product on zero vectors)
|
Fri, 15 Mar 2013 04:17:54 +0200 |
Nomad |
Merge
|
Fri, 15 Mar 2013 04:13:24 +0200 |
Nomad |
BLV: when standing right on the portal (orange wall) everything looks fine
|
Thu, 14 Mar 2013 23:44:03 +0200 |
Nomad |
Merge
|
Thu, 14 Mar 2013 23:26:01 +0200 |
Nomad |
A bit of minimap cleaning
|
Thu, 14 Mar 2013 22:28:46 +0000 |
zipi |
learn skills
|
Thu, 14 Mar 2013 22:11:35 +0000 |
zipi |
OnSelectShopDialogueOption clean 1
|
Fri, 15 Mar 2013 01:52:18 +0400 |
Gloval |
Merge
|
Fri, 15 Mar 2013 01:51:51 +0400 |
Gloval |
fixed decorations animation
|
Thu, 14 Mar 2013 20:44:54 +0000 |
zipi |
some cleaning
|
Thu, 14 Mar 2013 20:20:55 +0000 |
zipi |
standard weapon shop fix
|
Thu, 14 Mar 2013 20:04:21 +0000 |
zipi |
profession NPC dialogue fixed
|
Wed, 13 Mar 2013 17:08:21 +0600 |
Ritor1 |
BSP
|
Wed, 13 Mar 2013 10:13:02 +0600 |
Ritor1 |
Слияние
|
Wed, 13 Mar 2013 10:12:52 +0600 |
Ritor1 |
m
|
Tue, 12 Mar 2013 11:34:13 +0600 |
Ritor1 |
Слияние
|
Tue, 12 Mar 2013 11:34:08 +0600 |
Ritor1 |
m
|
Tue, 12 Mar 2013 09:43:50 +0600 |
Ritor1 |
Слияние
|
Tue, 12 Mar 2013 09:43:40 +0600 |
Ritor1 |
m
|
Tue, 12 Mar 2013 23:11:11 +0000 |
zipi |
NPC hiring fixed
|
Wed, 13 Mar 2013 01:30:53 +0200 |
Nomad |
Merge
|
Wed, 13 Mar 2013 01:29:33 +0200 |
Nomad |
RenderBillboard member rename
|
Tue, 12 Mar 2013 21:58:10 +0000 |
zipi |
OnSelectNPCDialogueOption clean
|
Tue, 12 Mar 2013 21:07:57 +0000 |
zipi |
Margaret disappear fixed
|
Tue, 12 Mar 2013 19:48:16 +0000 |
zipi |
minor fixes
|
Tue, 12 Mar 2013 08:30:17 +0200 |
Nomad |
Blv light levels
|
Tue, 12 Mar 2013 04:45:38 +0200 |
Nomad |
* Some fixes to TravelByTransport
|
Tue, 12 Mar 2013 03:10:35 +0200 |
Nomad |
Training hall UI fixed
|
Mon, 11 Mar 2013 23:52:33 +0200 |
Nomad |
Sleeping in tavern crash fixed - memory allocation rised to 48mb
|
Mon, 11 Mar 2013 23:43:52 +0200 |
Nomad |
Sleeping in a tavern
|
Mon, 11 Mar 2013 23:32:27 +0200 |
Nomad |
Fixed numbers in tavern dialogue ui
|
Tue, 12 Mar 2013 01:24:07 +0600 |
Ritor1 |
Слияние
|
Tue, 12 Mar 2013 01:23:59 +0600 |
Ritor1 |
m
|
Tue, 12 Mar 2013 01:20:56 +0600 |
Ritor1 |
Слияние
|
Tue, 12 Mar 2013 01:20:36 +0600 |
Ritor1 |
TavernDialog little clean
|
Mon, 11 Mar 2013 20:11:19 +0600 |
Ritor1 |
Слияние
|
Mon, 11 Mar 2013 20:11:12 +0600 |
Ritor1 |
m
|
Mon, 11 Mar 2013 20:03:02 +0600 |
Ritor1 |
Слияние
|
Mon, 11 Mar 2013 20:02:11 +0600 |
Ritor1 |
m
|
Mon, 11 Mar 2013 22:20:05 +0200 |
Nomad |
Decoration animations
|
Mon, 11 Mar 2013 21:43:26 +0200 |
Nomad |
GetActorTintColor fixed
|
Mon, 11 Mar 2013 17:07:51 +0200 |
Nomad |
.
|
Mon, 11 Mar 2013 16:55:10 +0200 |
Nomad |
Merge
|
Mon, 11 Mar 2013 16:54:56 +0200 |
Nomad |
Season change affects vegetation;
|
Mon, 11 Mar 2013 17:09:49 +0600 |
Ritor1 |
AlchemistShop little clean
|
Mon, 11 Mar 2013 09:28:57 +0600 |
Ritor1 |
Слияние
|
Mon, 11 Mar 2013 09:28:41 +0600 |
Ritor1 |
m
|
Mon, 11 Mar 2013 03:38:59 +0200 |
Nomad |
Merge
|
Mon, 11 Mar 2013 03:37:48 +0200 |
Nomad |
Tilesets change according to current season
|
Sun, 10 Mar 2013 20:57:52 +0400 |
Gloval |
houses func moved to uihouses
|
Sun, 10 Mar 2013 17:00:50 +0400 |
Gloval |
Merge
|
Fri, 08 Mar 2013 22:49:50 +0400 |
Gloval |
Merge
|
Fri, 08 Mar 2013 22:49:26 +0400 |
Gloval |
f
|
Sun, 10 Mar 2013 18:59:04 +0600 |
Ritor1 |
WeaponShop little clean
|
Sat, 09 Mar 2013 00:35:19 +0600 |
Ritor1 |
m
|
Sat, 09 Mar 2013 00:33:04 +0600 |
Ritor1 |
Height text in Armor shop dialog
|
Fri, 08 Mar 2013 22:41:24 +0600 |
Ritor1 |
Слияние
|
Fri, 08 Mar 2013 22:41:16 +0600 |
Ritor1 |
m
|
Fri, 08 Mar 2013 19:08:56 +0400 |
Gloval |
files for houses func
|
Fri, 08 Mar 2013 17:08:08 +0200 |
Nomad |
ParticleEngine crash in temple
|
Fri, 08 Mar 2013 16:06:49 +0200 |
Nomad |
Margareth righ-click (addded constructor to NPCProfession) and cleaned BLV debug logs
|
Fri, 08 Mar 2013 15:52:47 +0200 |
Nomad |
Billboards are now rendered in BLV
|
Fri, 08 Mar 2013 18:03:37 +0600 |
Ritor1 |
Compare
|
Fri, 08 Mar 2013 18:00:43 +0600 |
Ritor1 |
Слияние
|
Fri, 08 Mar 2013 17:59:54 +0600 |
Ritor1 |
1-5
|
Thu, 07 Mar 2013 22:45:43 +0600 |
Ritor1 |
Слияние
|
Thu, 07 Mar 2013 22:45:23 +0600 |
Ritor1 |
m
|
Wed, 06 Mar 2013 20:16:06 +0600 |
Ritor1 |
Слияние
|
Wed, 06 Mar 2013 20:15:47 +0600 |
Ritor1 |
m
|
Wed, 06 Mar 2013 18:22:25 +0600 |
Ritor1 |
Слияние
|
Wed, 06 Mar 2013 18:22:07 +0600 |
Ritor1 |
m
|
Fri, 08 Mar 2013 00:36:33 +0400 |
Gloval |
ArmorShop fixes
|
Thu, 07 Mar 2013 15:26:44 +0600 |
Ritor1 |
m
|
Thu, 07 Mar 2013 14:45:43 +0600 |
Ritor1 |
SubtractVariables little fix
|
Thu, 07 Mar 2013 09:15:15 +0600 |
Ritor1 |
Слияние
|
Thu, 07 Mar 2013 09:14:57 +0600 |
Ritor1 |
m
|
Wed, 06 Mar 2013 23:26:46 +0000 |
zipi |
Margaret working
|
Thu, 07 Mar 2013 01:07:45 +0400 |
Gloval |
level events loading fix
|
Thu, 07 Mar 2013 00:35:10 +0400 |
Gloval |
Chest item view fixed, gold can be taken
|
Wed, 06 Mar 2013 22:47:21 +0400 |
Gloval |
Merge
|
Wed, 06 Mar 2013 22:46:40 +0400 |
Gloval |
fixed random iten generator, chest generator
|
Wed, 06 Mar 2013 17:04:54 +0000 |
zipi |
stru319::_427102 clean
|
Wed, 06 Mar 2013 16:51:39 +0200 |
Nomad |
Merge
|
Wed, 06 Mar 2013 16:51:23 +0200 |
Nomad |
Cave textures
|
Wed, 06 Mar 2013 16:14:21 +0200 |
Nomad |
Merge
|
Wed, 06 Mar 2013 16:12:38 +0200 |
Nomad |
.
|
Wed, 06 Mar 2013 15:55:35 +0200 |
Nomad |
some flags
|
Wed, 06 Mar 2013 13:42:24 +0000 |
zipi |
missed Merge
|
Wed, 06 Mar 2013 13:37:27 +0000 |
zipi |
mistake
|
Wed, 06 Mar 2013 13:20:46 +0000 |
zipi |
goto cleans
|
Wed, 06 Mar 2013 12:43:58 +0000 |
zipi |
OnGameViewportClick cleaned partly
|
Wed, 06 Mar 2013 12:23:52 +0000 |
zipi |
GameUI_WritePointedObjectStatusString goto clean
|
Wed, 06 Mar 2013 12:02:40 +0000 |
zipi |
sub_41CD4F clean
|
Wed, 06 Mar 2013 11:39:35 +0000 |
zipi |
goto clean
|
Wed, 06 Mar 2013 11:05:44 +0000 |
zipi |
CharacterUI_CharacterScreen_Draw switch clean
|
Wed, 06 Mar 2013 10:59:51 +0000 |
zipi |
CharacterUI_AwardsTab_Draw goto clean
|
Wed, 06 Mar 2013 16:51:39 +0600 |
Ritor1 |
Слияние
|
Wed, 06 Mar 2013 16:51:31 +0600 |
Ritor1 |
ExecDraw_d3d
|
Wed, 06 Mar 2013 09:28:27 +0600 |
Ritor1 |
Слияние
|
Wed, 06 Mar 2013 09:28:09 +0600 |
Ritor1 |
m
|
Tue, 05 Mar 2013 10:45:40 +0600 |
Ritor1 |
Слияние
|
Tue, 05 Mar 2013 10:45:29 +0600 |
Ritor1 |
m
|
Mon, 04 Mar 2013 09:22:38 +0600 |
Ritor1 |
Слияние
|
Mon, 04 Mar 2013 09:22:29 +0600 |
Ritor1 |
m
|
Wed, 06 Mar 2013 06:41:36 +0200 |
Nomad |
Merge
|
Wed, 06 Mar 2013 06:41:05 +0200 |
Nomad |
.
|
Tue, 05 Mar 2013 23:48:32 +0000 |
zipi |
goto clean
|
Tue, 05 Mar 2013 21:28:16 +0000 |
zipi |
StorylineText fix
|
Wed, 06 Mar 2013 00:09:49 +0400 |
Gloval |
itemgen working, i hope
|
Tue, 05 Mar 2013 16:14:22 +0200 |
Nomad |
* Party buff icons drawing (right panel)
|
Tue, 05 Mar 2013 04:30:20 +0200 |
Nomad |
SaveGame/LoadGame sorta works
|
Tue, 05 Mar 2013 03:58:26 +0200 |
Nomad |
Pedestals hint string fixed
|
Tue, 05 Mar 2013 03:42:21 +0200 |
Nomad |
QuickRef reputation string fix
|
Tue, 05 Mar 2013 01:45:43 +0200 |
Nomad |
Merge
|
Tue, 05 Mar 2013 01:45:15 +0200 |
Nomad |
Moon Temple doesn't crash
|
Mon, 04 Mar 2013 21:56:31 +0000 |
zipi |
GUI_UpdateWindows clean
|
Tue, 05 Mar 2013 00:25:08 +0200 |
Nomad |
Merge
|
Tue, 05 Mar 2013 00:24:28 +0200 |
Nomad |
Cave kinda works
|
Tue, 05 Mar 2013 01:08:14 +0400 |
Gloval |
Merge
|
Tue, 05 Mar 2013 01:08:01 +0400 |
Gloval |
item gen fixes (not full)
|
Mon, 04 Mar 2013 21:03:52 +0000 |
zipi |
sub_416D62_ShowPopupWindow_MonsterRecord_ItemInfo_etcsub_416D62 clean
|
Mon, 04 Mar 2013 20:18:06 +0000 |
zipi |
Saving works partly
|
Mon, 04 Mar 2013 20:05:05 +0000 |
zipi |
Save fix
|
Mon, 04 Mar 2013 22:45:22 +0200 |
Nomad |
Merge
|
Mon, 04 Mar 2013 22:44:41 +0200 |
Nomad |
Cave and Temple load and even doesn't crash (for a while).
|
Mon, 04 Mar 2013 19:39:44 +0000 |
zipi |
WeaponShopDialog clean
|
Mon, 04 Mar 2013 20:29:31 +0200 |
Nomad |
Merge
|
Mon, 04 Mar 2013 20:28:08 +0200 |
Nomad |
Actor::UpdateAnimation fix
|
Mon, 04 Mar 2013 00:16:39 +0400 |
Gloval |
Merge
|
Mon, 04 Mar 2013 00:15:39 +0400 |
Gloval |
Draw_item_info fixing
|
Sun, 03 Mar 2013 20:11:22 +0000 |
zipi |
TavernDialog clean
|
Sun, 03 Mar 2013 19:47:48 +0000 |
zipi |
BankDialog clean
|
Sun, 03 Mar 2013 18:39:35 +0600 |
Ritor1 |
Слияние
|
Sun, 03 Mar 2013 18:39:21 +0600 |
Ritor1 |
SubtractVariables
|
Sun, 03 Mar 2013 15:57:58 +0600 |
Ritor1 |
Слияние
|
Sun, 03 Mar 2013 15:57:44 +0600 |
Ritor1 |
m
|
Sun, 03 Mar 2013 13:32:04 +0600 |
Ritor1 |
Слияние
|
Sun, 03 Mar 2013 13:30:24 +0600 |
Ritor1 |
m
|
Sat, 02 Mar 2013 20:14:20 +0600 |
Ritor1 |
Слияние
|
Sat, 02 Mar 2013 20:13:50 +0600 |
Ritor1 |
m
|
Sat, 02 Mar 2013 09:01:48 +0600 |
Ritor1 |
Слияние
|
Sat, 02 Mar 2013 08:59:10 +0600 |
Ritor1 |
m
|
Sat, 02 Mar 2013 00:24:27 +0600 |
Ritor1 |
Слияние
|
Sat, 02 Mar 2013 00:24:12 +0600 |
Ritor1 |
m
|
Fri, 01 Mar 2013 22:04:13 +0600 |
Ritor1 |
Слияние
|
Fri, 01 Mar 2013 22:03:57 +0600 |
Ritor1 |
m
|
Sun, 03 Mar 2013 12:22:14 +0000 |
zipi |
TownHallDialog clean
|
Sun, 03 Mar 2013 11:24:48 +0000 |
zipi |
AlchemistDialog clean 1
|
Sun, 03 Mar 2013 10:42:32 +0000 |
zipi |
ArmorShopDialog mouse highlight fixed
|
Sun, 03 Mar 2013 13:38:12 +0400 |
Gloval |
Merge
|
Sun, 03 Mar 2013 13:36:41 +0400 |
Gloval |
Chest working
|
Sun, 03 Mar 2013 09:16:49 +0000 |
zipi |
Party integrity fix
|
Sun, 03 Mar 2013 01:55:57 +0400 |
Gloval |
Chest working, but items are not laid correctly
|
Sat, 02 Mar 2013 15:38:49 +0400 |
Gloval |
events cleanup
|
Sat, 02 Mar 2013 01:37:06 +0200 |
Nomad |
includes fixed, now will compile
|
Sat, 02 Mar 2013 01:32:30 +0200 |
Nomad |
Merge
|
Sat, 02 Mar 2013 01:30:24 +0200 |
Nomad |
Origianl structures integrity test added
|
Sat, 02 Mar 2013 01:42:05 +0400 |
Gloval |
Awards tab corrrection
|
Fri, 01 Mar 2013 23:43:21 +0400 |
Gloval |
GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
|
Fri, 01 Mar 2013 22:18:22 +0400 |
Gloval |
Merge
|
Fri, 01 Mar 2013 22:17:32 +0400 |
Gloval |
m2
|
Fri, 01 Mar 2013 20:28:25 +0400 |
Gloval |
Merge
|
Fri, 01 Mar 2013 20:28:01 +0400 |
Gloval |
m
|
Fri, 01 Mar 2013 21:13:12 +0200 |
Nomad |
LayingItem -> SpriteObject (long-waited rename, old name was inaccurate and confused people)
|
Fri, 01 Mar 2013 18:23:49 +0200 |
Nomad |
Merge
|
Fri, 01 Mar 2013 18:22:43 +0200 |
Nomad |
Some CharacterUI_LoadPaperdollTextures overflows
|
Fri, 01 Mar 2013 20:38:43 +0600 |
Ritor1 |
little fix
|
Fri, 01 Mar 2013 19:18:32 +0600 |
Ritor1 |
Red potion quest
|
Fri, 01 Mar 2013 18:38:12 +0600 |
Ritor1 |
Слияние
|
Fri, 01 Mar 2013 18:37:54 +0600 |
Ritor1 |
m
|
Wed, 27 Feb 2013 23:24:17 +0600 |
Ritor1 |
Слияние
|
Wed, 27 Feb 2013 23:23:56 +0600 |
Ritor1 |
m
|
Tue, 26 Feb 2013 18:48:05 +0600 |
Ritor1 |
Слияние
|
Tue, 26 Feb 2013 18:47:30 +0600 |
Ritor1 |
m
|
Mon, 25 Feb 2013 18:52:45 +0600 |
Ritor1 |
Слияние
|
Mon, 25 Feb 2013 18:52:30 +0600 |
Ritor1 |
m
|
Fri, 01 Mar 2013 17:38:04 +0600 |
Ritor1 |
Слияние
|
Fri, 01 Mar 2013 17:37:47 +0600 |
Ritor1 |
SubtractVariables
|
Thu, 28 Feb 2013 10:36:37 +0600 |
Ritor1 |
Слияние
|
Thu, 28 Feb 2013 10:34:14 +0600 |
Ritor1 |
m
|
Wed, 27 Feb 2013 09:26:16 +0600 |
Ritor1 |
Слияние
|
Wed, 27 Feb 2013 09:14:15 +0600 |
Ritor1 |
m
|
Fri, 01 Mar 2013 02:11:57 +0400 |
Gloval |
guilds ....
|
Thu, 28 Feb 2013 21:45:39 +0400 |
Gloval |
guilds ...
|