Eduardo Bart
|
67e3cfcb07
|
focus last logged character in charlist
|
2011-08-26 18:20:53 -03:00 |
Eduardo Bart
|
ccc4c1ba5e
|
some fancy
|
2011-08-26 15:56:56 -03:00 |
Eduardo Bart
|
0749e6a9d5
|
improved charlist
|
2011-08-26 15:44:18 -03:00 |
Eduardo Bart
|
c60b677baa
|
basic charlist
|
2011-08-26 15:00:22 -03:00 |
Eduardo Bart
|
7359370251
|
new layout system, new UI state/styles system
|
2011-08-26 12:06:52 -03:00 |
Eduardo Bart
|
d31d32bf82
|
changes..
|
2011-08-23 12:09:50 -03:00 |
Eduardo Bart
|
3c72c844d2
|
much faster layout calculation
|
2011-08-22 22:08:36 -03:00 |
Eduardo Bart
|
bfa3903940
|
ui internal destroy
|
2011-08-22 16:39:46 -03:00 |
Eduardo Bart
|
6a3ee47cc5
|
refactoring
|
2011-08-22 16:13:52 -03:00 |
Eduardo Bart
|
8fb07afc10
|
change ui event handling
|
2011-08-22 09:44:26 -03:00 |
Eduardo Bart
|
8007e37796
|
console max lines
|
2011-08-21 18:49:31 -03:00 |
Eduardo Bart
|
f266b9fbc6
|
remake widgets's anchor layouts
|
2011-08-21 16:43:05 -03:00 |
Eduardo Bart
|
b410921e32
|
fix focus bugs in UI
|
2011-08-20 22:01:46 -03:00 |
Eduardo Bart
|
d0f47f47a4
|
fix bug
|
2011-08-20 18:37:27 -03:00 |
Eduardo Bart
|
38529ea837
|
lua console and some changes
|
2011-08-20 17:30:41 -03:00 |
Eduardo Bart
|
033f14780d
|
make otml simpler and easier to use, improve error handling/exceptions
|
2011-08-19 15:53:23 -03:00 |
Eduardo Bart
|
7b13161036
|
draw health bars but still incorrect
|
2011-08-19 10:23:35 -03:00 |
Eduardo Bart
|
817234a660
|
head outfit color fix
|
2011-08-19 09:49:29 -03:00 |
Eduardo Bart
|
c6dd25ed99
|
outfit colors
|
2011-08-19 09:26:26 -03:00 |
Eduardo Bart
|
be21321393
|
...
|
2011-08-16 10:06:16 -03:00 |
Eduardo Bart
|
758b4b5dfb
|
display motd message only once, remove update loop, use g_platform.getTicks() instead
|
2011-08-16 09:47:30 -03:00 |
Eduardo Bart
|
65c1867f55
|
login protocol cancel
|
2011-08-16 01:24:20 -03:00 |
Eduardo Bart
|
3d4cfb793e
|
net improvments
|
2011-08-16 00:27:46 -03:00 |
Eduardo Bart
|
b90bb275b9
|
...
|
2011-08-15 21:32:16 -03:00 |
Eduardo Bart
|
f87b475f49
|
revise network system
|
2011-08-15 21:30:31 -03:00 |
Eduardo Bart
|
be15b1820d
|
more refactoring
|
2011-08-15 18:02:52 -03:00 |
Eduardo Bart
|
2e1a96c2df
|
rework on dat and spr loader
|
2011-08-15 16:15:49 -03:00 |
Eduardo Bart
|
d8cc37afdb
|
reorganize sources
|
2011-08-15 11:06:15 -03:00 |
Eduardo Bart
|
4e03b15b27
|
Merge branch 'master' of github.com:edubart/otclient
|
2011-08-15 06:55:51 -03:00 |
Eduardo Bart
|
a5b41f77ea
|
hoho
|
2011-08-15 06:55:43 -03:00 |
Henrique
|
fd7f191cb2
|
missing files, color fix
|
2011-08-15 02:12:42 -03:00 |
Henrique
|
e8448cddb9
|
creatures, fixe
|
2011-08-15 02:09:27 -03:00 |
Eduardo Bart
|
92b54b6f55
|
fix map render
|
2011-08-14 15:13:33 -03:00 |
Eduardo Bart
|
80564b9dff
|
fix some ui events
|
2011-08-14 15:02:28 -03:00 |
Eduardo Bart
|
afc197f2dc
|
rework on graphics.cpp, implement some GFX with lua
|
2011-08-14 14:45:25 -03:00 |
Eduardo Bart
|
09af50c990
|
remake ui event system and reimplement line edit
|
2011-08-14 11:09:26 -03:00 |
Eduardo Bart
|
55862b07ad
|
merge total remake
|
2011-08-13 23:10:27 -03:00 |
Henrique
|
0af7856475
|
unordered map on map
|
2011-08-13 21:30:27 -03:00 |
Henrique
|
0a268fc7d9
|
map draw improvements
|
2011-08-12 01:34:21 -03:00 |
Eduardo Bart
|
7cf188a67d
|
fix framebuffer
|
2011-08-11 23:04:28 -03:00 |
Eduardo Bart
|
f78d1c91b0
|
merge
|
2011-08-11 22:44:00 -03:00 |
Eduardo Bart
|
1a81d1520f
|
framebuffer
|
2011-08-11 22:38:54 -03:00 |
Henrique
|
a5cdf634b3
|
now is walking
|
2011-08-11 21:06:01 -03:00 |
Henrique
|
651315d4cd
|
map draw working with lil bugs
|
2011-08-11 02:52:30 -03:00 |
Henrique
|
f07648219c
|
remove old todo
|
2011-08-01 01:31:58 -03:00 |
Henrique
|
a38bd18280
|
init protocolgame
|
2011-08-01 01:28:41 -03:00 |
Eduardo Bart
|
586bcde915
|
add missing file
|
2011-07-28 10:21:03 -03:00 |
Eduardo Bart
|
ea2645c151
|
some network refactoring
|
2011-07-27 20:01:33 -03:00 |
Henrique
|
a62785911a
|
connection fix
|
2011-07-27 15:13:59 -03:00 |
Henrique
|
f34b6b1bab
|
connection rework, entergame.lua fix
|
2011-07-27 15:10:49 -03:00 |
Eduardo Bart
|
70f0b0dace
|
new script engine, and things maybe be bugged for a while
|
2011-07-26 20:13:27 -03:00 |
Eduardo Bart
|
ab7394f357
|
add a new folder structure redesign organized by packages
|
2011-07-17 08:52:20 -03:00 |
Eduardo Bart
|
bddcfb08fd
|
rework ui related scripting stuff
|
2011-07-17 03:56:57 -03:00 |
Eduardo Bart
|
571801ae39
|
some refactoring
|
2011-07-16 21:13:53 -03:00 |
Eduardo Bart
|
8ef1b28546
|
many changes and refactoring
|
2011-07-13 18:12:36 -03:00 |
Eduardo Bart
|
3f0a0cb9de
|
allocator with leak detecting capabilities
|
2011-07-12 16:27:37 -03:00 |
Henrique
|
9058a2898d
|
Merge branch 'master' of https://github.com/edubart/otclient
|
2011-05-31 02:25:57 -03:00 |
Henrique
|
c490577ea8
|
connection fixes, motd fixed
|
2011-05-31 02:24:30 -03:00 |
Eduardo Bart
|
5c85374ee3
|
fix script leak
|
2011-05-30 23:33:55 -03:00 |
Eduardo Bart
|
9b2d71f6d8
|
protocol via script
|
2011-05-30 22:55:34 -03:00 |
Henrique
|
ad10754779
|
init protocol login
|
2011-05-30 00:11:12 -03:00 |
Eduardo Bart
|
a54f5dd3f9
|
FML emitter
|
2011-05-22 00:56:58 -03:00 |
Eduardo Bart
|
d7bc083014
|
use exceptions in FML
|
2011-05-21 19:24:10 -03:00 |
Eduardo Bart
|
c3e67fceb9
|
Merge branch 'master' of github.com:edubart/otclient
|
2011-05-21 16:11:36 -03:00 |
Eduardo Bart
|
46485d0d76
|
improvements
|
2011-05-21 16:10:07 -03:00 |
Henrique
|
48abbe0ed4
|
Merge branch 'master' of https://github.com/edubart/otclient
|
2011-05-21 16:03:11 -03:00 |
Henrique
|
e258289edb
|
network message
|
2011-05-21 16:02:37 -03:00 |
Eduardo Bart
|
f5a15939b2
|
fix bug on how lua detect source paths
|
2011-05-21 15:40:06 -03:00 |
Eduardo Bart
|
80e42b0f96
|
replace YAML with custom made library for reading text files named FML
|
2011-05-21 15:15:46 -03:00 |
Eduardo Bart
|
0cd4bcd926
|
type casts for config manager
|
2011-05-19 21:03:15 -03:00 |
Eduardo Bart
|
f72214f090
|
type casts for config manager
|
2011-05-19 20:56:27 -03:00 |
Eduardo Bart
|
afc79a99e1
|
rework on resources system
|
2011-05-19 15:46:40 -03:00 |
Eduardo Bart
|
ab6c52a3ee
|
rework on resources system
|
2011-05-19 14:11:05 -03:00 |
Eduardo Bart
|
2d3add1b36
|
fix texture bug
|
2011-05-16 20:21:41 -03:00 |
Eduardo Bart
|
b3940b487d
|
use memset instead of bzero
|
2011-05-16 16:01:34 -03:00 |
Eduardo Bart
|
e81e0f1c24
|
fix gl bug, textures sizes must be a power of 2
|
2011-05-16 15:30:05 -03:00 |
Eduardo Bart
|
7e7d16ee5f
|
remove fmemopen
|
2011-05-15 14:26:05 -03:00 |
Eduardo Bart
|
ca38f53e15
|
OpenGL in prerequesites
|
2011-05-15 13:39:14 -03:00 |
Eduardo Bart
|
159de5d511
|
yaml 2.6 bugs
|
2011-05-14 00:07:35 -03:00 |
Eduardo Bart
|
35fc76f0a6
|
works with yaml 2.6
|
2011-05-13 23:21:25 -03:00 |
Eduardo Bart
|
177cc8ba65
|
cmake fixes
|
2011-05-13 22:28:59 -03:00 |
Eduardo Bart
|
851e8eca2a
|
remove libpng
|
2011-05-12 20:31:10 -03:00 |
Eduardo Bart
|
a396df51cc
|
apng loader
|
2011-05-12 20:27:26 -03:00 |
Eduardo Bart
|
42eae9afd8
|
animated texture
|
2011-05-12 20:24:57 -03:00 |
Eduardo Bart
|
c6753747fb
|
a bunch of stuff
|
2011-05-11 19:16:11 -03:00 |
Eduardo Bart
|
42c1ae090c
|
anchoring errors
|
2011-05-09 18:08:17 -03:00 |
Eduardo Bart
|
51fe97644d
|
rework ui layouts, now it is more flexible and modular
|
2011-05-09 17:38:01 -03:00 |
Eduardo Bart
|
6d871b305f
|
* load ui elements in order
* shorter ui paths
|
2011-05-03 10:36:08 -03:00 |
Eduardo Bart
|
c052723477
|
scripting rework
|
2011-05-02 19:48:41 -03:00 |
Eduardo Bart
|
f290b4f89c
|
..
|
2011-05-02 01:38:00 -03:00 |
Eduardo Bart
|
9e90ae0ee4
|
more scripting features (dynamic fields)
|
2011-05-02 01:13:57 -03:00 |
Eduardo Bart
|
f7bb044f48
|
merging
|
2011-05-01 15:51:46 -03:00 |
Eduardo Bart
|
32a8ed3871
|
scripting and UI improvements
|
2011-05-01 15:47:35 -03:00 |
Eduardo Bart
|
c1b2b3ed3a
|
error proning
|
2011-04-23 20:23:52 -03:00 |
Eduardo Bart
|
3960240b8e
|
messagebox (not working yet)
|
2011-04-23 17:04:49 -03:00 |
Eduardo Bart
|
a98f1d67db
|
onLoad and onDestroy events
|
2011-04-23 00:28:23 -03:00 |
Eduardo Bart
|
02ada0b82e
|
sources are broken
|
2011-04-22 21:12:28 -03:00 |
Eduardo Bart
|
96e0b1e909
|
new logger
scripts are now more error prone
|
2011-04-22 15:48:02 -03:00 |
Eduardo Bart
|
e611734396
|
remove game state classes
scripting improvements
|
2011-04-22 10:49:46 -03:00 |
Eduardo Bart
|
a3901b0251
|
merge
|
2011-04-21 19:48:57 -03:00 |
Eduardo Bart
|
50b99a75b9
|
lua scripting
|
2011-04-21 19:44:30 -03:00 |
Henrique Santiago
|
8952bddb7a
|
init network
|
2011-04-20 03:40:31 -03:00 |
Eduardo Bart
|
bb05338190
|
first script stuff (still ugly and under experiments)
|
2011-04-18 23:10:08 -03:00 |
Eduardo Bart
|
3de455fe7e
|
remove bugged net files
|
2011-04-18 00:26:35 -03:00 |
Eduardo Bart
|
5be199e566
|
basic options window
|
2011-04-17 18:15:24 -03:00 |
Eduardo Bart
|
8ef534e7b7
|
render fix
|
2011-04-17 17:39:03 -03:00 |
Eduardo Bart
|
44a7f6ab90
|
window move improv
|
2011-04-17 17:28:12 -03:00 |
Eduardo Bart
|
f2c187c810
|
doxyfile
|
2011-04-17 17:09:37 -03:00 |
Eduardo Bart
|
9b22a6e0a6
|
includes changed
|
2011-04-17 16:14:45 -03:00 |
Eduardo Bart
|
c0fce81238
|
ahn?
|
2011-04-17 16:14:24 -03:00 |
Eduardo Bart
|
beeb41dafd
|
poll
|
2011-04-16 23:52:54 -03:00 |
Eduardo Bart
|
da57770f88
|
network
|
2011-04-16 23:48:13 -03:00 |
Eduardo Bart
|
16a7747393
|
all callbacks must go through dispatcher
|
2011-04-16 22:07:03 -03:00 |
Henrique Santiago
|
2070b94661
|
init protocol integ
|
2011-04-16 22:06:38 -03:00 |
Eduardo Bart
|
9dfb33f2ed
|
info window
|
2011-04-16 21:36:58 -03:00 |
Eduardo Bart
|
c5da620d59
|
ui improvements
|
2011-04-16 19:06:42 -03:00 |
Eduardo Bart
|
dc39c965cc
|
window moving
|
2011-04-16 16:46:31 -03:00 |
Eduardo Bart
|
9b02312bf8
|
performance improvments
|
2011-04-16 13:08:55 -03:00 |
Eduardo Bart
|
da6dfea03e
|
text edit improvments
|
2011-04-15 20:52:26 -03:00 |
Eduardo Bart
|
5bfeee91b2
|
still implemeting uitextedit
|
2011-04-15 19:07:23 -03:00 |
Eduardo Bart
|
43c9c5de7c
|
text edit almost done
|
2011-04-15 12:46:30 -03:00 |
Eduardo Bart
|
f1475c0569
|
text edit improvments (not finished)
|
2011-04-14 23:13:53 -03:00 |
Eduardo Bart
|
e01bd17510
|
...
|
2011-04-14 12:10:26 -03:00 |
Eduardo Bart
|
4f386a854a
|
fix text enter
|
2011-04-14 12:09:16 -03:00 |
Henrique Santiago
|
6392f71641
|
Merge branch 'master' of github.com:edubart/otclient
|
2011-04-14 00:51:23 -03:00 |
Henrique Santiago
|
41839a1c28
|
win32 input events
|
2011-04-14 00:48:44 -03:00 |
Eduardo Bart
|
f7b6be4fa4
|
Merge branch 'master' of github.com:edubart/otclient
|
2011-04-13 22:33:02 -03:00 |
Eduardo Bart
|
5616259feb
|
simpler yaml read
|
2011-04-13 22:32:50 -03:00 |
Henrique Santiago
|
223e6ca85a
|
remove undef, add on cmakelists
|
2011-04-13 22:30:41 -03:00 |
Henrique Santiago
|
48896f81dd
|
undef ascii, protocol code commented, must swap lambda
|
2011-04-13 22:10:25 -03:00 |
Eduardo Bart
|
0f7f7827f5
|
rect fix and some ui new classes
|
2011-04-12 02:51:09 -03:00 |
Eduardo Bart
|
92ac4093a4
|
skin coloring fixes
|
2011-04-11 20:52:37 -03:00 |
Eduardo Bart
|
bc7fbcca16
|
fix gcc 4.4 compile error
|
2011-04-11 20:45:18 -03:00 |
Eduardo Bart
|
83b166e91e
|
use boost stuff
|
2011-04-11 18:22:01 -03:00 |
Eduardo Bart
|
08b6563fd5
|
remove lambdas
|
2011-04-11 18:11:22 -03:00 |
Eduardo Bart
|
451719479b
|
fix compilation for win32
|
2011-04-11 17:27:03 -03:00 |
Eduardo Bart
|
c3f0ca2b4f
|
more flexible skins
|
2011-04-11 17:06:03 -03:00 |
Eduardo Bart
|
da2993d1f9
|
text edit (not finished)
|
2011-04-11 01:08:56 -03:00 |
Eduardo Bart
|
dcbe4855bd
|
ui more error proning
|
2011-04-10 18:12:42 -03:00 |
Eduardo Bart
|
992e0a8a6b
|
ui loader and some refactoring
|
2011-04-10 17:40:44 -03:00 |
Eduardo Bart
|
1f78f93096
|
refactoring paths and includes
|
2011-04-10 12:37:15 -03:00 |
Eduardo Bart
|
792d661dad
|
loading ui from files
|
2011-04-10 04:34:52 -03:00 |
Eduardo Bart
|
150afa86f3
|
logger
|
2011-04-09 22:43:34 -03:00 |
Andre Antunes
|
b865d4834c
|
adding rsa sources
|
2011-04-09 22:33:07 -03:00 |
Andre Antunes
|
0b0a62b351
|
merge fix
|
2011-04-09 22:28:51 -03:00 |
Andre Antunes
|
d5e2115599
|
merge fix
|
2011-04-09 22:27:52 -03:00 |
Andre Antunes
|
296d613f3b
|
adding net files
|
2011-04-09 22:26:57 -03:00 |
Andre Antunes
|
2805a34267
|
begining tibia protocol
|
2011-04-09 22:25:13 -03:00 |
Eduardo Bart
|
5de660a20e
|
fix leaks
|
2011-04-09 22:13:12 -03:00 |
Eduardo Bart
|
9d1ddf34bf
|
basic menu functionallity
|
2011-04-09 21:51:35 -03:00 |
Eduardo Bart
|
f2bdc89d8d
|
window ui
|
2011-04-09 19:55:58 -03:00 |
Eduardo Bart
|
a9a110f44b
|
missing files
|
2011-04-09 16:08:43 -03:00 |
Eduardo Bart
|
22c4b0976a
|
refator some stuff, button implementation
|
2011-04-09 16:07:35 -03:00 |
Eduardo Bart
|
a5cd0bed74
|
ui anchoring
|
2011-04-09 14:18:50 -03:00 |
Andre Antunes
|
02c58f16cd
|
connection update
|
2011-04-08 20:24:51 -03:00 |
Eduardo Bart
|
e94024de67
|
ui skinning
|
2011-04-08 20:20:44 -03:00 |
Eduardo Bart
|
f54ef6401d
|
image class
|
2011-04-08 15:29:59 -03:00 |
Andre Antunes
|
bda40b218a
|
using lambda
|
2011-04-08 15:18:26 -03:00 |
Eduardo Bart
|
77b31e425a
|
bordered image class
|
2011-04-08 06:51:27 -03:00 |
Eduardo Bart
|
6e8df399c9
|
render do main menu
|
2011-04-08 06:50:26 -03:00 |
Eduardo Bart
|
4c6d1269a0
|
first gui stuff
|
2011-04-08 02:10:00 -03:00 |
Eduardo Bart
|
8a33e0cf19
|
text align rendering
|
2011-04-07 17:36:40 -03:00 |
Eduardo Bart
|
7739c7bb29
|
merge
|
2011-04-07 15:50:48 -03:00 |
Eduardo Bart
|
f3df212793
|
advanced text render
|
2011-04-07 15:49:35 -03:00 |
Andre Antunes
|
6f952adae2
|
connection is now working properly
|
2011-04-07 15:02:06 -03:00 |
Eduardo Bart
|
8d1281b316
|
fonts..
|
2011-04-07 12:41:49 -03:00 |
Eduardo Bart
|
21bcbf9a97
|
compilation fixes
|
2011-04-07 06:36:02 -03:00 |
Eduardo Bart
|
6451e36240
|
Merge branch 'master' of github.com:edubart/otclient
|
2011-04-07 05:48:53 -03:00 |
Andre Antunes
|
ee2b05dc8d
|
fixing merge
|
2011-04-07 05:48:10 -03:00 |
Eduardo Bart
|
588eccba0d
|
compilation fixes
|
2011-04-07 05:45:58 -03:00 |
Andre Antunes
|
67f37ccb51
|
adding net to framework
|
2011-04-07 05:44:26 -03:00 |
Andre Antunes
|
86ed2ff287
|
adding net to framework
|
2011-04-07 05:42:57 -03:00 |
Eduardo Bart
|
f3eaf3f726
|
fps counter
|
2011-04-07 05:38:29 -03:00 |
Eduardo Bart
|
937070b3e0
|
move render stuff to graphics
|
2011-04-07 04:30:32 -03:00 |
Eduardo Bart
|
9bd9f4ba53
|
font improvments
|
2011-04-07 00:13:57 -03:00 |
Eduardo Bart
|
9464f99c90
|
basic font redering
|
2011-04-06 21:58:36 -03:00 |
Eduardo Bart
|
b1ec45783e
|
rename g_config
|
2011-04-06 17:53:00 -03:00 |
Eduardo Bart
|
5ab943ce13
|
rename int types
|
2011-04-06 17:18:00 -03:00 |
Eduardo Bart
|
12cdefff38
|
refactoring some stuff
|
2011-04-06 16:46:58 -03:00 |
Andre Antunes
|
a5d475aec1
|
renaming some variables
|
2011-04-04 21:39:57 -03:00 |
Eduardo Bart
|
70a8338804
|
Merge branch 'master' of github.com:edubart/otclient
|
2011-04-02 18:36:51 -03:00 |
Eduardo Bart
|
15147c4d2c
|
use auto keyword
|
2011-04-02 18:36:45 -03:00 |
Andre Antunes
|
43001f40b7
|
adding convertType and minor changes
|
2011-04-02 18:19:07 -03:00 |
Eduardo Bart
|
d29b139321
|
use C++0x, change prerequisites headers
|
2011-04-02 18:02:39 -03:00 |
Eduardo Bart
|
7ef92bb0ac
|
fix a little thing
|
2011-04-02 17:04:25 -03:00 |
Eduardo Bart
|
c40b827828
|
texture manager with weak ptr
|
2011-04-02 16:59:49 -03:00 |
Eduardo Bart
|
4fa659c26a
|
Merge branch 'master' of github.com:edubart/otclient
|
2011-04-02 14:33:41 -03:00 |
Eduardo Bart
|
e281853a0c
|
first ticks for win32
|
2011-04-02 14:32:54 -03:00 |
Henrique Santiago
|
884de984f3
|
resource ls, init fonts
|
2011-03-26 17:53:08 -03:00 |
Eduardo Bart
|
33a2b885b5
|
useless feature
|
2011-03-25 16:57:11 -03:00 |
Henrique Santiago
|
8a13517714
|
win32 visible, focused, size fix
|
2011-03-21 17:03:45 -03:00 |
Eduardo Bart
|
5254b8d230
|
change tick on win32
|
2011-03-20 20:16:38 -03:00 |
Eduardo Bart
|
2e5692da45
|
Merge branch 'master' of github.com:edubart/otclient
|
2011-03-20 20:15:34 -03:00 |
Eduardo Bart
|
9f27ed75d5
|
change how ticks works
|
2011-03-20 20:15:17 -03:00 |
Henrique Santiago
|
e107daf5dd
|
Merge branch 'master' of github.com:edubart/otclient
|
2011-03-20 20:10:39 -03:00 |
Henrique Santiago
|
dc409fe76c
|
win32 rect fix
|
2011-03-20 20:09:27 -03:00 |
Eduardo Bart
|
71b6fb0590
|
render when visible only
|
2011-03-20 19:30:15 -03:00 |
Eduardo Bart
|
caded3285c
|
init on screen center on first startup
|
2011-03-20 19:10:02 -03:00 |
Eduardo Bart
|
2339e05b34
|
merging
|
2011-03-20 18:46:57 -03:00 |
Eduardo Bart
|
e1b5d52b07
|
x11 maximized and coords x,y
|
2011-03-20 18:41:32 -03:00 |