projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-01 16:12:53 -04:00
Code Issues Projects Releases Wiki Activity
1,305 Commits 11 Branches 4 Tags
5ebdfcb1678ac318c00d23886fadfd9bdfdafe7e
Commit Graph
1305 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ziggeh 5ebdfcb167 Misc - Added system messages to Dire Fate 2014-04-14 00:43:28 +02:00
Ziggeh b5ec10f7ef Misc - Added system messages to 2-piece Jedi Bonus 2014-04-14 00:43:07 +02:00
Ziggeh 254c8c6e87 Misc - Added system messages to Heroism 2014-04-14 00:42:22 +02:00
Ziggeh 7472def68a Items - Added Heroism items 
Also added a Flamethrower to the frog since we didn't have one.
 2014-04-14 00:41:41 +02:00
Ziggeh bd8d74d28c Items - Added Dire Fate items 2014-04-13 23:41:47 +02:00
Ziggeh 1fa24af10f Merge remote-tracking branch 'upstream/master' 2014-04-13 19:17:23 +02:00
Ziggeh cbefc25121 Refactored WeaponObject 
The scripting of weapons should be much, much easier now. See the
included examples in DevService.

Attributes such as attack speed and range are now being read/written to
the actual items attributes.
 2014-04-13 19:15:17 +02:00
Ziggeh c45e645a07 Merge pull request #417 from portocol/master 
Added heroic jewelry set bonus scripts
 2014-04-13 17:26:01 +02:00
portocol e827b8fa36 Delete set_bonus_jedi_utility_b.py 2014-04-13 11:18:28 -04:00
portocol f28777421c Delete set_bonus_jedi_utility_b_3.py 2014-04-13 11:17:42 -04:00
Light2 cf9bcf66f9 Fixed vehicles 2014-04-13 17:17:25 +02:00
portocol 62624850ca Delete set_bonus_jedi_utility_b_2.py 2014-04-13 11:17:18 -04:00
portocol 2805c8c653 Delete set_bonus_jedi_utility_b_1.py 2014-04-13 11:16:27 -04:00
CharonInferar 6b4f6e7741 Merge pull request #421 from CharonInferar/vehicles 
Exception handling for Harvester Service future executor handler
 2014-04-13 14:41:10 +02:00
CharonInferar a3d7472197 Exception handling for Harvester Service future executor handler 
This should show any runtime exceptions of the Runnable(), because
something kills the task after some time, probably an exception.
 2014-04-13 14:38:39 +02:00
Treeku 432700ab20 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 13:19:57 +01:00
Treeku b436353904 godLevel is now set and used 2014-04-13 13:17:23 +01:00
Treeku 33614f4c48 Moved factionStatus from CREO to TANO 2014-04-13 11:06:27 +01:00
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
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
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