Commit Graph
1757 Commits
Author SHA1 Message Date
Waverunner 58b24dcffb Syntax fix from previous commit 2014-07-27 13:00:44 -04:00
Waverunner 88627d65a3 Fixed guilds not being removed from the GuildObject when disbanding 2014-07-27 12:59:05 -04:00
Waverunner ad1e996fbb Merge pull request #1064 from zingzing175/master
Changed Character builder to use Script instead of a service. (Can now be modified while server is running)
2014-07-26 17:34:52 -04:00
Zing 78869c8b26 Added Character Builder Terminal Script: See Extended
Changed Character builder to use Script instead of a service. (Can now
be modified while server is running)
Fixed Windu's Guile script
Added Jedi Master Cloak custom template
Added Radial options for hood up/down for JMC
Fixed 2 piece bonus for JMC
2014-07-26 00:09:06 -07:00
Treeku ffc2fbcd6d Merge pull request #1055 from Obique/master
Fixed Resource and Survey Services; Changed ObjectService
2014-07-26 07:34:23 +01:00
Waverunner 521b13f226 Merge pull request #1062 from tacef/master
Fixed KBT#110
2014-07-26 00:38:54 -04:00
tacef b5130ccea8 Fixed KBT#110
Guild is now removed upon deletion of the guildleader
Added Populated the Mos Eisley Starport (Still need to change npcs to
the correct types)
2014-07-25 23:14:03 +02:00
Josh-Larson bfdec9799b Changed resource loading from a text file to a script 2014-07-20 19:09:59 -05:00
Josh-Larson e3ff82af66 Changed ObjectService by adding optimization for generateObjectID() 2014-07-20 16:52:46 -05:00
tacef 79c54efd3f Fixed Mistake from Previous commit 2014-07-20 10:23:07 +02:00
tacef e4705ff248 Changed Anchorhead static spawns to use mobiletemplates
Added Various NPC's for Anchorhead static spawns
2014-07-20 10:22:09 +02:00
Josh-Larson 6eaf68026f Merge branch 'master' of https://github.com/Obique/NGECore2 2014-07-19 18:59:07 -05:00
Josh-Larson 5e528560c6 Fixed resource and survey system 2014-07-19 15:49:04 -05:00
Waverunner 2c531c0959 Changed trading so it's more responsive
Will need to refactor how most of this stuff is done, it's pretty ugly
atm. For now I changed so the trading maps will only store the object
ID's, this way we don't have the objects not being traded (since they
aren't initialized)
2014-07-19 12:55:04 -04:00
Josh-Larson e06460b055 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-07-16 19:06:16 -05:00
Waverunner b0d16f92cd Added teleport admin/GM commands
Commands added:
/teleport
/teleporttarget
/telportto
2014-07-16 15:11:37 -04:00
Josh-Larson 6b0201b464 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-07-16 10:48:36 -05:00
Waverunner d0ae4e81f0 Fixed getObjectByFirstName to no longer be case-sensitive - broke it by mistake :(
This fixes all chat related problems (/tells, guildchat, groupchat, chat
rooms)
2014-07-16 11:00:16 -04:00
Waverunner be94ee3784 Fixed some problems where LookAtTarget and IntendedTarget deltas could have been sent multiple times resulting in a crash 2014-07-16 09:54:38 -04:00
Josh-Larson 4131b1f6af Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-07-15 20:51:09 -05:00
Waverunner 20da6c69e0 Fixed null errors associated when you stop watching an entertainer or go out of range 2014-07-15 14:28:28 -04:00
Waverunner 7a872abf83 Changed setMoodAnimation to no longer send delta temporarily
Packet captures logs on the Test Center show multiple times that the
moodAnimation delta is being sent more than once (sometimes 5+ times for
the same objId) - disabled for now to see what happens.
2014-07-15 11:53:32 -04:00
Waverunner ba5ae88215 part of previous commit
forgot to remove a debug print
2014-07-15 10:20:08 -04:00
Waverunner a4f8c8b98a Changed getObjectByFirstName to check the sql datatable instead of the SWGODB
Added a null/empty name check for players logging in - this will prevent
people who have not been saved to the database correctly from logging in
(thus this fixes the strange name problems)
2014-07-15 10:17:15 -04:00
Waverunner 89f567b234 Merge pull request #1036 from zingzing175/master
Fixed Mobile Templates to use conversations
2014-07-15 08:58:49 -04:00
Zing 3f1c70a131 Fixed Mobile Templates to use conversations
Created Rebel Recruiter and Imperial Recruiters mobile templates.
Changed recruiter static spawns to use Mobile Template
Fixed correct cell for rebel recruiter in Anchorhead
2014-07-15 00:03:58 -07:00
Treeku 7290f02174 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-07-15 06:37:48 +01:00
Treeku 27371a6a4b Read more...
- Fixed issue where player's building was manipulated instead of the
player themself.
2014-07-15 06:22:35 +01:00
Treeku 7e1d0b99a9 Fixed warnings 2014-07-15 06:16:26 +01:00
Waverunner 851d0fd223 part of previous commit 2014-07-14 10:33:32 -04:00
Waverunner 85369cd938 Added missing flip in ErrorMessage packet, Added null session checks before attempting to login players
This commit should also fix the never-ending "Connecting to Galaxy..."
loop. It should also be noted that for some reason any ErrorMessage
packet sent before a player is logged in always says that the "Login
Server is unavailable at this time".
2014-07-14 10:24:29 -04:00
Ziggeh 93f99d981c Added a basic combat data recorder 2014-07-14 09:19:35 +02:00
Waverunner 5daf46f773 Added null client check before sending radials. 2014-07-14 01:00:08 -04:00
Treeku 9396f65caa Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-07-14 04:13:31 +01:00
Treeku ec55f0c33e Added duplicateId debugging 2014-07-14 04:12:53 +01:00
Treeku 737857db20 Fixed not being able to level at all with frog. 2014-07-13 23:41:01 +01:00
Treeku a7d354fbe0 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-07-13 22:56:58 +01:00
Treeku 042ccaebe9 Changed frogs to only allow you to grant 90 once 2014-07-13 22:56:30 +01:00
Treeku 5ca6f4ecd6 Fixed guilds being requested for invalid targets 2014-07-13 22:31:34 +01:00
Treeku ca787f7a50 Fixed issue with badly configured weapons breaking 2014-07-13 22:17:07 +01:00
Treeku e97411eaac Fixed unlikely but potential object error 2014-07-13 22:16:22 +01:00
Treeku 01ee9addd3 Added a debug check for potential player error 2014-07-13 22:15:40 +01:00
Josh-Larson 5701c9e770 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-07-13 14:12:46 -05:00
Waverunner 5321b916ea Fixed Null Planet error from MissionObject 2014-07-13 14:57:05 -04:00
Waverunner 02d03e2caa Added a frog building outside of Mos Espa near West Shuttleport - spawns on server startup with 1 frog
Removed frog from Mos Eisley
Added "New Frog" option for GMs on CBT
Added addToFrogAdminList argument for setGodMode for GMs - allows GMs to
put down items inside the frog building (ie more frogs!)
2014-07-13 14:21:17 -04:00
Josh-Larson 354b66fb64 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-07-13 12:43:08 -05:00
Ziggeh 820dc765e8 Removed item colouring for admins 2014-07-13 17:57:39 +02:00
Treeku 41594c169a Minor fix 2014-07-13 11:27:03 +01:00
Treeku 60d3328eaf Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	scripts/commands/transferitemmisc.py
	src/services/command/CommandService.java
2014-07-13 11:23:48 +01:00
Josh-Larson be92ca9201 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/resources/ResourceService.java
2014-07-13 01:46:41 -05:00