Treeku
99448e05a9
Changed weather to update every 15 minutes.
2014-09-03 11:41:36 +01:00
Treeku
ed15803004
Fixed potential time sync issues.
2014-09-03 09:18:55 +01:00
Waverunner
b085fb6009
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-09-02 14:49:32 -04:00
Waverunner
81cd458849
Added quest task completion system messages, Changed auto-advancing to next quest so it's more accurate to how it was in live, Fixed Vourk end conversation messages
2014-09-02 14:49:11 -04:00
Zing
748ee6d03c
Merge pull request #1205 from zingzing175/master
...
Fixed merge error
2014-09-02 00:17:18 -07:00
Zing
bffb3b137b
Fixed merge error
2014-09-02 00:16:24 -07:00
Zing
8f5ea938fa
Merge pull request #9 from ProjectSWGCore/master
...
pull
2014-09-02 00:11:58 -07:00
Zing
e5cc3ece98
Merge remote-tracking branch 'origin/master'
2014-09-02 00:08:05 -07:00
Treeku
3234380be7
Fixed syntax error.
2014-09-02 08:05:21 +01:00
Treeku
3b1882ab64
Fixed syntax error.
2014-09-02 08:04:25 +01:00
Treeku
f7ed85af5a
Cleaned up transferitemarmor.
2014-09-02 07:50:10 +01:00
Treeku
07d0926494
Cleaned up transferitemweapon.
2014-09-02 07:47:36 +01:00
Treeku
03089f1d6f
Cleaned up transferitemmisc.
2014-09-02 07:44:58 +01:00
Treeku
90bd319359
Added isWearingAppearance() check.
2014-09-02 07:43:34 +01:00
Treeku
0592d4679a
Added equipAppearance to equipmentService.
...
Various other improvements for potential issues.
2014-09-02 07:40:22 +01:00
Zing
c235b97633
Merge pull request #1204 from zingzing175/experimental
...
Experimental
2014-09-01 22:49:38 -07:00
Zing
4ce02fe12d
Merge pull request #7 from ProjectSWGCore/master
...
pull
2014-09-01 22:44:27 -07:00
Zing
d29e8379b3
Merge branch 'master' into experimental
2014-09-01 22:39:15 -07:00
Zing
47719ea5ad
Merge branch 'experimental'
...
Conflicts:
src/services/command/CommandService.java
merge conflict
2014-09-01 22:35:38 -07:00
Zing
65d48d9a42
Merge pull request #1202 from zingzing175/master
...
Fixed Appearance Item Client Crash. See notes
2014-09-01 22:24:40 -07:00
Zing
24da9f9f07
Fixed Appearance Item Crash. See notes
...
Currently multiple items can be assigned to the appearance item tab when
radial then equip appearance.
2014-09-01 18:14:34 -07:00
Waverunner
93c54874ba
Fixed unknown Quest CRC error from prior commit
2014-09-01 16:45:49 -04:00
Waverunner
6e6221c771
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-09-01 16:27:00 -04:00
Waverunner
5026b9ee92
Added item count for retrieve tasks, Fixed wrong opcode for QuestAccept packet, Changed name of a couple methods in QuestService
2014-09-01 16:25:02 -04:00
Zing
ec1731e32e
Merge pull request #6 from ProjectSWGCore/master
...
Fixed cooldown issue potentially blocking commands
2014-09-01 12:10:07 -07:00
Treeku
0666a5f727
Fixed cooldown issue potentially blocking commands
...
Any object that inherits TangibleObject and has commands utilized on it will need to make sure their initAfterDBLoad() calls super.initAfterDBLoad().
Fixes:
java.lang.NullPointerException
at resources.objects.tangible.TangibleObject.hasCooldown(TangibleObject.java:626)
at services.command.CommandService.callCommand(CommandService.java:95)
at services.command.CommandService$1.handlePacket(CommandService.java:1011)
at engine.resources.service.NetworkDispatch$1.run(NetworkDispatch.java:202)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at java.lang.Thread.run(Unknown Source)
2014-09-01 20:08:33 +01:00
Zing
fdbde00ee4
Merge pull request #5 from ProjectSWGCore/master
...
pull
2014-09-01 11:49:58 -07:00
Treeku
b0ada28769
Fixed potential client null with appearance items.
2014-09-01 19:46:29 +01:00
Treeku
c32f2980dc
Fixed potential client null with appearance items.
2014-09-01 19:44:43 +01:00
Treeku
e770daeae8
Fixed a crash when removing.objects from SWGLists.
2014-09-01 19:26:08 +01:00
Treeku
12504fe320
Fixed issue where NPC weapon was equipped wrongly.
2014-09-01 02:19:12 +01:00
Zing
837723a55e
Merge pull request #4 from ProjectSWGCore/master
...
pull
2014-08-30 07:58:17 -07:00
Ziggeh
4b03a7c34a
Found an unknown in WEAO03
2014-08-28 16:43:10 +02:00
Treeku
ea417cb7a5
Cleaned up Buff object
2014-08-28 07:36:33 +01:00
Treeku
5b280731c2
Fixed TangibleObject functions in CreatureObject
2014-08-28 05:40:46 +01:00
Waverunner
31a13ca32c
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-08-27 20:25:03 -04:00
Waverunner
5cd90a4cec
Added "Bib's Offer" Quest
2014-08-27 20:24:44 -04:00
Ziggeh
03da184111
Removed duplicate method from CreatureObject
2014-08-27 15:11:12 +02:00
Waverunner
3cad7bf212
Fixed waypoint not being destroyed for quests
2014-08-26 16:16:52 -04:00
Waverunner
e7fa4f76eb
Added complete_quest and reward task type handling, Changed task type to be split when quest loads instead of activating next task, Added getInventory method to CreatureObject, Added getQuestRewardTemplate to QuestService
2014-08-26 15:14:26 -04:00
Waverunner
9696bbd831
Merge branch 'feature/quests-tasks-and-cmds'
2014-08-26 12:46:26 -04:00
Waverunner
274e6a9926
Fixed some playerobject deltas not being sent correctly, Added quest acceptance window, Added /abadonquest, Fixed a few statement errors preventing zone in via character creation
2014-08-26 12:46:18 -04:00
Waverunner
7a891289db
Fixed odb home directory error
2014-08-26 12:46:17 -04:00
Waverunner
16b9cafae3
Added handling for messagebox quest task types
2014-08-26 12:46:17 -04:00
Ziggeh
d5d1443d71
Fixed LoginService PSQL nullpointers
2014-08-26 16:23:25 +02:00
Treeku
e17b04a03c
Merge pull request #1198 from ProjectSWGCore/CombatCommandRefactor
...
Combat command refactor preparation
2014-08-26 00:37:19 +01:00
Treeku
3fd74bf730
Minor changes
2014-08-26 00:33:20 +01:00
Treeku
2a0eff8163
Re-added reusableIdODB to NGECore.java
2014-08-25 23:53:53 +01:00
Treeku
e30df01657
Merge remote-tracking branch 'origin/CombatCommandRefactor' into CombatCommandRefactor2
...
Conflicts:
src/services/ai/AIActor.java
2014-08-25 23:31:16 +01:00
Treeku
cdcfc98d1a
Reverted NGECore.java temporarily
2014-08-25 23:05:28 +01:00
Treeku