Commit Graph
1255 Commits
Author SHA1 Message Date
Light2 b7bcf89361 Fixed issue where non combat commands would be created as a combat command 2014-04-12 21:52:10 +02:00
Light2 cc45a337bc more cleanup + fixes
Harvesters and house terminal work now
2014-04-12 21:52:09 +02:00
Light2 5594515cb4 Cleanup + persistence fix 2014-04-12 21:52:09 +02:00
Light2 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
CharonInferar 85391d665d Merge remote-tracking branch 'upstream/master' 2014-04-12 02:41:31 +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
Waverunner 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
Waverunner 8c76695a9f Added chat channels for all planets (system and planetary chat) 2014-04-11 02:25:07 +02:00
Seefo beeada3e87 Fixed an issue where killing an NPC did not set you as the killer object 2014-04-11 02:25:06 +02:00
Waverunner a676fbf63b Fixed null error on startup 2014-04-11 02:25:05 +02:00
Waverunner 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
Waverunner 3ccbfcc3c9 Added SWG, Server, and other parent channels 2014-04-10 20:03:48 -04:00
Seefo be67ca3c45 Merge pull request #409 from CharonInferar/Harvesters
Harvesters and generators added
2014-04-10 19:58:16 -04:00
CharonInferar 646476c17d Harvesters introduced
Working harvesters and generators
Big update
2014-04-11 01:48:27 +02:00
Waverunner f56e9a594d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-10 18:13:52 -04:00
Waverunner f7bac13377 Added chat channels for all planets (system and planetary chat) 2014-04-10 18:13:45 -04:00
Seefo 0eab2ff8c9 Fixed an issue where killing an NPC did not set you as the killer object 2014-04-10 17:38:37 -04:00
Waverunner e23fd23c2a Fixed null error on startup 2014-04-10 15:32:45 -04:00
Waverunner b8b33a5019 Refactored ChatRoom to store Strings for lists instead of CreatureObject 2014-04-10 14:45:00 -04:00
Seefo 6374f9d5b8 Merge pull request #406 from CharonInferar/LootSystem
Loot system
2014-04-10 13:18:36 -04:00
CharonInferar ebe705f338 Merge remote-tracking branch 'origin/master' into LootSystem 2014-04-10 18:51:02 +02:00
CharonInferar 951fbb1953 Merge remote-tracking branch 'upstream/master' 2014-04-10 18:46:58 +02:00
CharonInferar 20de91205b More cleanup 2014-04-10 17:56:02 +02:00
CharonInferar 2e21b1fb71 Clean up
Cleaned up classes
Moved loot radial to death state
2014-04-10 17:49:47 +02:00
CharonInferar 4bb055ca19 Rare loot system stage added
Rare loot system stage in effect for every loot session.
Added legendary,exceptional,rare loot chests
2014-04-10 17:04:52 +02:00
Treeku 0023848113 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-10 15:55:43 +01:00
Treeku 97df8d8f5f Commands checked if they are combat cmds 2014-04-10 15:54:49 +01:00
Ziggeh 8afa97ff05 Merge pull request #405 from DAK-/patch-1
Swapped correct Dantooine travel point names.
2014-04-10 13:47:09 +02:00
DAK- e4b07bd51b Swapped correct Dantooine travel point names.
Imperial / Mining Outpost(s) travel point names on Dantooine were swapped - now correct.
2014-04-10 06:39:52 -05:00
Treeku e91362a12f Fixed most warnings 2014-04-10 11:52:09 +01:00
Treeku 62fea5c7cc Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-10 10:22:07 +01:00
Treeku 351910c04a Various command bugfixes 2014-04-10 10:18:20 +01:00
Treeku ce8bb06629 Removed options.cfg from gitignore
If this is removed, then people don't download it on their first clone of the core.

The best option is to either not modify it, uncheck it before committing things or add to the local ignore.
2014-04-10 09:16:55 +01:00
CharonInferar 221f9a93fc Loot radial and power crystal items
Connected loot radial to corpse. Made powercrystal scripts.
Allowed the mobile scripts to drop loot now.
2014-04-10 04:22:54 +02:00
Seefo 38283f3351 Added house radials and fixed a lot calculation mistake 2014-04-09 21:23:12 -04:00
Seefo 68d5acb687 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-09 19:53:24 -04:00
Seefo 70b7507bb0 Added /movefurniture & /rotatefurniture, see ext.
The permission system thing I'm doing needs to be adjusted to the
Container permission system in the Engine.

To Light:  Please contact me in regards to this
2014-04-09 19:53:11 -04:00
Waverunner 931404bf3f Organized chat packets, disabled chat channels temporarily 2014-04-09 18:50:14 -04:00
CharonInferar d776b52292 restored loot NGECore and Devservice 2014-04-10 00:46:38 +02:00
CharonInferar b12e47ad3a merge conflict resolve 2014-04-10 00:41:17 +02:00
CharonInferar abe8d6475f Merge remote-tracking branch 'origin/master' into LootSystem
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
2014-04-10 00:38:13 +02:00
CharonInferar 80066d910d Merge remote-tracking branch 'upstream/master' 2014-04-10 00:03:12 +02:00
Seefo 399cf7a535 Fixed combat commands and added a better check for combat commands 2014-04-09 16:32:15 -04:00