Commit Graph
31 Commits
Author SHA1 Message Date
Zing 84019e1cc0 Merge pull request #6 from ProjectSWGCore/master
pull
2014-06-28 20:26:24 -07:00
Zing 9d0bf56efe Rebel rank reward system 2014-06-28 20:23:39 -07:00
Treeku 347f2b8a43 Merge pull request #923 from Mesagoppinmypants/patch-20
Entertainer Clicky Now Has a Buff Effect
2014-06-27 13:22:41 +01:00
Treeku c9b346853a Merge pull request #925 from Mesagoppinmypants/patch-22
Medic Clicky Now Has a Buff Effect
2014-06-27 13:22:18 +01:00
Treeku e99d9d7c53 Merge pull request #922 from Mesagoppinmypants/patch-19
Commando Clicky Now Has a Buff Effect
2014-06-21 00:38:13 +01:00
Treeku a68c884c02 Merge pull request #924 from Mesagoppinmypants/patch-21
Jedi Clicky Now Has a Buff Effect
2014-06-21 00:38:00 +01:00
Treeku b8f7d3375b Merge pull request #926 from Mesagoppinmypants/patch-23
Officer Clicky Now Has a Buff Effect
2014-06-21 00:37:48 +01:00
Treeku 2b4d7907a2 Merge pull request #927 from Mesagoppinmypants/patch-24
Smuggler Clicky Now Has a Buff Effect
2014-06-21 00:37:40 +01:00
Mesagoppinmypants 701023ea66 Spy Clicky Now Has Buff Effect 2014-06-20 15:05:01 -04:00
Mesagoppinmypants fc28df0d5d Smuggler Clicky Now Has a Buff Effect 2014-06-20 15:03:39 -04:00
Mesagoppinmypants ad4b2b9406 Officer Clicky Now Has a Buff Effect 2014-06-20 15:00:12 -04:00
Mesagoppinmypants 1262e9304b Medic Clicky Now Has a Buff Effect 2014-06-20 14:58:18 -04:00
Mesagoppinmypants 666aeb617d Jedi Clicky Now Has a Buff Effect 2014-06-20 14:57:04 -04:00
Mesagoppinmypants ea7e242fa7 Entertainer Clicky Now Has a Buff Effect 2014-06-20 14:55:40 -04:00
Mesagoppinmypants c2df2d2566 Commando Clicky Now Has a Buff Effect 2014-06-20 14:54:39 -04:00
Mesagoppinmypants c90b56e748 Bounty Hunter Clicky Now Has Buff Effect 2014-06-19 22:19:49 -04:00
Iosnowore Kun f31c058122 Started the Entertainer Roadmap Rewards 2014-06-06 21:56:35 -04:00
Iosnowore Kun 9e70fef33e Scripted More Roadmap Rewards 2014-06-05 17:49:30 -04:00
Mesagoppinmypants a23def1a29 Added Officer Clicky Roadmap Reward 2014-06-04 19:00:51 -04:00
Treeku 1711fb2951 Merge pull request #784 from Mesagoppinmypants/patch-104
Added Medic Clicky
2014-06-04 05:20:37 +01:00
Mesagoppinmypants 881c24cc4d Added Smuggler Clicky 2014-06-03 19:35:10 -04:00
Mesagoppinmypants 04f505f87d Added Medic Clicky 2014-06-03 19:34:00 -04:00
Mesagoppinmypants b438d6948d Added Spy Roadmap Clicky
Added the Spy Clicky Roadmap reward.
2014-06-02 16:31:38 -04:00
Treeku e8a1959f9d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	scripts/radial/vehicle.py
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/SimulationService.java
	src/services/combat/CombatService.java
	src/services/object/ObjectService.java
2014-04-18 21:10:53 +01:00
Bronco69 4522e36821 Added Commando roadmap rewards 2014-04-15 18:10:46 +02:00
Treeku 6d38e2badc Tidied radials 2014-04-13 21:46:51 +01:00
Seefo 515cb92ce7 Added option for buffs on items and wearables 2014-03-31 21:06:43 -04:00
Ziggeh b6f216ca41 Roadmap - Added all Bounty Hunter rewards 2014-03-03 19:20:45 +01:00
Ziggeh 5e555a186e Roadmap - Removed No Trade flag on some items 2014-03-03 19:19:57 +01:00
Ziggeh 274d00516d Roadmap - Added all Jedi rewards 2014-03-02 21:35:05 +01:00
Light2 8f14f4e78a Added serverside templates 2013-07-08 15:03:08 +02:00