projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-14 00:02:07 -04:00
Code Issues Projects Releases Wiki Activity
1,756 Commits 11 Branches 4 Tags
8b1f20cdce520ea900778d6f50c1987682c19f7f
Commit Graph
833 Commits
Author SHA1 Message Date
Treeku 48ec7c46ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 16:30:46 +01:00
Light2 6cd794a6c3 minor fix 2014-05-01 21:25:35 +02:00
Light2 536b51d953 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	.gitignore
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/mission/MissionObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/chat/Mail.java
	src/services/mission/MissionObjective.java
	src/services/object/ObjectService.java
	src/services/playercities/PlayerCity.java
 2014-05-01 21:08:20 +02:00
Light2 7d457101f3 Refactored odb system (read extended), added implementation of Dynamic World Spawns 
ODB no longer uses DPL layer of Berkeley DB, persistent classes have to
implement the Serializable interface, annotations are no longer used,
use transient modifier for variables that should not be persistent.
Entity reference errors will no longer occur, however it is better to
use ids if the entity that is being referenced is stored in the db too!
(or you will have two different objects). DB is cached for 5 minutes
then it will write its log/cache to disk, transactions are no longer
used.
 2014-05-01 20:33:38 +02:00
Levarrishawk 12ca3ae661 Added Subfolders for Planetary Statics 
Pending move of all static spawn scripts to these subfolders.
 2014-05-01 07:42:55 -04:00
Levarrishawk f32074094e Modified Kaas Script 
Commented out all POB structures pending a possible relocation to
snapshot.
 2014-05-01 07:38:35 -04: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
Waverunner 66002081ea Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/common/BountyListItem.java
 2014-04-30 15:57:30 -04:00
Waverunner 6e9be7e610 Setting bounties now accounts for all of your available funds 2014-04-30 15:54:44 -04: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
CharonInferar 2a23dd8076 merge conflict resolve 2014-04-30 19:45:12 +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
CharonInferar bec401c57b continued sandbox city, public structure problem 2014-04-28 22:52:04 +02: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 4e6ae6d478 Merge remote-tracking branch 'origin/master' into PlayerCityUpdate 2014-04-27 20:55:03 +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