Commit Graph
1288 Commits
Author SHA1 Message Date
Waverunner 8e6ac5213b Player Association Access added to datapad on creation, added guildId delta, changed getGuildList to return SWGSet<Guild> 2014-05-14 17:12:46 -04:00
Treeku 4d5c05aa39 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-14 20:39:32 +01:00
Treeku 737b24d3b9 Changed guildList to a Set, changed STAO 2014-05-14 20:39:03 +01:00
Waverunner 3443856857 Fixed #657: Reset expertise does not remove buffs 2014-05-14 14:55:59 -04:00
Waverunner fab8636fa1 Fixed #655: Groupchat you can post in it only via using "ctrl + g" 2014-05-14 14:45:24 -04:00
Treeku fa4816921e Refactored GUILD object 2014-05-14 17:11:22 +01:00
Treeku 865db149ad Fixed loads of warnings 2014-05-14 15:51:25 +01:00
Treeku ed0811672f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-14 14:59:05 +01:00
Treeku c564a016e4 Refactored TANO 2014-05-14 14:57:49 +01:00
Waverunner d2164ce8b6 Added option to clean odb folders on startup
Change 0 to 1 to enable this feature in options.cfg
2014-05-13 20:32:49 -04:00
Waverunner 34a7a58089 Create Guild script for PDA, PDA Added to Frog, moved GuildService
Note that the PDA is only available on the frog if you have GM access right now.
2014-05-13 18:59:24 -04:00
Treeku f9c542063a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-13 09:24:06 +01:00
Treeku 7f88fefe2e Fixed force run 2014-05-13 09:22:30 +01:00
Treeku f38a4a8885 Fixed #611 2014-05-13 09:04:05 +01:00
Treeku 58d735b884 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	ngengine_public.jar
2014-05-13 03:58:21 +01:00
Treeku 35acbd75d4 Changed STF.get() to Stf class 2014-05-13 03:39:41 +01:00
Treeku d6de965242 Fixed object initialisation error 2014-05-13 03:38:52 +01:00
Treeku 0ddd645b7e Fixed bounty hunter null exception 2014-05-13 02:56:34 +01:00
Light2 fea0ddbe75 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-12 19:48:21 +02:00
Light2 4a100d9ae3 fixed loading errors 2014-05-12 19:47:57 +02:00
Treeku 3ac422a8bb Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-12 17:50:59 +01:00
Treeku f3f9da7965 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/intangible/IntangibleObject.java
2014-05-12 17:50:08 +01:00
Light2 7fc5c44817 Moved loot groups to mobile template scripts, moved respawn time to spawn service as last argument
Please no longer use loot in object template scripts and move them over
to the mobiles/ folder.
2014-05-12 18:42:15 +02:00
Treeku 08ba6b0c1b Applied grantLevel reward fix to giveExperience 2014-05-12 17:40:51 +01:00
Light2 46a890ed92 fixed deadlocks caused by stacked synchronized's 2014-05-12 17:49:16 +02:00
Light2 b8927c9677 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-12 17:35:30 +02:00
Light2 119e58318c More work on vendors 2014-05-12 17:35:19 +02:00
Treeku bf472ae6b6 Fixed minor issue with previous engine binary 2014-05-12 14:15:02 +01:00
Treeku 4e8eebb718 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
2014-05-12 05:01:27 +01:00
Treeku 4fe246975c Fixed various bugs 2014-05-12 04:56:29 +01:00
Seefo 6cb8f40793 Small fix to last commit 2014-05-11 22:54:15 -04:00
Seefo f9e413239d Fixed a bug where respeccing wouldn't remove old abilities 2014-05-11 22:46:45 -04:00
Seefo e04ccfa965 Fixed a bug where a player would become 'grey' upon logging out 2014-05-11 22:00:17 -04:00
Seefo 1445086a58 Fixed a few bugs 2014-05-11 17:15:04 -04:00
Seefo 146df320b8 Fixed CollectionService system messages, added STF datatable to quickly obtain an entry from an STF 2014-05-11 16:21:34 -04:00
Seefo fd524a5a75 Fixed #650 and #651 2014-05-11 14:12:16 -04:00
Seefo c47ddf77df Fixed a container limit bug 2014-05-11 12:42:40 -04:00
Seefo bc25be3bed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-11 12:24:07 -04:00
Seefo 6aca49baea Fixed container limit checks 2014-05-11 12:23:53 -04:00
Treeku 9b4272e434 Refactored ITNO 2014-05-11 16:55:52 +01:00
Treeku e052212ff2 Fixed some syntax errors 2014-05-11 16:00:29 +01:00
Treeku 60eee0d4dd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-11 15:56:36 +01:00
Treeku e6c0866114 Engine changes 2014-05-11 15:20:15 +01:00
Treeku 67fda7163a Fixed staticService ordering 2014-05-11 12:06:08 +01:00
Treeku 4398a5ed93 Fixed another static spawn issue 2014-05-11 10:33:06 +01:00
Treeku c0481f258e Fixed static spawn issue 2014-05-11 10:19:49 +01:00
Treeku 7fd08bc7ad Baseline changes, cleaned some things 2014-05-11 09:54:50 +01:00
Treeku 837e07d822 Respawn functionality
(might want to be moved to spawnService)
2014-05-11 09:29:38 +01:00
Treeku 588e06b4ff Added respawnTime to MobileTemplate 2014-05-11 08:58:06 +01:00
Seefo 3218803ecb Updated lightsaber system messages, changed EquipmentService.canEquip to report why the actor cannot equip the item 2014-05-11 01:45:00 -04:00