Resolve "Merge the best from 7.40 branch"

Browse Source

...

This commit is contained in:

Erikas Kontenis

2022-04-06 14:58:52 +00:00

parent 3bd1a6f07e

commit 155da3573c

928 changed files with 43723 additions and 1221 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

SabrehavenOTClient/data/images/game/actionbarslot.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

SabrehavenOTClient/data/images/game/battle/battle_monsters.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

SabrehavenOTClient/data/images/game/battle/battle_npcs.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

SabrehavenOTClient/data/images/game/battle/battle_party.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

SabrehavenOTClient/data/images/game/battle/battle_players.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

SabrehavenOTClient/data/images/game/battle/battle_skulls.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

SabrehavenOTClient/data/images/game/circle/left_empty.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

SabrehavenOTClient/data/images/game/circle/left_full.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

SabrehavenOTClient/data/images/game/circle/right_empty.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

SabrehavenOTClient/data/images/game/circle/right_full.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/chasemode.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/fightbalanced.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/fightdefensive.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/fightoffensive.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/mount.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/pvp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/redfistmode.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/safefight.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/whitedovemode.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/whitehandmode.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

SabrehavenOTClient/data/images/game/combatmodes/yellowhandmode.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

SabrehavenOTClient/data/images/game/console/channels.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 245 B

BIN

SabrehavenOTClient/data/images/game/console/clearchannel.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 669 B

BIN

SabrehavenOTClient/data/images/game/console/closechannel.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 300 B

BIN

SabrehavenOTClient/data/images/game/console/ignore.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 474 B

BIN

SabrehavenOTClient/data/images/game/console/leftarrow.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 271 B

BIN

SabrehavenOTClient/data/images/game/console/rightarrow.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 285 B

BIN

SabrehavenOTClient/data/images/game/console/say.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 255 B

BIN

SabrehavenOTClient/data/images/game/console/whisper.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 255 B

BIN

SabrehavenOTClient/data/images/game/console/yell.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 266 B

BIN

SabrehavenOTClient/data/images/game/creaturetype/summon_other.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 283 B

BIN

SabrehavenOTClient/data/images/game/creaturetype/summon_own.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 283 B

BIN

SabrehavenOTClient/data/images/game/dangerous.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 227 B

BIN

SabrehavenOTClient/data/images/game/emblems/emblem_blue.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 385 B

BIN

SabrehavenOTClient/data/images/game/emblems/emblem_green.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 381 B

BIN

SabrehavenOTClient/data/images/game/emblems/emblem_member.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 333 B

BIN

SabrehavenOTClient/data/images/game/emblems/emblem_other.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 319 B

BIN

SabrehavenOTClient/data/images/game/emblems/emblem_red.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 386 B

BIN

SabrehavenOTClient/data/images/game/imbuing/100percent.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

SabrehavenOTClient/data/images/game/imbuing/clear.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.4 KiB

BIN

SabrehavenOTClient/data/images/game/imbuing/imbue_empty.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

SabrehavenOTClient/data/images/game/imbuing/imbue_green.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.4 KiB

BIN

SabrehavenOTClient/data/images/game/imbuing/slot.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

SabrehavenOTClient/data/images/game/imbuing/slot_disabled.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

SabrehavenOTClient/data/images/game/imbuing/slot_inactive.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

SabrehavenOTClient/data/images/game/minimap/cross.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 243 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag0.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 335 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 397 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag10.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 373 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag11.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 397 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 412 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag13.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 418 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag14.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 392 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag15.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 399 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag16.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 400 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag17.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 402 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag18.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 423 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag19.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 392 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 418 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 431 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 321 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 354 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 427 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 387 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag8.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 444 B

BIN

SabrehavenOTClient/data/images/game/minimap/flag9.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 423 B

BIN

SabrehavenOTClient/data/images/game/minimap/flagcheckbox.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 349 B

BIN

SabrehavenOTClient/data/images/game/minimap/floor_down.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

SabrehavenOTClient/data/images/game/minimap/floor_up.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

SabrehavenOTClient/data/images/game/minimap/zoom_in.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 836 B

BIN

SabrehavenOTClient/data/images/game/minimap/zoom_out.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 819 B

BIN

SabrehavenOTClient/data/images/game/mobile/attack.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

BIN

SabrehavenOTClient/data/images/game/mobile/chat.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

SabrehavenOTClient/data/images/game/mobile/follow.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

SabrehavenOTClient/data/images/game/mobile/keypad.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

SabrehavenOTClient/data/images/game/mobile/keypad_pointer.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

SabrehavenOTClient/data/images/game/mobile/look.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

SabrehavenOTClient/data/images/game/mobile/use.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

BIN

SabrehavenOTClient/data/images/game/npcicons/icon_chat.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

SabrehavenOTClient/data/images/game/npcicons/icon_quest.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

SabrehavenOTClient/data/images/game/npcicons/icon_trade.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

SabrehavenOTClient/data/images/game/npcicons/icon_tradequest.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 795 B

BIN

SabrehavenOTClient/data/images/game/shields/shield_blue.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 352 B

BIN

SabrehavenOTClient/data/images/game/shields/shield_blue_not_shared.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 522 B

BIN

SabrehavenOTClient/data/images/game/shields/shield_blue_shared.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 516 B

BIN

SabrehavenOTClient/data/images/game/shields/shield_blue_white.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 404 B

BIN

SabrehavenOTClient/data/images/game/shields/shield_gray.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 330 B

BIN

SabrehavenOTClient/data/images/game/shields/shield_yellow.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 377 B

BIN

SabrehavenOTClient/data/images/game/shields/shield_yellow_not_shared.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 512 B

BIN

SabrehavenOTClient/data/images/game/shields/shield_yellow_shared.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 494 B

BIN

SabrehavenOTClient/data/images/game/shields/shield_yellow_white.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 407 B

BIN

SabrehavenOTClient/data/images/game/skull_socket.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 338 B

BIN

SabrehavenOTClient/data/images/game/skulls/skull_black.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 482 B

BIN

SabrehavenOTClient/data/images/game/skulls/skull_green.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 438 B

BIN

SabrehavenOTClient/data/images/game/skulls/skull_orange.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 445 B

BIN

SabrehavenOTClient/data/images/game/skulls/skull_red.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 421 B

BIN

SabrehavenOTClient/data/images/game/skulls/skull_white.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 437 B

BIN

SabrehavenOTClient/data/images/game/skulls/skull_yellow.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 437 B

BIN

SabrehavenOTClient/data/images/game/slots/ammo-blessed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

BIN

SabrehavenOTClient/data/images/game/slots/ammo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.9 KiB

Some files were not shown because too many files have changed in this diff Show More