projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-12 02:13:48 -04:00
Code Issues Projects Releases Wiki Activity
1,775 Commits 11 Branches 4 Tags
d4ae4a4fbbf5d92e6045fdce6b40ee81ab54eb58
Commit Graph
1775 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CharonInferar d4ae4a4fbb ngepublic difference 2014-05-04 01:37:16 +02:00
Treeku 883163768d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 06:31:23 +01:00
Treeku 87da836146 Fixed tangibles in weapon-slot issue 2014-05-03 06:17:34 +01:00
Treeku 807fd829c0 Merge pull request #578 from Mesagoppinmypants/patch-46 
Bad Odds Abilities Now Grant at Correct Levels
 2014-05-03 03:08:13 +01:00
Treeku 5156951755 Merge pull request #579 from Mesagoppinmypants/patch-47 
Shoot First Abilities Now Grant at Correct Levels
 2014-05-03 03:07:48 +01:00
Treeku d0988c687f Merge pull request #580 from Mesagoppinmypants/patch-48 
Supply Drop Abilities Now Grant at Correct Levels
 2014-05-03 03:07:28 +01:00
Mesagoppinmypants 5a012f28b7 Supply Drop Abilities Now Grant at Correct Levels 2014-05-02 22:05:38 -04:00
Mesagoppinmypants 818bce44fc Shoot First Abilities Now Grants at Correct Levels 
These are now the correct levels. (checked from game client)
 2014-05-02 21:56:45 -04:00
Mesagoppinmypants e7084fcd0f Bad Odds Ability Now Grants at Correct Levels 
These are now the correct levels. (checked from game client)
 2014-05-02 21:50:56 -04:00
Treeku 9cb7b38aac Fixed strength_modified.py 2014-05-02 22:52:19 +01:00
Treeku e7dcca5c14 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 22:08:54 +01:00
Treeku ff827a2902 Fixed null error 2014-05-02 22:08:13 +01:00
Treeku cae4b958a9 Merge pull request #574 from Mesagoppinmypants/patch-45 
Removed Reset Expertise From Frog
 2014-05-02 22:01:42 +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
Mesagoppinmypants 8b1f20cdce Removed Reset Expertise From Frog 
This is no longer needed now that you can respec expertise properly from NPC.
 2014-05-02 16:50:09 -04:00
tacef 47da295c00 Altered recruiters to fit faction changes 2014-05-02 22:27:40 +02:00
Treeku 57dcb72718 Additional null checks 2014-05-02 21:24:37 +01:00
Treeku 78569244b8 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 21:15:57 +01:00
Treeku cdbf244b27 Reset pvp bitmask on disconnect 2014-05-02 21:14:49 +01:00
Treeku 5e522cf03b Added getObjectByFirstName null checks 2014-05-02 21:12:45 +01:00
Treeku f7fc2dbb2e Add gmflag bypass, fix char delete on wiped odb 
Put in nge.cfg: ADMIN=1
 2014-05-02 21:04:52 +01:00
Light2 5d4bf6a0a2 odb fix 2014-05-02 20:51:44 +02:00
Treeku 70d63139e6 Temp patchfix for creating chars issue 
Will fix it properly soon, atm everyone needs to be able to create
chars.
 2014-05-02 18:19:39 +01:00
Treeku 48ec7c46ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 16:30:46 +01:00
Treeku da93a05b96 Characters faction no longer "neutral" 2014-05-02 16:30:30 +01:00
Light2 2ab32b376c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 00:35:39 +02:00
Light2 d5f9adc7b2 more odb fixes 2014-05-02 00:34:01 +02:00
Waverunner 5d0444ca7c Disable bounty missions for now 
They'll be enabled again once the probe droids are finished.
 2014-05-01 16:32:57 -04:00
Waverunner 3f049e615b Merge 2014-05-01 16:29:05 -04:00
Waverunner 7a6360e235 Comm message when accepting bounties, basework for probe droids 2014-05-01 16:14:20 -04:00
Light2 ce55d15e97 merge fixes 2014-05-01 21:27:16 +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 62593b08de Merge branch 'refactor' 2014-05-01 20:43:47 +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
Treeku 44f9c4bce5 Added stealth detection/camo consideration 2014-05-01 14:45:48 +01:00
Treeku a1a4c40b30 Reduced initial time delay 
The sky always takes 45 seconds to sync after logging in, after which
you visibly see the sky change from light to dark and vice versa.
 2014-05-01 12:42:57 +01: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
Treeku 4b6a7e3667 Added TEFs 2014-05-01 12:33:34 +01:00
Waverunner 9b0ca0e2c5 Merge pull request #569 from Socome/patch-2 
Update landspeeder_tantive4_deed.py (Same as barc, also, Sorry for dual pr's. edited on github.)
 2014-04-30 23:24:24 -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
Waverunner e6f7ffeed9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-30 19:30:30 -04:00
Waverunner 2ce98833ea Null error fix for Mails 2014-04-30 19:30:12 -04:00