projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-28 23:15:53 -04:00
Code Issues Projects Releases Wiki Activity
3,178 Commits 11 Branches 4 Tags
dd010b87787fef4410bc33db37d29ccbfc764e4f
Commit Graph
52 Commits
Author SHA1 Message Date
Treeku a992c6feae Merge pull request #999 from Socome/master 
Added most of the vehicle_deeds*
 2014-07-13 08:25:55 +01:00
Bronco69 13f7108d62 Added some more house deeds 2014-07-09 03:37:16 +02:00
Freddiec a57f70dd84 Added most of the vehicle_deeds 2014-07-08 16:10:08 -05:00
Freddiec 0400679ce0 [Added] Vehicles, TCG and normal ones 2014-07-06 21:03:08 -05:00
Freddiec 81891f3649 [Refactored] Tantive Landspeeder 2014-07-06 14:21:13 -05:00
CharonInferar 0985451d7d Fix for #958, #959 
- Added a way to obtain a pet without BEing
- Attempted to figure out how to bring up the pet tool bar
 2014-07-05 18:10:39 +02:00
Zing 6f7744845b Added Imperial Rank reward setup 
Added Imperial Spec Ops Armor (need to find a way to FORCE primary
color, it is only allowed to be white. Secondary color can be changed to
black.)
Added Imperial Command BARC
Added Factional Weapons
Added Painting
Added Nova Necklace and Colonel Ring
Changed Factional Recruiter script to allow Rewards.
Added Imperial Comm Link (Does not call a pet)
 2014-06-30 22:02:49 -07:00
Zing be9650db6b Fixed a few rebel rank reward items 
Rebel recruiter rewards can now be called by conversing with the
recruiter again.
Exceptional pistol is now deposited in inventory
Binocular buff now adds to player
Rebel Command Barc now generates correct vehicle
 2014-06-29 20:47:13 -07:00
Ziggeh 5d3b6167f1 Added Deed for Flashspeeder 2014-06-29 22:24:01 +02:00
Ziggeh f69f1b4c9b Fixed Deed for BARC Speeder 2014-06-29 20:45:34 +02:00
Ziggeh e48749eae1 Added Deed for Jetpack 2014-06-29 20:41:09 +02:00
CharonInferar b563e67186 Master Merge 2014-06-29 17:04:56 +02:00
CharonInferar 0e33ad7c22 Added 2 Pets for AI Tests 
- Added Follow State to AI
- Pets get attacked by enemies and do attack damaging enemies
- Some QA fixes
 2014-06-29 16:51:35 +02:00
Zing 9d0bf56efe Rebel rank reward system 2014-06-28 20:23:39 -07:00
Zing 47d6c7b86d Cleaned up more loot. Stap Vehicle reward also grants working deed. 2014-06-04 21:19:38 -07:00
Freddiec 36a947b369 Update landspeeder_tantive4_deed.py 2014-04-30 22:20:34 -05:00
CharonInferar 717f1951f0 Reconstruction of classes 2014-04-30 21:48:07 +02:00
CharonInferar 4f2b50fa97 merge conflict 2014-04-30 19:58:18 +02: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 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
tacef 3e5e748d6b Continued Work on Playerhouse deed 
Altered Objectservice again to support storyteller house deeds
 2014-04-26 15:19:44 +02:00
tacef a96352df9b Naboo House Deed's added 
Also fixed typos corellia house deed's
 2014-04-26 09:27:31 +02: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
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
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
tacef 09eeeb5382 Added more Houses again 2014-04-20 07:39:43 +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
tacef 4f2ffc228f Added more Houses 
All small corellian houses added and buildable
 2014-04-19 08:28:06 +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
Freddiec c58d66d21a Added: Tantive Speeder and Barc Speeder 
For testing
 2014-04-13 20:44:41 -05:00
Treeku 6d38e2badc Tidied radials 2014-04-13 21:46:51 +01:00
Seefo 1b1294136a Fixed a bunch of vehicle bugs - will probably change the way vehicles are being handled soon to account for other vehicle templates 2014-04-13 13:37:54 -04:00
CharonInferar fa00c85290 Swoop is mountable for further tests 2014-04-13 03:50:45 +02:00
CharonInferar 9f72afee01 first work on swoop deed 2014-04-13 02:22:45 +02:00
CharonInferar 4df7274ac9 Structure terminal work 
Creation of player_house_deed class
terminal menus made
py scripts arranged
 2014-04-12 21:52:07 +02:00
CharonInferar a1370a9b60 Harvesters introduced 
Working harvesters and generators
Big update
 2014-04-11 02:25:07 +02:00
Seefo 46c2c1bf2c Preliminary housing 2014-04-08 23:47:59 -04:00
Treeku c252f9f1e3 Fixed swoop datapad error 2013-12-16 19:15:17 +00:00
Treeku b597873b51 Swoop () fix, deed uses generateVehicle radial 2013-12-16 18:56:58 +00:00
Treeku d7d2f327a5 Fixed lifeday gifts, swoop deed, inspire, +fixme 2013-12-16 13:41:47 +00:00
Treeku 8218f90777 Minor swoop fixes 2013-12-16 10:13:50 +00:00