projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity
2,513 Commits 11 Branches 4 Tags
bb28323a7a62e37aa4e00a0ce4d2fd3ca1173bdf
Commit Graph
1250 Commits
Author SHA1 Message Date
CharonInferar 1833f821fa Taking into account fixed member groups 2014-05-03 00:42:25 +02:00
Treeku 9cb7b38aac Fixed strength_modified.py 2014-05-02 22:52:19 +01:00
Treeku 0a4001d504 Merge pull request #571 from tacef/master 
Added NPC scripts( No conversations yet)
 2014-05-02 22:01:08 +01:00
tacef 47da295c00 Altered recruiters to fit faction changes 2014-05-02 22:27:40 +02:00
CharonInferar 081a30b7da dynamic spawn scripts added 
Commit frequency caused by ongoing odb refactoring
 2014-05-02 22:19:30 +02:00
TreekuandCharonInferar 8abc9879f5 Vehicles now have ranged gb buffs 2014-05-02 20:32:58 +02:00
Treeku 48ec7c46ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 16:30:46 +01:00
CharonInferar 1c14d7a702 Random stat jewelry added, loot service further debugged 
Added stat jewelry
 2014-05-01 21:25:41 +02: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
tacef 45dd5bc9e5 Fixed little error in Rebel Recruiter conversation 2014-05-01 20:54:53 +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
tacef 3b3c9bd6ef Fixed Typo in Reimos conversation script 2014-05-01 19:50:03 +02:00
tacef 7043f6a159 Updated NPC Scripts with conversations 2014-05-01 19:38:12 +02:00
tacef e111724115 Added NPC scripts( No conversations yet) 2014-05-01 18:25:39 +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
CharonInferar 87f10370f0 Added most droppable armor pieces 2014-05-01 05:12:05 +02: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