projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity
1,799 Commits 11 Branches 4 Tags
6404f3144713ebdd57fddde6d37f2d3aa70cce08
Commit Graph
199 Commits
Author SHA1 Message Date
Treeku 464c10ddd7 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 17:37:43 +01:00
Treeku 0c7b11068a Fixed some vehicles issues 2014-05-03 17:12:24 +01:00
CharonInferar 05034b4d83 group spawn distances added 
Force sensitive groups now spawn at a distance to each other in random
group member numbers.
Loot added to FSs
 2014-05-03 16:31:04 +02:00
Treeku 0a4001d504 Merge pull request #571 from tacef/master 
Added NPC scripts( No conversations yet)
 2014-05-02 22:01:08 +01:00
Treeku 48ec7c46ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 16:30:46 +01:00
tacef 7043f6a159 Updated NPC Scripts with conversations 2014-05-01 19:38:12 +02:00
tacef e111724115 Added NPC scripts( No conversations yet) 2014-05-01 18:25:39 +02:00
Freddiec 36a947b369 Update landspeeder_tantive4_deed.py 2014-04-30 22:20:34 -05:00
Waverunner fe2c9a83a5 Merge pull request #567 from tacef/master 
Updated Terminal scripts to use STF Strings
 2014-04-30 23:09:16 -04:00
tacef 29a88981e0 Updated Terminal scripts to use STF Strings 2014-05-01 04:27:25 +02:00
Treeku 5b5ebaf11c Vehicles now have ranged gb buffs 2014-04-30 23:49:55 +01:00
CharonInferar 81aa0bb850 Merge pull request #565 from tacef/master 
Added Scripts for imperial and Rebel recruiter NPC's
 2014-04-30 22:09:07 +02:00
tacef 091d540ae8 Added Rebel Recruiter script 
Added Rebelrecruiter to mos eisley cantina for testing reasons
 2014-04-30 22:05:59 +02:00
CharonInferar 717f1951f0 Reconstruction of classes 2014-04-30 21:48:07 +02:00
tacef 8818a821d6 Added Imperial Recruiter scripts 
Also added 1 recruiter to mos eisley for testing purpose
 2014-04-30 21:46:25 +02:00
CharonInferar 4f2b50fa97 merge conflict 2014-04-30 19:58:18 +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
CharonInferar bec401c57b continued sandbox city, public structure problem 2014-04-28 22:52:04 +02: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