projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-02 17:12:58 -04:00
Code Issues Projects Releases Wiki Activity
1,530 Commits 11 Branches 4 Tags
78deb6ee8ce88567445f2c4c8fa53403c73b9d8f
Commit Graph
1530 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tacef 78deb6ee8c Fixed Typo in House deeds 2014-04-23 20:49:10 +02:00
tacef 76b3674182 Updated House Templates 
addBuildingSign is now in the correct position, needs testing.
 2014-04-23 20:18:16 +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
Waverunner 8ee82f7a75 canEquip now accounts for multiple profs in class_required 2014-04-22 18:35:58 -04:00
Waverunner 859c71e34f Merge pull request #482 from Ziggeh/master 
Some combat stuff
 2014-04-22 18:09:39 -04:00
tacef 5d716b89ad Fixed Typo in Corellia Cityhall 2014-04-22 12:47:54 +02:00
tacef f33429871f Finished Cityhall's 
Cityhalls finished and placeable with all terminals.
 2014-04-22 12:45:31 +02:00
Seefo 6906ef14fd MountService.canMount() now accounts for passenger capacity 2014-04-21 21:00:34 -04:00
CharonInferar aa843a91d3 Merge pull request #495 from tacef/master 
Added more Houses, reed description
 2014-04-21 22:49:38 +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
Ziggeh c95d265df8 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-21 15:58:49 +02:00
Light2 83a62be484 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-21 15:51:54 +02:00
Light2 13b5fe7d95 fixed #483, fixed minor bug in procedural terrain filters 2014-04-21 15:50:45 +02:00
CharonInferar 1f2e21dd7d Merge pull request #490 from tacef/master 
Added more Houses
 2014-04-21 12:25:54 +02:00
CharonInferar 334e3f3972 Merge pull request #492 from CharonInferar/JunkDealerFix 
Junk dealer fix
 2014-04-21 03:32:45 +02:00
CharonInferar 364dba605b Corrected Junk Dealer radial file link after massive folder reorganisation 
radial file link corrected
 2014-04-21 03:31:18 +02:00
CharonInferar 89f627a46c Merge remote-tracking branch 'upstream/master' 2014-04-21 03:24:05 +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
CharonInferar 15a0486dab Merge pull request #485 from tacef/master 
Added more Houses again
 2014-04-20 18:05:44 +02:00
CharonInferar 4073fdaed2 Merge remote-tracking branch 'upstream/master' 2014-04-20 17:02:35 +02:00
tacef 09eeeb5382 Added more Houses again 2014-04-20 07:39:43 +02:00
Ziggeh 63dd5e2459 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-20 01:36:23 +02:00
Ziggeh 021d8becc9 Merge pull request #481 from Undercova/master 
all Heroic jewelry added
 2014-04-20 01:36:12 +02:00
Waverunner ebd1e89970 Merge pull request #469 from Freddiec/master 
Added: Kaadu
 2014-04-19 16:34:17 -04:00
Bronco69 13cf226199 Equipment scripts for bonus sets 2014-04-19 22:07:05 +02:00
Bronco69 81e953a2dd Fix of skill/stats in heroic sets 2014-04-19 20:44:51 +02:00
Waverunner cc8c958e5e Merge pull request #465 from Mesagoppinmypants/patch-33 
Fixed File Name Error
 2014-04-19 14:16:25 -04: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
Ziggeh 9b6127402d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-19 15:15:21 +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
Treeku ed78dd459b Minor changes 2014-04-19 08:57:14 +01:00
Treeku b4a6ac5334 Fixed a chat crash bug 2014-04-19 08:30:12 +01:00
tacef 4f2ffc228f Added more Houses 
All small corellian houses added and buildable
 2014-04-19 08:28:06 +02:00
Treeku b050065649 Languages implemented, added OOB to spatialchat 2014-04-19 03:27:08 +01:00
Treeku 506e1f160e Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-19 00:39:51 +01:00
Treeku 7d40523833 Various vehicle fixes 2014-04-19 00:39:38 +01:00
Waverunner b6158a4014 leaveChatChannel removes from list of players channels 2014-04-18 18:14:59 -04:00
Treeku 65099a4ddf Safety improvement 2014-04-18 22:39:47 +01:00
Treeku 50e88d2300 Cut down a few warnings 2014-04-18 22:38:07 +01:00
CharonInferar be6713f75c Merge remote-tracking branch 'upstream/master' 2014-04-18 22:50:15 +02:00
Treeku bcbcbde34a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
 2014-04-18 21:29:57 +01: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
CharonInferar 89a9494a3b options.cfg set to default values 2014-04-18 21:52:05 +02:00
CharonInferar 814ebe6cf3 Menu functionality improved 
Lootkit implemented
Loot price and further stats considered
 2014-04-18 21:52:04 +02:00
CharonInferar 73a3c98660 Conversation menu improvements 
SUI window functionality
storage of items in collections
 2014-04-18 21:52:03 +02:00
CharonInferar e32cb2da0b Junk Dealer Conversation menu added 2014-04-18 21:52:03 +02:00
CharonInferar ab7f12591d Merge pull request #475 from CharonInferar/JunkDealer 
Junk dealer added
 2014-04-18 21:22:24 +02:00