swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-17 00:05:07 -05:00
Code Issues Projects Releases Wiki Activity
4,007 Commits 9 Branches 0 Tags
42f5a677aaf53e3e5a55be3f68eaff1ace06f015
Commit Graph

4007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cekis
42f5a677aa Merge branch 'master' of github.com:SWG-Source/dsrc 2020-11-04 02:47:07 -05:00
Cekis
fce63a97fa Further adjustments for tutorial getting stuck issue 2020-11-04 02:46:59 -05:00
AconiteGodOfSWG
d2199f53c1 Add handleCleanVendor method 
See comments
ref #158
 2020-11-03 05:13:16 -05:00
Cekis
e9b9a07b09 Merge branch 'master' of github.com:SWG-Source/dsrc 2020-11-03 01:03:58 -05:00
Cekis
23b461bc3f Backed out changes to spawner and fixed Tatooine spawn TABs 2020-11-03 01:03:51 -05:00
Erusman
a025f33f2c Add Yoda Bobble Head reward to master_item. He doesn't use the force; he just bobbles! 2020-11-02 15:55:10 -08:00
AconiteGodOfSWG
2dde42a86f Fix vendor initializing if container objects exist 
Fix #158
 2020-11-02 15:24:36 -05:00
Cekis
f1048cdf5f Merge branch 'master' of github.com:SWG-Source/dsrc 2020-11-02 01:49:12 -05:00
Cekis
c3d6e4e701 Fixed issue where new players get stuck in space after a server reboot (thanks Elour for your help) 2020-11-02 01:48:57 -05:00
AconiteGodOfSWG
9c2896ae21 Add config check for old SB level rewards 2020-11-02 01:44:09 -05:00
AconiteGodOfSWG
c7d8ee1fb9 Merge branch 'master' of https://github.com/SWG-Source/dsrc 2020-11-01 22:29:18 -05:00
AconiteGodOfSWG
8e10638d54 Fix #140 2020-11-01 22:29:15 -05:00
Erusman
ec121f578b Added Elite Harvesters to frog 2020-11-01 18:17:35 -08:00
Cekis
ddce04fc1d Merge pull request #157 from AconiteGodOfSWG/master 
More Flurry Stuff
 2020-11-01 16:59:57 -08:00
AconiteGodOfSWG
432c1de407 Update setInstanceAuthorized 2020-11-01 19:34:32 -05:00
AconiteGodOfSWG
d19fd54f75 Fix misplaced system message in Flurry 2020-11-01 15:50:25 -05:00
CekisSWG
a4e9d1c09a Fixed broken spawner issue where it was throwing errors tot he console. 2020-11-01 13:30:35 -05:00
AconiteGodOfSWG
207d9852e1 Remove proc charge chance from FS Flurry 2020-10-31 23:12:13 -04:00
AconiteGodOfSWG
fbe8042843 Fix Flurry Changes 2020-10-31 23:05:36 -04:00
AconiteGodOfSWG
fff9d8e2f0 Merge pull request #1 from SWG-Source/master 
update local
 2020-10-31 21:53:18 -05:00
CekisSWG
321943ce26 Merge branch 'master' of github.com:SWG-Source/dsrc 2020-10-31 14:25:17 -04:00
CekisSWG
8820259b42 Fixed broken strings for Restuss Rebel Commendation Officer. 2020-10-31 14:25:08 -04:00
Cekis
e3a2837ea3 Merge pull request #156 from AconiteGodOfSWG/master 
Convert Flurry to Regular Attack
 2020-10-31 08:14:09 -07:00
AconiteGodOfSWG
611a735979 Update Jedi Flurry Cooldown to 12 sec 2020-10-31 01:08:35 -04:00
AconiteGodOfSWG
0cf0475830 Remove charge req from Jedi Flurry combat action 2020-10-31 00:56:32 -04:00
CekisSWG
b678858944 Fixed issue where you had to store all pets before retrieving them from the TCG barn 2020-10-30 20:38:17 -04:00
CekisSWG
cbfb511a46 Fixed broken strings for the Yavin IV space station conversation 2020-10-28 00:54:11 -04:00
CekisSWG
fc31a2dbe4 Fixed broken strings for the Naboo space station conversation 2020-10-28 00:53:48 -04:00
CekisSWG
02bfffd4b0 Fixed broken strings for the Endor space station conversation 2020-10-27 23:13:52 -04:00
CekisSWG
f84b315467 Fixed broken strings for the Dathomir space station conversation 2020-10-27 20:29:59 -04:00
CekisSWG
4c44981b8b Fixed broken strings for the Lok space station conversation 2020-10-27 02:05:19 -04:00
CekisSWG
0353ac51a7 Fixed broken strings for the Corellia space station conversation 2020-10-27 00:57:51 -04:00
CekisSWG
a9fdf8cb53 Fixed broken strings for the Dantooine space station conversation 2020-10-26 23:05:44 -04:00
CekisSWG
febb535e39 Fixed broken spawner text when spawner file contains blank entries 2020-10-26 14:25:11 -04:00
CekisSWG
99c1c1b877 Merge branch 'master' of github.com:SWG-Source/dsrc 2020-10-26 02:39:34 -04:00
CekisSWG
679070e7bb Fixed PSGs in factory crate missing stats (credit: Iosnowore) 2020-10-26 02:39:23 -04:00
Cekis
4d2a317f45 Merge pull request #155 from AconiteGodOfSWG/master 
Update delivery_no_pickup.java
 2020-10-25 10:23:06 -07:00
AconiteGodOfSWG
d8dda3aac0 Update delivery_no_pickup.java 2020-10-25 01:07:40 -04:00
Cekis
6366d66443 Merge pull request #151 from Geit/gu-16.9/no-trade-removable 
GU 16.9 - No Trade Removable
 2020-10-24 21:08:43 -07:00
Cekis
dc9e712853 Merge pull request #154 from AconiteGodOfSWG/master 
WOD - Add exclusive loot choice count logic
 2020-10-24 21:04:41 -07:00
CekisSWG
c6a50da87e Merge branch 'master' of github.com:SWG-Source/dsrc 2020-10-24 23:54:01 -04:00
CekisSWG
e371f4d199 Issue 115: Broken Empire Day Conversation Strings Fixed. 2020-10-24 23:53:47 -04:00
AconiteGodOfSWG
601be3d3a3 Fix exclusiveLootChoiceCount in OnQuestCompleted 2020-10-16 21:07:21 -04:00
AconiteGodOfSWG
b890557f60 Add getExclusiveItemRewardCount method 2020-10-16 21:03:26 -04:00
Cekis
4f699f41e7 Removing linter 
Too restrictive... need to analyze what is caught and re-implement later.
 2020-10-13 12:02:28 -07:00
Cekis
9bf240c385 Update ant-java.yml 2020-10-12 10:59:38 -07:00
CekisSWG
83b797cfc0 Revert "CI Test - Ignore" 
This reverts commit e7201f77fc.
 2020-10-11 18:29:52 -04:00
CekisSWG
3d5501f33b Merge branch 'master' of github.com:SWG-Source/dsrc 2020-10-11 18:22:46 -04:00
CekisSWG
e7201f77fc CI Test - Ignore 2020-10-11 18:22:05 -04:00
Cekis
46a425e7ad Update ant-java.yml 2020-10-11 15:21:00 -07:00