projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-30 00:15:57 -04:00
Code Issues Projects Releases Wiki Activity
1,711 Commits 11 Branches 4 Tags
43d1bd5ea4d0b882d5e6a987ec63dc714ccfeeee
Commit Graph
814 Commits
Author SHA1 Message Date
CharonInferar 43d1bd5ea4 Attempts to fix loot bugs 2014-05-04 01:31:00 +02:00
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 8fa9be6030 Revert "Temp Fix to Static Spawns" 
This reverts commit bfa32b533f.
 2014-04-29 18:33:00 +01:00
Levarrishawk bfa32b533f Temp Fix to Static Spawns 
Temporary fix for the handling of static spawned objects.
 2014-04-29 09:27:57 -04:00
Levarrishawk 3933fe8a65 Misc Changes to Kaas 
Nothing to see here, move along.
 2014-04-29 04:19:35 -04: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 73f8ad85bc useObject adds the UseTarget 2014-04-29 04:49:42 +01:00
Treeku de296b4db2 More removed DeedObject stuff 
Also changed attachments to use ids instead of objects.  Best to use Ids
otherwise issues such as objects not deleting successfully occur, if not
outright causing persistence errors during saving.
 2014-04-29 03:48:32 +01:00
Treeku 0364cad779 Added all (findable) junk dealer types 2014-04-29 02:54:59 +01:00
Treeku 63d0c5020d Merge pull request #559 from tacef/master 
Updated Creature scripts to have correct Weapontype
 2014-04-28 23:33:26 +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 0adff108a8 Updated Creature scripts again 
- Ranged creatures now have correct distance
- fixed name problems with creatures
- dragonet now doesn´t spawn a krayt dragon anymore
 2014-04-28 22:05:00 +02:00
tacef ba0b2476a6 Updated Ranged Creatures to play an effect 2014-04-28 21:16:52 +02:00
tacef 355700ae78 Updated Creature scripts to have correct Weapontype 
Also changed template for some creatures
 2014-04-28 20:59:35 +02:00
Light2 251ce17612 Merge pull request #558 from tacef/master 
Added Preliminary Creature scripts for Tatooine
 2014-04-28 20:54:51 +02:00
tacef a8894d57c0 Added Creature scripts for Tatooine(needs more testing) 
Also altered existing scripts to support weapontemplate(needs more
testing)
 2014-04-28 20:38:57 +02:00
Treeku 3c589c2f1c Merge pull request #557 from tacef/master 
Added more creatures to mos eisley
 2014-04-27 21:19:58 +01:00
tacef b77d99328a Added more creatures to mos eisley 
Added Worrts
Added Rills
 2014-04-27 22:16:59 +02:00
Treeku 136e9355bf Merge pull request #541 from Mesagoppinmypants/patch-42 
Fixed Loot Item
 2014-04-27 20:39:30 +01:00
Treeku f183bd3c74 Merge pull request #540 from Mesagoppinmypants/patch-41 
Scripted Imperial Scout Trooper NPC
 2014-04-27 20:38:42 +01:00
Treeku c6012c3c51 Merge pull request #538 from Mesagoppinmypants/patch-39 
Scripted Imperial Swamp Trooper
 2014-04-27 20:38:20 +01:00
Treeku 3038660c62 Merge pull request #534 from Ziggeh/master 
Fixed some BH expertise
 2014-04-27 20:37:43 +01:00
Treeku 3978046496 Merge pull request #555 from tacef/master 
Added Rebel Recruiter Conversation
 2014-04-27 20:37:08 +01:00
tacef ac776668b8 Added Rebel Recruiter Conversation 
Fixed error in Imperial recruiter Conversation
 2014-04-27 21:11:32 +02:00
CharonInferar 5934bcfb69 Merge pull request #549 from tacef/master 
Update Imperial Recruiter Conversation
 2014-04-27 20:48:26 +02:00
tacef 34f726f037 Updated Imperial Recruiter again 2014-04-27 19:57:47 +02:00
tacef 4849a16e38 Updated Imperial Recruiter Conversation again 
- Join military
- go Combatant
- go SF
- leave Military
 2014-04-27 17:43:41 +02:00
tacef bc7b2f02cc Updated Imperial Recruiter Conversation 
You are now able to resign from military
 2014-04-27 17:10:03 +02:00
CharonInferar b35c6bbc74 Merge pull request #535 from tacef/master 
Added more House deeds
 2014-04-27 14:14:58 +02:00
tacef b6693334fe Added Medical Cloning Droid Conversation 2014-04-27 11:14:17 +02:00
Mesagoppinmypants 2ce108ce44 Fixed Loot Item 2014-04-26 23:05:07 -04:00
Mesagoppinmypants 80556f169c Scripted Imperial Scout Trooper NPC 
Tested and works.
 2014-04-26 21:42:57 -04:00
Mesagoppinmypants 2c39bc74fb Scripted Imperial Swamp Trooper 
Tested and works.
 2014-04-26 21:33:24 -04:00
Mesagoppinmypants ade3071607 Scripted Stormtrooper Squad Leader NPC 
Tested and works.
 2014-04-26 20:23:25 -04:00
Treeku 55622980a6 Fixed minor agility_modified.py error 2014-04-27 01:06:57 +01:00
zingzing175 20970e915b Added action add to Officer Inspiration, fixed a couple base skill mods, fixed officer buffs. 2014-04-26 16:47:03 -07:00
zingzing175 563f2572bf Revert "Revert "Fixed agility.py issue"" 
This reverts commit 3e02e080cf.
 2014-04-26 16:21:30 -07:00
zingzing175 3e02e080cf Revert "Fixed agility.py issue" 
This reverts commit 8afe1e4af1.
 2014-04-26 15:52:46 -07:00
tacef 983c94c692 Started Work on Imperial Recruiter 2014-04-26 21:46:32 +02:00
tacef 114bcd85e5 Added more House deeds 
Also fixed structureterminal positions in Cityhalls. (need testing)
 2014-04-26 20:10:11 +02:00
Ziggeh ec2e010c7e Bounty Hunter - Fixed Fumble expertise 
Was granting unused abilities that were removed in a BH expertise
revamp.
 2014-04-26 19:23:55 +02:00
Ziggeh 4c29a54689 Bounty Hunter - Fixed Dread Strike expertise 
It was granting unused abilities
 2014-04-26 19:22:50 +02:00
Treeku 8afe1e4af1 Fixed agility.py issue 2014-04-26 16:15:26 +01:00
CharonInferar 25de95b310 Merge pull request #533 from tacef/master 
Continued Work on Playerhouse deed
 2014-04-26 15:42:45 +02:00