Commit Graph
1387 Commits
Author SHA1 Message Date
Treeku 187acaf2dc Fixed error in getfriendlist.py 2014-04-13 11:05:39 +01:00
CharonInferar b1f413e382 Merge pull request #420 from CharonInferar/vehicles
Increased TANO persistence version fix
2014-04-13 05:06:50 +02:00
CharonInferar 5331cd67dc Increased TANO persistence version fix 2014-04-13 05:05:18 +02:00
CharonInferar 60fe1284ca Merge pull request #418 from CharonInferar/vehicles
Semi-functional Vehicle added for further testing
2014-04-13 04:02:05 +02:00
CharonInferar fa00c85290 Swoop is mountable for further tests 2014-04-13 03:50:45 +02:00
portocol a207cfc4be Added heroic jewelry set bonus scripts 2014-04-12 21:23:34 -04:00
Treeku b820877607 Moved Empty_Hopper to HarvesterService 2014-04-13 01:39:18 +01:00
CharonInferar 9f72afee01 first work on swoop deed 2014-04-13 02:22:45 +02:00
CharonInferar 3d1e8bd3f5 Merge remote-tracking branch 'upstream/master' 2014-04-13 02:11:17 +02:00
Treeku 60972655dd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/command/CommandService.java
	src/services/object/ObjectService.java
2014-04-13 00:49:58 +01:00
Treeku 03c5201cf4 Command fixes, command removing 2014-04-13 00:29:30 +01:00
Treeku eeb1ea54af Flytext, System, Comms now use ProsePackages 2014-04-13 00:27:02 +01:00
Light2 7e9bb7ede5 Fixed order of item attribute display 2014-04-13 01:21:47 +02:00
Light2 898d3f6ecc fixed npc permission 2014-04-13 00:43:42 +02:00
Light2 83aa0ab2b0 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 00:20:00 +02:00
Light2 5510ace39a fixed #411 2014-04-13 00:19:47 +02:00
Seefo 6f791819e6 Fixed some housing bugs and Tusken Raider mobile template - see extended
Fixed a housing issue where the structure management terminal would be
returned in the item list and could be deleted via the delete all items
radial.

Fixed item list to display proper names of objects.

Fixed the Tusken Raider mobile template to display the proper creature
name and changed their default weapons from an E11 and a T21 to a Tusken
Rifle.
2014-04-12 18:13:11 -04:00
CharonInferar a696aebd1e Harvester cleanup syntax error fixed 2014-04-12 23:10:19 +02:00
CharonInferar ce3735c6c2 Merge pull request #415 from CharonInferar/HarvesterFix
Harvester fix
2014-04-12 22:51:10 +02:00
CharonInferar 228a59d5ae Merge remote-tracking branch 'origin/master' into HarvesterFix 2014-04-12 22:49:10 +02:00
CharonInferar 7acd6bca2b Merge remote-tracking branch 'upstream/master' 2014-04-12 22:48:14 +02:00
CharonInferar 537390832a Harvester cleanup syntax error fixed 2014-04-12 22:44:42 +02:00
Light2andCharonInferar b7bcf89361 Fixed issue where non combat commands would be created as a combat command 2014-04-12 21:52:10 +02:00
Light2andCharonInferar cc45a337bc more cleanup + fixes
Harvesters and house terminal work now
2014-04-12 21:52:09 +02:00
Light2andCharonInferar 5594515cb4 Cleanup + persistence fix 2014-04-12 21:52:09 +02:00
Light2andCharonInferar 1601c214e3 minor changes 2014-04-12 21:52:08 +02:00
CharonInferar 18c184ea79 Cleanup 2014-04-12 21:52:08 +02:00
CharonInferar 81f77b06dd All structure terminal menus and functionalities implemented
Dropped items add nowto the buildings itemlist
Some databse work for permissions
2014-04-12 21:52:07 +02:00
CharonInferar 4df7274ac9 Structure terminal work
Creation of player_house_deed class
terminal menus made
py scripts arranged
2014-04-12 21:52:07 +02:00
Light2 4ae9f292be Fixed issue where non combat commands would be created as a combat command 2014-04-12 21:20:05 +02:00
Light2 e144118364 more cleanup + fixes
Harvesters and house terminal work now
2014-04-12 18:31:37 +02:00
Light2 c5520abff8 Cleanup + persistence fix 2014-04-12 17:19:52 +02:00
Light2 b2edbb2104 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-12 15:23:22 +02:00
Light2 acbc1a7c74 minor changes 2014-04-12 15:23:14 +02:00
CharonInferar b626645e08 Merge pull request #414 from CharonInferar/Housing
Housing
2014-04-12 03:33:53 +02:00
CharonInferar d4d688869c Cleanup 2014-04-12 03:04:17 +02:00
CharonInferar 090a15de84 Merge remote-tracking branch 'origin/master' into Housing 2014-04-12 02:47:01 +02:00
CharonInferar 85391d665d Merge remote-tracking branch 'upstream/master' 2014-04-12 02:41:31 +02:00
CharonInferar 7cd8d8d742 All structure terminal menus and functionalities implemented
Dropped items add nowto the buildings itemlist
Some databse work for permissions
2014-04-12 02:30:17 +02:00
Light2 e5ed3a356c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/main/NGECore.java
2014-04-11 23:53:15 +02:00
Light2 ea8bc53394 Started work on bazaar 2014-04-11 23:47:03 +02:00
Seefo 3ebf1dbf94 Fixed an issue where people who did not get the winning kill... see ext.
Fixed an issue where people who did not get the winning kill of a
creature or were not grouped with the killer of a creature could loot
the corpse of said creature.
2014-04-11 09:20:21 -04:00
CharonInferar 1ab23231f6 Structure terminal work
Creation of player_house_deed class
terminal menus made
py scripts arranged
2014-04-11 04:14:29 +02:00
WaverunnerandCharonInferar 4cb78da62c Added SWG, Server, and other parent channels 2014-04-11 02:25:08 +02:00
CharonInferar a1370a9b60 Harvesters introduced
Working harvesters and generators
Big update
2014-04-11 02:25:07 +02:00
WaverunnerandCharonInferar 8c76695a9f Added chat channels for all planets (system and planetary chat) 2014-04-11 02:25:07 +02:00
SeefoandCharonInferar beeada3e87 Fixed an issue where killing an NPC did not set you as the killer object 2014-04-11 02:25:06 +02:00
WaverunnerandCharonInferar a676fbf63b Fixed null error on startup 2014-04-11 02:25:05 +02:00
WaverunnerandCharonInferar 5854eaea00 Refactored ChatRoom to store Strings for lists instead of CreatureObject 2014-04-11 02:25:05 +02:00
Waverunner dd78e8d415 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-10 20:04:02 -04:00