diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-22 19:45:03 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-22 19:45:56 +0100 |
| commit | 0c43d04b438d41c277ae80402d4b4888db1a0b64 (patch) | |
| tree | 3aaeb75ecd1bcbe85decedab5f1fa426fe0411e3 /data/graphics/gui | |
| parent | a7f5eaeb7f643658d356533a608f0f18d85b6d32 (diff) | |
| parent | 401802c1d7a1b3d659bdc53a45d9a6292fc1121e (diff) | |
| download | mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.gz mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.bz2 mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.xz mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.zip | |
Merged the tmwserv client with the eAthena client
This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.
In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.
Conflicts:
Everywhere!
Diffstat (limited to 'data/graphics/gui')
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | data/graphics/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | data/graphics/gui/circle-gray.png | bin | 0 -> 295 bytes | |||
| -rw-r--r-- | data/graphics/gui/circle-green.png | bin | 0 -> 299 bytes | |||
| -rw-r--r-- | data/graphics/gui/equip_bg.png | bin | 0 -> 18901 bytes | |||
| -rw-r--r-- | data/graphics/gui/speech_bubble.png | bin | 0 -> 2031 bytes | |||
| -rw-r--r-- | data/graphics/gui/speechbubble.xml | 2 |
7 files changed, 6 insertions, 1 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index f564253a..347e9f5e 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -6,9 +6,12 @@ SET (FILES buttonhi.png buttonpress.png checkbox.png + circle-gray.png + circle-green.png close_button.png deepbox.png default.png + equip_bg.png gui.xml hits_blue.png hits_red.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index e78018b7..d697ffd7 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -9,6 +9,8 @@ gui_DATA = \ buttonhi.png \ buttonpress.png \ checkbox.png \ + circle-gray.png \ + circle-green.png \ close_button.png \ deepbox.png \ default.png \ diff --git a/data/graphics/gui/circle-gray.png b/data/graphics/gui/circle-gray.png Binary files differnew file mode 100644 index 00000000..719b0b10 --- /dev/null +++ b/data/graphics/gui/circle-gray.png diff --git a/data/graphics/gui/circle-green.png b/data/graphics/gui/circle-green.png Binary files differnew file mode 100644 index 00000000..bab39e05 --- /dev/null +++ b/data/graphics/gui/circle-green.png diff --git a/data/graphics/gui/equip_bg.png b/data/graphics/gui/equip_bg.png Binary files differnew file mode 100644 index 00000000..77ac63d8 --- /dev/null +++ b/data/graphics/gui/equip_bg.png diff --git a/data/graphics/gui/speech_bubble.png b/data/graphics/gui/speech_bubble.png Binary files differnew file mode 100644 index 00000000..3e678099 --- /dev/null +++ b/data/graphics/gui/speech_bubble.png diff --git a/data/graphics/gui/speechbubble.xml b/data/graphics/gui/speechbubble.xml index 8715027d..84b6557b 100644 --- a/data/graphics/gui/speechbubble.xml +++ b/data/graphics/gui/speechbubble.xml @@ -15,4 +15,4 @@ <part type="bottom-edge" xpos="5" ypos="10" width="5" height="5" /> <part type="bottom-right-corner" xpos="10" ypos="10" width="5" height="5" /> </widget> -</skinset>
\ No newline at end of file +</skinset> |
