projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-15 00:07:39 -04:00
Code Issues Projects Releases Wiki Activity
1,711 Commits 11 Branches 4 Tags
43d1bd5ea4d0b882d5e6a987ec63dc714ccfeeee
Commit Graph
184 Commits
Author SHA1 Message Date
CharonInferar 1c14d7a702 Random stat jewelry added, loot service further debugged 
Added stat jewelry
 2014-05-01 21:25:41 +02:00
CharonInferar 87f10370f0 Added most droppable armor pieces 2014-05-01 05:12:05 +02:00
Waverunner ea9a1fdd82 Added setting of player bounties 
Mission for bounties still needs to be ironed out so you won't see them
in the bounty mission terminal, however you can now set bounties for
players.
 2014-04-29 17:49:03 -04:00
Treeku 2de5cbe362 Static object and doid fixes 2014-04-29 19:41:05 +01:00
Treeku 3368682443 Static objects now use doids 2014-04-29 08:36:44 +01:00
Treeku af64aae9f1 Fixed merge clashes 2014-04-29 05:33:16 +01:00
Treeku 02ff93312e Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	scripts/houses/player_house_corellia_large_style_01.py
	scripts/houses/player_house_corellia_large_style_02.py
	src/resources/objects/tangible/Deed.java
	src/resources/objects/tangible/Harvester_Deed.java
	src/resources/objects/tangible/Player_House_Deed.java
	src/services/PlayerService.java
	src/services/object/ObjectService.java
 2014-04-29 05:04:23 +01:00
Treeku 0364cad779 Added all (findable) junk dealer types 2014-04-29 02:54:59 +01:00
Waverunner b0e2a490f6 Changes to MissionObjective, started working on player bounties 2014-04-28 17:37:23 -04:00
Treeku 9fc30d10c4 Removed DeedObject, made buildings simpler 2014-04-28 22:07:32 +01:00
tacef 114bcd85e5 Added more House deeds 
Also fixed structureterminal positions in Cityhalls. (need testing)
 2014-04-26 20:10:11 +02:00
CharonInferar 25de95b310 Merge pull request #533 from tacef/master 
Continued Work on Playerhouse deed
 2014-04-26 15:42:45 +02:00
tacef 3e5e748d6b Continued Work on Playerhouse deed 
Altered Objectservice again to support storyteller house deeds
 2014-04-26 15:19:44 +02:00
CharonInferar 73e2c5deae Merge pull request #532 from tacef/master 
Naboo House Deed's added (need testing)
 2014-04-26 14:17:16 +02:00
tacef a96352df9b Naboo House Deed's added 
Also fixed typos corellia house deed's
 2014-04-26 09:27:31 +02:00
Treeku 632d157074 Merge pull request #524 from tacef/master 
Continued work on Playerhouse deeds
 2014-04-25 21:18:00 +01:00
tacef 061adee910 Continued work on Playerhouse deeds 
Added some more houses(need more testing when elevators work)
Also altered objectservice to work with tcg houses
 2014-04-25 17:42:05 +02:00
Treeku 84f266f49b Merge pull request #520 from Mesagoppinmypants/patch-37 
Added Loot to Imperial Storm Commando
 2014-04-25 12:10:42 +01:00
Treeku 48d029e7cf Merge pull request #487 from Mesagoppinmypants/patch-35 
Updated Light Jedi Council Robe
 2014-04-25 12:09:27 +01:00
Treeku 593a138079 Merge pull request #486 from Mesagoppinmypants/patch-34 
Updated Dark Jedi Council Robe
 2014-04-25 12:06:44 +01:00
Mesagoppinmypants 061787e2c6 Added Loot to Imperial Storm Commando 2014-04-24 20:55:11 -04:00
LordAlfonso e4eec8921c Merge remote-tracking branch 'upstream/master' 2014-04-24 23:02:48 +02:00
CharonInferar f810786e2b Merge remote-tracking branch 'origin/master' into LootDrops 2014-04-24 14:11:29 +02:00
CharonInferar 5987b86a3d Updated Housing service 
Housing service detects if new citizen builds structure
and adds him as citizen to the city
 2014-04-24 14:10:46 +02:00
CharonInferar 83ae55ec7c Worked on City Maintenance Console 
Implementation of SUI windows and menus
 2014-04-24 14:10:45 +02:00
CharonInferar 8476bb36ee Merge remote-tracking branch 'origin/master' into LootDrops 2014-04-24 14:09:03 +02:00
LordAlfonso 3abe70681c Added - Rancor, NS Slave 2014-04-24 00:13:02 +02:00
CharonInferar 627ffdedf8 merge conflict fix for added houses 2014-04-23 21:57:20 +02:00
tacef c98c220979 Fixed Cityhall deeds 
Cityhall deeds are more accurate with BMR
Cityhall deeds aren´t deducting lots anymore
Fixed Tatooine Cityhall Cityterminal position
 2014-04-23 19:24:15 +02:00
Seefo cb162badd2 Merge pull request #503 from tacef/master 
Continued Work on City Hall deeds
 2014-04-23 12:23:20 -04:00
Seefo 064e733cba Fixed vehicle passenger stuff 2014-04-23 00:11:26 -04:00
tacef f33429871f Finished Cityhall's 
Cityhalls finished and placeable with all terminals.
 2014-04-22 12:45:31 +02:00
tacefandCharonInferar d0e8c9885b Added more Houses, reed description 
Added Guildhalls
Started preliminary City hall for testing
Altered Objectservice to work with guild and city deeds
Altered SUI Service to support the new folderstructure for structures
and harvesters
Fixed Structureterminal Radial
 2014-04-21 22:59:14 +02:00
tacefandCharonInferar ee66912e8c Added more Houses 
Added large, medium and small corellian houses
Added large and medium generic houses
Fixed old Houses to be more accurate to how it was
Fixed DevService and removed unneeded houses(only need 1 for testing)
 2014-04-21 22:59:09 +02:00
tacef 2355215567 Added more Houses, reed description 
Added Guildhalls
Started preliminary City hall for testing
Altered Objectservice to work with guild and city deeds
Altered SUI Service to support the new folderstructure for structures
and harvesters
Fixed Structureterminal Radial
 2014-04-21 22:45:58 +02:00
tacef c234c81af1 Added more Houses 
Added large, medium and small corellian houses
Added large and medium generic houses
Fixed old Houses to be more accurate to how it was
Fixed DevService and removed unneeded houses(only need 1 for testing)
 2014-04-20 22:00:25 +02:00
Mesagoppinmypants f280459c55 Updated Light Jedi Council Robe 2014-04-20 10:58:02 -04:00
Mesagoppinmypants 01fb25db36 Updated Dark Jedi Council Robe 2014-04-20 10:49:48 -04:00
tacef 09eeeb5382 Added more Houses again 2014-04-20 07:39:43 +02:00
Ziggeh 021d8becc9 Merge pull request #481 from Undercova/master 
all Heroic jewelry added
 2014-04-20 01:36:12 +02:00
Bronco69 81e953a2dd Fix of skill/stats in heroic sets 2014-04-19 20:44:51 +02:00
CharonInferar 354b5e9def Merge pull request #474 from tacef/master 
Added Small Generic House Style 01 Floorplan 02
 2014-04-19 16:36:10 +02:00
Undercova fdfd077958 Merge pull request #2 from ProjectSWGCore/master 
Update my branch
 2014-04-19 13:21:24 +02:00
Bronco69 55a3350f34 Bonus sets finished 
BH / Co / Jedi / Medic / Officer / Smuggler / Spy
 2014-04-19 12:22:03 +02:00
tacef 4f2ffc228f Added more Houses 
All small corellian houses added and buildable
 2014-04-19 08:28:06 +02:00
CharonInferar 670a2d57a2 Loot added 
added loot
 2014-04-19 01:51:42 +02: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
Treeku f58b7b6a5b Overhauled Mounts (still buggy) 2014-04-18 19:09:45 +01:00
tacef 02d1b6a40c Added Small Generic House Style 01 Floorplan 02 
Also fixed Generic House Small Style 02 to be placeable at all
 2014-04-18 19:37:25 +02:00
tacef 9975656a97 Added Generic House Small Style 02 2014-04-18 18:16:36 +02:00