projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-14 00:02:07 -04:00
Code Issues Projects Releases Wiki Activity
1,241 Commits 11 Branches 4 Tags
e5ed3a356cd693baabb63d14ef78dfdbe842c4e8
Commit Graph
862 Commits
Author SHA1 Message Date
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 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
CharonInferar ebe705f338 Merge remote-tracking branch 'origin/master' into LootSystem 2014-04-10 18:51:02 +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 97df8d8f5f Commands checked if they are combat cmds 2014-04-10 15:54:49 +01: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
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
Seefo 399cf7a535 Fixed combat commands and added a better check for combat commands 2014-04-09 16:32:15 -04:00
CharonInferar 118d622c6d More Junk, Krayt Pearls added 
The System has been more generalized, but also deals with special cases
of Krayt Pearls/Power Crystals.
More itemscripts created
 2014-04-09 21:16:28 +02:00
Seefo bf24229235 Added no-build checks when placing structures 2014-04-09 13:05:36 -04:00
Seefo 8025bc7ad0 Changes to housing, added real player lot count to character sheet 2014-04-09 11:56:56 -04:00
Seefo 46c2c1bf2c Preliminary housing 2014-04-08 23:47:59 -04:00
CharonInferar 4d264f8c8a Refined the loot system 
Added more py scripts for krayt pearls and junk
Made system more flexible
 2014-04-09 04:57:26 +02:00
Waverunner 6e84d13341 Able to create a chat room now 
Work still needs to be done on joining the rooms. However, you can
create custom rooms.
 2014-04-08 19:42:38 -04:00
CharonInferar 5dcd780195 Math change 2014-04-08 22:37:21 +02:00
Seefo f60583dff2 Temporary fix for certain commands being registered as combat commands even though the are not combat commands 2014-04-08 10:30:16 -04:00
CharonInferar 70964ef14a Lootpool scripts added 
Data transfer from py script to java
 2014-04-08 15:39:48 +02:00
Treeku 7eaed057c7 Fixed null exception 2014-04-08 06:16:33 +01:00
Treeku c7ea253620 Equipment cmd checks 2014-04-08 05:58:04 +01:00
Treeku 10e8c40507 checkLOS checks if obj1 is container of obj2 2014-04-08 05:53:01 +01:00
Treeku caca57b9b0 checkLineOfSight now checks if obj is in inventory 2014-04-08 05:42:19 +01:00
Treeku 74af0d5244 Forgot safety check 2014-04-08 05:09:18 +01:00
Treeku 9a18eb1eaa Few command improvements 2014-04-08 05:06:03 +01:00
CharonInferar d848e89edb Script integration 
A few example .py scripts
Improvements on the lootservice design
 2014-04-08 04:08:52 +02:00
CharonInferar 9526eee9d6 Object-orientated approach to storing the loot info 2014-04-08 02:12:36 +02:00
CharonInferar 0eedd5cc5f Merge remote-tracking branch 'origin/master' into LootSystem 2014-04-08 00:00:57 +02:00
CharonInferar ce183ad337 merge conflict resolve 2014-04-07 23:59:42 +02:00
CharonInferar c78b3b553e Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/services/command/BaseSWGCommand.java
	src/services/command/CommandService.java
 2014-04-07 23:57:34 +02:00
CharonInferar 06fe72e647 Implementation of LootService 
First steps
 2014-04-07 23:49:51 +02:00