projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-11 01:13:05 -04:00
Code Issues Projects Releases Wiki Activity
1,574 Commits 11 Branches 4 Tags
974e1106cbc36dc648ff6d5494b1a71f3f592ee4
Commit Graph
1024 Commits
Author SHA1 Message Date
Treeku 9c8677556b Cleaned some vehicle stuff 2014-04-25 10:51:21 +01:00
Waverunner f712a23452 Fixed #497: Talus Imperial Outpost wrong spawn point 2014-04-24 18:02:10 -04:00
CharonInferar 2e0fcd7ee5 Added another mail 2014-04-24 01:44:51 +02:00
CharonInferar 42724a76d6 Updated Housing service 
Housing service detects if new citizen builds structure
and adds him as citizen to the city
 2014-04-24 01:20:02 +02:00
CharonInferar fbc4ddc85f Merge remote-tracking branch 'origin/master' into PlayerCities 2014-04-23 22:06:21 +02:00
CharonInferar 627ffdedf8 merge conflict fix for added houses 2014-04-23 21:57:20 +02:00
Seefo 8fdad1d4c5 Fixed some vehicle bugs 2014-04-23 15:16:06 -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
CharonInferar 173c7e6674 Continued work on terminal 
Differentiated taxes and ranks
 2014-04-22 19:24:15 +02:00
CharonInferar c02f7d5e86 Worked on City Maintenance Console 
Implementation of SUI windows and menus
 2014-04-22 03:46:51 +02:00
Seefo 6906ef14fd MountService.canMount() now accounts for passenger capacity 2014-04-21 21:00:34 -04:00
CharonInferar 0bc1402e2d Merge remote-tracking branch 'origin/master' into PlayerCities 2014-04-21 23:00:15 +02:00
tacef 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
Light2 34c4dbafda fixed #483, fixed minor bug in procedural terrain filters 2014-04-21 22:59:13 +02:00
tacef 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
CharonInferar 02fafa5e73 Player city service methods added 
added administrative methods
 2014-04-21 22:56:40 +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 f2126e15b5 Player Cities added 
Player City Class created
 2014-04-21 13:24:17 +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
Ziggeh 63dd5e2459 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-20 01:36:23 +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
Ziggeh 9b6127402d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-19 15:15:21 +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
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 69266f2896 Merge remote-tracking branch 'origin/master' into JunkDealer 2014-04-18 21:07:52 +02:00
CharonInferar 4f60260e53 Menu functionality improved 
Lootkit implemented
Loot price and further stats considered
 2014-04-18 20:57:56 +02: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
CharonInferar 2b4527e165 Conversation menu improvements 
SUI window functionality
storage of items in collections
 2014-04-18 04:45:12 +02:00
Levarrishawk d25ac73965 Enabled loading of all Kashyyyk TRNs 
Enabled loading of all kashyyyk terrains by default.   Begun adding
"gate" transportation.
 2014-04-17 22:32:18 -04:00
Ziggeh a65c3d6966 Combat - Added Ranged and Melee Glancing Blow 2014-04-18 01:16:06 +02:00
Waverunner 9252ebaaea Added Enter & Leave Messages for ChatRooms as well as info stats for the 
room
 2014-04-17 16:01:12 -04:00
Ziggeh 7f796d211e Created HitType datatable and removed unused code 2014-04-17 12:47:48 +02:00
Waverunner 8379c2f87b Changed Elemental to Enum 2014-04-16 19:42:49 -04:00
Waverunner 857198f32d Merge pull request #462 from Ziggeh/master 
Weapon particle effects, misc enhancements
 2014-04-16 19:02:10 -04:00