 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 |
|
|
Treeku
|
b6184fb05a
|
Lifeday gifts and collections
|
2013-12-15 01:41:11 +00:00 |
|
|
Light2
|
5fd06f87c1
|
added missing templates
|
2013-12-14 21:45:24 +01:00 |
|
|
Light2
|
8f14f4e78a
|
Added serverside templates
|
2013-07-08 15:03:08 +02:00 |
|