Commit Graph
1367 Commits
Author SHA1 Message Date
Waverunner ce88128c2d Refactored Junk Dealer script, Selling junk items will now place "buy back" device in datapad
Moved the SUI Windows into Java so no need for global variables, updated
conversation messages for the changes to ProsePackage, added the "buy
back" control device - this contains the latest 10 items you sold to the
junk dealer.
2014-05-27 18:13:00 -04:00
Waverunner 32d2b18725 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-26 18:58:33 -04:00
Waverunner 6d28ac9cd5 Fixed mission strings, fixed multiple bounty hunting bugs, added stacks for tracking droids from CBT
Fixed bugs for BHing include:
Bounty not being removed from bountyMap (they were still removed from
the db though)
Bounty success/defeat messages were wrong
Seeker not being destroyed from world
Completing bounty mission would not remove it from log (Allowing you to
keep on killing the player and potentially collecting the reward)
Fixed conversation messages on Arakyd Droid to use new ProsePackage
format
2014-05-26 18:58:16 -04:00
Light2 b21b40ab98 more work on vendors 2014-05-26 20:41:51 +02:00
Waverunner 38441e069e Refactored guild creation, enabled access to guild creation device, guild disband, guild kick, guild members, moved server motd to motd.txt 2014-05-26 12:43:06 -04:00
Waverunner c85eb36eec Added Guild Permissions List, Added setting of permissions via permissions list, minor SUI Table method changes 2014-05-25 14:25:41 -04:00
Waverunner a9c95d0612 Added new SUIWindow methods: addTableDataSource, addTableColumn, addTableRow, minor GuildMember variable additions 2014-05-24 19:15:27 -04:00
Waverunner 615602e9b3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-23 18:22:05 -04:00
Waverunner 31fb79b406 Added GuildMember class for handling member specific variables, changed sponsoring to use GuildMember 2014-05-23 18:21:50 -04:00
CharonInferar 69105e0be1 Merge pull request #702 from CharonInferar/MixedGroup
Filled dantooine with more lair groups
2014-05-23 17:36:13 +02:00
Waverunner f4947d4a33 Added guild sponsorship system, added methods to send guild mails 2014-05-22 20:04:11 -04:00
CharonInferar d450228e60 Added MixedSpawnArea
To save server resources, a mixed spawn area can consist of dynamic
groups and lair  groups. Also the minimal distance from dynamic group to
nearest lair will be kept to prevent lairs and NPCs too close together a
bit more.
2014-05-23 01:44:25 +02:00
CharonInferar 7ebbca39ff Merge pull request #700 from tacef/master
Updated Rebel and imperial Recruiter Conversation
2014-05-22 19:34:21 +02:00
CharonInferar 2840eb30f5 First ideas 2014-05-22 19:28:03 +02:00
tacef a431ff53a1 Updated Imperial Recruiter Convo to support recent changes to the Factionservice
Updated Factionservice, you weren´t combatant when joining faction
2014-05-22 19:04:24 +02:00
CharonInferar 8185fd0188 Merge pull request #698 from CharonInferar/DathomirSpawns
Dathomir Nightsisters and Singing mountain clan added
2014-05-22 17:33:42 +02:00
CharonInferar 1a10796e0e Debug outs commented out 2014-05-22 17:31:43 +02:00
CharonInferar c28fea3cf9 Dathomir Nighsisters and Singing Mountain Clan added
- Nightsister vs Singing Mountain Clan Battle
- Wild NS and SMC spawns in some areas of the planet
2014-05-22 17:24:44 +02:00
Seefo 33ddb83207 Fixed #690 2014-05-21 19:15:09 -04:00
Light2 88bb8a4ee2 fixed krayt sizes to more realistic values 2014-05-22 00:35:11 +02:00
Light2 c7e41a83e9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/bazaar/BazaarService.java
2014-05-21 19:16:21 +02:00
Light2 4e8a9ae47c bit more work on vendors 2014-05-21 19:02:12 +02:00
CharonInferar e8f7fe50a4 Merge remote-tracking branch 'origin/master' into ForceCrystalCave 2014-05-21 18:51:58 +02:00
CharonInferar 164ed38fc4 Added imperial outpost, fixed visibility issue
- Added force crystal hunter's cave
- Added imperial outpost NPCs
- Fixed creature visibility while mounted
- Tweaked some spawn areas
- Debugged some spawn issues
2014-05-21 18:50:02 +02:00
Treeku d743776927 Fixed #690 2014-05-21 15:38:42 +01:00
Waverunner 8b5e3100fb Fixed attribute error, added missing guildchat scripts from last commit 2014-05-20 19:01:50 -04:00
Waverunner c9b2d1c2a2 Added guild chat, guild information window added, added variables in future for sponsor system 2014-05-20 18:34:53 -04:00
Treeku b9e477ddf0 Fixed SWGSet bug 2014-05-20 22:07:38 +01:00
CharonInferar 4a402abfc9 Conflict resolve 2014-05-20 19:45:58 +02:00
CharonInferar f97ecc58d2 Merge pull request #686 from CharonInferar/DantooineSpawns
Dantooine planetary mob and NPC spawns added
2014-05-20 18:49:10 +02:00
CharonInferar 9b0986521e Edits to some mobiles
Corrections
2014-05-20 18:40:57 +02:00
Treeku 4109cf5c6d Fixed illegal argument exception in SWGSet 2014-05-19 20:34:18 +01:00
Treeku ff220a116e Merge pull request #681 from tacef/master
Fixed Error in MobileTemplate factionStatus
2014-05-19 18:57:55 +01:00
tacef 8592841b35 Fixed Error in MobileTemplate factionStatus 2014-05-19 19:56:52 +02:00
Treeku a10fb20373 Merge pull request #680 from tacef/master
Started work on Factional NPC's
2014-05-19 18:50:37 +01:00
Treeku b1650cc668 Minor changes
Not sure why the gcw time is always 888d, 33h ahead.  The epoch time is
definitely sent correct in seconds.  Adding and subtracting server
times, born date or anything else hasn't had an effect.
2014-05-19 16:32:54 +01:00
Treeku 1e864be3f1 Added gcw award for pvp 2014-05-19 16:28:14 +01:00
CharonInferar ac1128b00d Merge remote-tracking branch 'origin/master' into DantooineSpawns 2014-05-19 15:57:26 +02:00
CharonInferar 16f82b50a6 Dantooine-wide spawns added with Planetary Spawn Tool
Considering the combat level ranges from live, the planet's surface has
been covered with spawn areas for various mobs and NPCs. A small as
possible count of collidables was used to save server resources while
still being able to realize the spawns.
2014-05-19 15:52:57 +02:00
Treeku 7a94d4438b Fixed type error 2014-05-18 21:40:48 +01:00
Treeku 8e5c7afaa6 Changed nextUpdateTime calculations 2014-05-18 20:59:51 +01:00
Treeku efeb66f965 Fixed potential crash 2014-05-18 20:16:39 +01:00
Treeku 43a609f9df Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-18 20:03:27 +01:00
Treeku eddcf01202 Implemented gcwPoints and gcwRanks 2014-05-18 19:07:13 +01:00
Treeku 54a00a45cf Refactored PLAY 2014-05-18 19:04:23 +01:00
tacef ef4e73e24e Started work on Factional NPC's
Added setFaction and setFactionStatus to Mobiletemplate
2014-05-18 18:08:49 +02:00
Light b3ae56e37d Added Group Kick command 2014-05-18 01:09:38 +02:00
Light 682e04da5d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-18 00:42:01 +02:00
Light c990690726 Implemented PvP Zones 2014-05-18 00:40:45 +02:00
Waverunner a92a3675b2 Merge pull request #678 from Ziggeh/master
Buffs - add() and remove() no longer used
2014-05-17 18:03:23 -04:00