projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity
2,795 Commits 11 Branches 4 Tags
36908ae9bbc08dd01e7e61b192597dfcb6433683
Commit Graph
2795 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Treeku 36908ae9bb Merge pull request #901 from Mesagoppinmypants/patch-2 
Fixed Dark Fury Band Bonus Set Bug
 2014-06-19 03:15:17 +01:00
Treeku 3dfbd06cbf Merge pull request #903 from Mesagoppinmypants/patch-4 
Fixed Dark Fury Left Bracelet Bonus Set Bug
 2014-06-19 03:14:49 +01:00
Treeku 92b78ec025 Merge pull request #904 from Mesagoppinmypants/patch-5 
Fixed Dark Fury Right Bracelet Bonus Set Bug
 2014-06-19 03:14:38 +01:00
Treeku c20a6a18ff Merge pull request #902 from Mesagoppinmypants/patch-3 
Fixed Dark Fury Necklace Bonus Set Bug
 2014-06-19 03:14:16 +01:00
Treeku 0ef34a7af4 Merge pull request #900 from Mesagoppinmypants/patch-1 
Fixed Dark Fury Ring Bonus Set Bug
 2014-06-19 03:13:58 +01:00
Treeku faeff0e35a Merge pull request #899 from tacef/master 
Started work on Jabba TP locations
 2014-06-19 03:13:10 +01:00
Mesagoppinmypants 4ddea7b533 Fixed Dark Fury Right Bracelet Bonus Set Bug 2014-06-18 21:11:51 -04:00
Mesagoppinmypants 933942cc99 Fixed Dark Fury Left Bracelet Bonus Set Bug 2014-06-18 21:11:08 -04:00
Mesagoppinmypants 2c4719b2a9 Fixed Dark Fury Necklace Bonus Set Bug 2014-06-18 21:10:00 -04:00
Mesagoppinmypants 1ffe568a01 Fixed Dark Fury Band Bonus Set Bug 2014-06-18 21:08:46 -04:00
Mesagoppinmypants b50ecc1511 Fixed Dark Fury Ring Bug 2014-06-18 21:06:55 -04:00
Light2 6c7b80c201 Added city voting update, fixed some city bugs 2014-06-19 02:32:52 +02:00
Light2 5bfe610b40 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-18 23:33:43 +02:00
Light2 8e68c9582a Disabled some console spam 2014-06-18 23:33:17 +02:00
Waverunner c98ab37454 Added null planet check for transferToPlanet, Fixes #898 2014-06-18 17:24:45 -04:00
Light2 4f76d6593b Fixed duplicate id issue(workaround) should fix some of the crashing, disabled vehicles for now(causing crashes), disabled some of the getObject spam 2014-06-18 22:50:48 +02:00
tacef 743d9415b8 Fixed Valarian Soldiers 2014-06-18 22:19:43 +02:00
tacef fa6ee120cf More work on Jabba TP locations 
Populated Valarian camp pt.1
 2014-06-18 21:56:27 +02:00
Light2 e862a86345 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-18 21:05:47 +02:00
Light2 453771fa6d Added duplicate object id detection 2014-06-18 21:04:46 +02:00
tacef 6e9fd6cfe1 Merge pull request #20 from ProjectSWGCore/master 
Fork update
 2014-06-18 20:45:34 +02:00
tacef 6ca8d51be4 Started on Jabba TP locations 
Populated Alkahran camp
 2014-06-18 20:44:29 +02:00
Waverunner ac9d0e41bf Refactored delivery missions to use pre-spawned commoners 
Scripters should change any commoners being spawned to use
core.staticService.spawnCommoner instead of spawnObject (see
mos_eisley.py in static_spawns\tatooine for an example). The
spawnCommoner method will add required attachments and set the proper
options bitmask in order for the missions to function properly.

Note that delivery missions won't work unless you have spawned buildouts
on the planet you are requesting the missions on due to this change.
 2014-06-18 14:00:24 -04:00
Light2 0deed26882 Basic area activity implementation 2014-06-18 19:09:26 +02:00
Light2 7460b4ee6f Fixed disconnecting 2014-06-18 18:36:08 +02:00
Light2 d1ab21f37b Updated engine #2 2014-06-18 16:37:58 +02:00
Light2 80f6ac9dee Updated engine 2014-06-18 16:27:06 +02:00
Treeku f8602b2919 Resolved someone's .gitignore merge clash 2014-06-18 10:44:20 +01:00
Treeku 4e0a283e4d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	scripts/radial/item/collection/loot_collection.py
	src/resources/objects/mission/MissionObject.java
 2014-06-18 10:21:31 +01:00
Treeku 06bc017d03 Merge pull request #894 from tacef/master 
Populated Squill Cave
 2014-06-18 10:16:39 +01:00
Treeku 3ef6358ac4 Fixed objectMutex error with char loading 
This shouldn't happen or be needed to begin with.... but it does.
 2014-06-18 09:28:10 +01:00
Treeku 5ac740dacb Fixed mission issue 2014-06-18 09:22:40 +01:00
Treeku 1d1e6865ac Fixed syntax error 2014-06-18 09:08:11 +01:00
Treeku 39394f8339 Added debug msg to SelectCharacter 2014-06-18 08:57:33 +01:00
Treeku a5933c2db6 Fixed null error when NPCs use combat cmd 2014-06-18 08:56:54 +01:00
Treeku 8fd5a7fbf6 Fixed #895 with zing's fix 2014-06-18 08:55:09 +01:00
Treeku 2c8599ad1d Stopped Expertise IndexOutOfBounds halting function 2014-06-18 08:18:18 +01:00
Treeku 97af15a747 Added try-catches to schedulers to identify errors 2014-06-18 08:06:27 +01:00
Treeku b44ddd3b31 Fixed resourceContainer radial error 2014-06-18 07:22:18 +01:00
Treeku 4775255776 Added getObject debug checks 
Something is very wrong with getObject.  It's returning null even on new
objects that were just added to it and I need to be able to track when
it's null on the TC.
 2014-06-18 06:24:12 +01:00
Treeku 01427322dd Added debug checks for /stand and /stopdance bugs 2014-06-18 04:28:34 +01:00
Treeku 2ea786f34c Fixed mount store null error 2014-06-18 03:06:05 +01:00
Treeku 0748d34dbe Fixed error when NPCs heal 2014-06-18 03:05:13 +01:00
Waverunner 5d3143e68a Fixed inventory transfer bug for junk dealer 2014-06-17 15:59:44 -04:00
tacef ffc58953cb Populated Squill Cave 
Updated Squill scripts to be agressive
 2014-06-17 21:22:20 +02:00
Light2 5d0bf76727 Fixed null pointer 2014-06-17 21:10:07 +02:00
Treeku 786fb69fb1 Fixed potential null error with mission listing 
Experienced on the TC, probably related to the creature object not being
in the object list for some reason
 2014-06-17 18:29:22 +01:00
Treeku e5f78de757 Fixed issue where you could ID non-players 2014-06-17 18:27:01 +01:00
tacef 89919d0040 Merge pull request #19 from ProjectSWGCore/master 
Fork Update
 2014-06-17 18:56:52 +02:00
Treeku 5f6762a9f3 Added temp combat command null check 2014-06-17 17:09:08 +01:00