FatBoy 5dee08d3ce Merge branch 'lakebane-mines' into lakebane-master ...

# Conflicts:
#	src/engine/gameManager/CombatManager.java
#	src/engine/mobileAI/utilities/MovementUtilities.java
#	src/engine/net/client/ClientMessagePump.java
#	src/engine/net/client/msg/VendorDialogMsg.java
#	src/engine/objects/CharacterItemManager.java
#	src/engine/objects/Mine.java
#	src/engine/objects/PlayerCharacter.java
#	src/engine/objects/Warehouse.java

2024-05-27 18:36:07 -05:00

..

AbstractCharacter.java

Merge branch 'lakebane-mines' into lakebane-master

2024-05-27 18:36:07 -05:00

AbstractGameObject.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

AbstractIntelligenceAgent.java

pet buff trouble shooting

2024-02-29 19:04:06 -06:00

AbstractWorldObject.java

combat bug fix

2024-03-02 16:17:57 -06:00

Account.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Bane.java

capturing city will cede all buildinsg to conquerer

2024-05-21 14:34:17 -05:00

BaseClass.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Blueprint.java

trainer buildings granted 3 slots at r1

2024-05-12 20:46:49 -05:00

Boon.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Building.java

auto update NPC slot location and reload on mesh change for buildings

2024-05-21 17:01:23 -05:00

BuildingFriends.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

BuildingLocation.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

BuildingRegions.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

CharacterItemManager.java

attempted warehouse delay issue resolution

2024-05-20 13:34:03 -05:00

CharacterPower.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

CharacterRune.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

CharacterSkill.java

saetor skills

2024-03-27 21:08:08 -05:00

CharacterTitle.java

Boxed Flag

2024-05-17 17:23:49 -05:00

City.java

implement bane cap sizes based on trees in nation

2024-04-28 18:59:43 -05:00

Colliders.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Condemned.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Contract.java

resource merchant

2024-05-19 06:40:20 -05:00

Corpse.java

mob desync issue

2024-04-24 14:47:55 -05:00

Effect.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

EffectsResourceCosts.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

EnchantmentBase.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Experience.java

xp and range fix

2024-05-22 06:43:51 -05:00

Formation.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Group.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Guild.java

grouping restriction update

2024-04-20 00:44:30 -05:00

GuildAlliances.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

GuildCondemn.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

GuildHistory.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

GuildStatusController.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

GuildTag.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Heraldry.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Item.java

remove name override for vorg

2024-04-27 21:13:19 -05:00

ItemBase.java

vorg fix

2024-04-24 21:43:48 -05:00

ItemContainer.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

ItemFactory.java

any mob over level 30 has a small chance to drop glass

2024-02-11 17:12:43 -06:00

Kit.java

Lizardman Race Added

2024-03-11 20:39:43 -05:00

LevelDefault.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

MaxSkills.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

MenuOption.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

MeshBounds.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Mine.java

yet another attempt at mines

2024-05-26 20:01:06 -05:00

MineProduction.java

yet another attempt at mines

2024-05-26 16:42:13 -05:00

Mob.java

flash message can be more than one word

2024-05-17 19:28:24 -05:00

MobBase.java

mob resist issue

2024-05-12 16:44:37 -05:00

MobBaseEffects.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

MobBaseStats.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

MobEquipment.java

prospector cost reduced to 500k on disc merchant

2024-05-19 06:39:55 -05:00

MobLoot.java

vorg fix

2024-04-24 21:43:48 -05:00

Nation.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

NPC.java

trainer upgrade cost reduced to 25%

2024-05-12 20:23:30 -05:00

NPCProfits.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

NPCRune.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Petition.java

Casting cleanup in constructor signature.

2023-08-16 15:04:52 -04:00

PlayerBonuses.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

PlayerCharacter.java

xp and range fix

2024-05-22 06:45:32 -05:00

PlayerFriends.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Portal.java

runegates always open

2024-04-24 17:55:52 -05:00

PowerGrant.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

PowerReq.java

debugging

2024-05-09 19:36:55 -05:00

PowersBaseAttribute.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

PreparedStatementShared.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

ProducedItem.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

PromotionClass.java

Lizardman Race Added

2024-03-11 20:26:26 -05:00

Race.java

update saetor stats

2024-05-19 06:39:43 -05:00

Realm.java

realm date time console spam fix

2024-04-30 19:08:39 -05:00

Regions.java

region support for teleporting

2023-07-22 13:24:58 -05:00

Resists.java

disc dropper resists

2024-05-17 18:11:37 -05:00

Resource.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

RuneBase.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

RuneBaseAttribute.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

RuneBaseEffect.java

null check

2024-05-18 10:55:06 -05:00

Runegate.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Shrine.java

saetor can now take "Chaos Boon"

2024-04-02 20:23:38 -05:00

SkillReq.java

Backend Saetor work

2024-03-19 20:33:34 -05:00

SkillsBase.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

SkillsBaseAttribute.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

StaticColliders.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Transaction.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

VendorDialog.java

Project cleanup pre merge.

2023-07-15 09:23:48 -04:00

Warehouse.java

attempted warehouse delay issue resolution

2024-05-20 13:34:03 -05:00

Zone.java

terraform update

2024-05-01 21:20:04 -05:00