Commit Graph - dsrc - Gitea: Git with a cup of tea

swg-source/dsrc

Fork 0

mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-15 23:04:31 -05:00

Commit Graph

Select branches

Hide Pull Requests

3.1

archive-1.2.1

atmo

master

profession-fixes

qa-space-tools

space-battle-fix-and-refinement

witches_of_dath

wod

#103

#105

#110

#117

#120

#121

#122

#127

#130

#131

#134

#135

#136

#139

#141

#144

#145

#147

#148

#149

#150

#151

#152

#153

#154

#155

#156

#157

#163

#218

#240

#244

#26

#269

#27

#270

#29

#297

#299

#300

#305

#307

#308

#311

#313

#313

#319

#32

#320

#321

#322

#323

#325

#325

#326

#327

#334

#335

#335

#336

#336

#338

#338

#339

#347

#348

#348

#349

#349

#350

#350

#352

#353

#354

#355

#355

#358

#359

#359

#36

#360

#360

#361

#362

#363

#364

#365

#366

#367

#368

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#376

#378

#378

#379

#381

#382

#383

#384

#385

#385

#386

#386

#388

#389

#390

#391

#392

#393

#393

#394

#394

#395

#395

#396

#397

#397

#41

#55

#56

#57

#58

#61

#64

#66

#77

#78

#84

#86

a0c0a9ddb5 Add ESB Anniversary Celebration Items and Rewards (Fix #190) AconiteGodOfSWG 2020-11-19 19:31:33 -05:00
7a9e2a8436 Fixed static NPC questing and Kitster Banai questline Cekis 2020-11-19 19:21:26 -05:00
d37b1f9e53 Merged changes Cekis 2020-11-19 01:32:10 -05:00
6a3693a5fc Reverted and optimized (to a point) static npc quest scripts Cekis 2020-11-19 01:27:31 -05:00
8e3534017d Fix #173 AconiteGodOfSWG 2020-11-18 22:02:37 -05:00
fbc2d72d6d Fix #180 AconiteGodOfSWG 2020-11-18 21:35:44 -05:00
b462125d16 Add OnWaypointWarpRequested & New Admin Branching Cmd AconiteGodOfSWG 2020-11-18 18:13:04 -05:00
6525728a60 Restore Tekil Barje (ref #174) AconiteGodOfSWG 2020-11-18 06:17:25 -05:00
9102dd4aec Fix #162 AconiteGodOfSWG 2020-11-18 04:52:11 -05:00
73324c173b Factions Library Cleanup AconiteGodOfSWG 2020-11-18 02:21:27 -05:00
174b267423 GCW Library Cleanup AconiteGodOfSWG 2020-11-18 01:41:26 -05:00
402cfca7e4 Console error when paying Hero of Tatooine farmer. TyroneSWG 2020-11-17 05:51:43 -06:00
4e723a70ab Merge branch 'master' of github.com:SWG-Source/dsrc Cekis 2020-11-15 14:49:56 -05:00
5095837541 Adjusting orphaned algorithm per #161 Cekis 2020-11-15 14:49:46 -05:00
ce2d8cd7fd Fixes for Elusive Fish and Fishing Controller AconiteGodOfSWG 2020-11-09 05:53:41 -05:00
9355e3bcc0 Add dummy for string_id AconiteGodOfSWG 2020-11-09 03:57:34 -05:00
03e716c809 Add removal of Elusive Fish record on CTS AconiteGodOfSWG 2020-11-09 03:35:46 -05:00
5f349274fb Prevent GM from picking up holiday controller AconiteGodOfSWG 2020-11-09 03:00:28 -05:00
5255139cc5 Fixed broken and incorrect strings for Kay-Three conversation for Empire Day. Cekis 2020-11-09 02:49:03 -05:00
47dcc61677 Fixed incorrect conversation response. Cekis 2020-11-09 02:29:59 -05:00
08fe7cdb07 Fixed broken strings for the Imperial General during invasions. Cekis 2020-11-09 02:15:01 -05:00
ea1fe98f67 Fixed broken strings for the Restuss Imperial Rewards NPC. Cekis 2020-11-09 01:22:56 -05:00
1bbea60be1 Fixed broken strings for the Rememberance Day Mara Jade conversation. Cekis 2020-11-09 00:54:30 -05:00
b33f873ffd Fixed broken strings for the Rebel General during invasions. Cekis 2020-11-09 00:31:53 -05:00
acd45d2f03 Fixed incorrect and broken strings for Captain Derlin (Rememberance Day) Cekis 2020-11-08 22:03:20 -05:00
ed2d717842 Add Fishing Lib and Elusive Fish System AconiteGodOfSWG 2020-11-07 06:15:11 -05:00
42f5a677aa Merge branch 'master' of github.com:SWG-Source/dsrc Cekis 2020-11-04 02:47:07 -05:00
fce63a97fa Further adjustments for tutorial getting stuck issue Cekis 2020-11-04 02:46:59 -05:00
d2199f53c1 Add handleCleanVendor method AconiteGodOfSWG 2020-11-03 05:13:16 -05:00
e9b9a07b09 Merge branch 'master' of github.com:SWG-Source/dsrc Cekis 2020-11-03 01:03:58 -05:00
23b461bc3f Backed out changes to spawner and fixed Tatooine spawn TABs Cekis 2020-11-03 01:03:51 -05:00
a025f33f2c Add Yoda Bobble Head reward to master_item. He doesn't use the force; he just bobbles! Erusman 2020-11-02 15:55:10 -08:00
2dde42a86f Fix vendor initializing if container objects exist AconiteGodOfSWG 2020-11-02 15:24:36 -05:00
f1048cdf5f Merge branch 'master' of github.com:SWG-Source/dsrc Cekis 2020-11-02 01:49:12 -05:00
c3d6e4e701 Fixed issue where new players get stuck in space after a server reboot (thanks Elour for your help) Cekis 2020-11-02 01:48:57 -05:00
9c2896ae21 Add config check for old SB level rewards AconiteGodOfSWG 2020-11-02 01:44:09 -05:00
c7d8ee1fb9 Merge branch 'master' of https://github.com/SWG-Source/dsrc AconiteGodOfSWG 2020-11-01 22:29:18 -05:00
8e10638d54 Fix #140 AconiteGodOfSWG 2020-11-01 22:29:15 -05:00
ec121f578b Added Elite Harvesters to frog Erusman 2020-11-01 18:17:35 -08:00
ddce04fc1d Merge pull request #157 from AconiteGodOfSWG/master Cekis 2020-11-01 16:59:57 -08:00
432c1de407 Update setInstanceAuthorized AconiteGodOfSWG 2020-11-01 19:34:32 -05:00
d19fd54f75 Fix misplaced system message in Flurry AconiteGodOfSWG 2020-11-01 15:50:25 -05:00
a4e9d1c09a Fixed broken spawner issue where it was throwing errors tot he console. CekisSWG 2020-11-01 13:30:35 -05:00
207d9852e1 Remove proc charge chance from FS Flurry AconiteGodOfSWG 2020-10-31 23:12:13 -04:00
fbe8042843 Fix Flurry Changes AconiteGodOfSWG 2020-10-31 23:05:36 -04:00
fff9d8e2f0 Merge pull request #1 from SWG-Source/master AconiteGodOfSWG 2020-10-31 21:53:18 -05:00
321943ce26 Merge branch 'master' of github.com:SWG-Source/dsrc CekisSWG 2020-10-31 14:25:17 -04:00
8820259b42 Fixed broken strings for Restuss Rebel Commendation Officer. CekisSWG 2020-10-31 14:25:08 -04:00
e3a2837ea3 Merge pull request #156 from AconiteGodOfSWG/master Cekis 2020-10-31 08:14:09 -07:00
611a735979 Update Jedi Flurry Cooldown to 12 sec AconiteGodOfSWG 2020-10-31 01:08:35 -04:00
0cf0475830 Remove charge req from Jedi Flurry combat action AconiteGodOfSWG 2020-10-31 00:56:32 -04:00
b678858944 Fixed issue where you had to store all pets before retrieving them from the TCG barn CekisSWG 2020-10-30 20:38:17 -04:00
cbfb511a46 Fixed broken strings for the Yavin IV space station conversation CekisSWG 2020-10-28 00:54:11 -04:00
fc31a2dbe4 Fixed broken strings for the Naboo space station conversation CekisSWG 2020-10-28 00:53:48 -04:00
02bfffd4b0 Fixed broken strings for the Endor space station conversation CekisSWG 2020-10-27 23:13:52 -04:00
f84b315467 Fixed broken strings for the Dathomir space station conversation CekisSWG 2020-10-27 20:29:59 -04:00
4c44981b8b Fixed broken strings for the Lok space station conversation CekisSWG 2020-10-27 02:05:19 -04:00
0353ac51a7 Fixed broken strings for the Corellia space station conversation CekisSWG 2020-10-27 00:57:51 -04:00
a9fdf8cb53 Fixed broken strings for the Dantooine space station conversation CekisSWG 2020-10-26 23:05:44 -04:00
febb535e39 Fixed broken spawner text when spawner file contains blank entries CekisSWG 2020-10-26 14:25:11 -04:00
99c1c1b877 Merge branch 'master' of github.com:SWG-Source/dsrc CekisSWG 2020-10-26 02:39:34 -04:00
679070e7bb Fixed PSGs in factory crate missing stats (credit: Iosnowore) CekisSWG 2020-10-26 02:39:23 -04:00
4d2a317f45 Merge pull request #155 from AconiteGodOfSWG/master Cekis 2020-10-25 10:23:06 -07:00
d8dda3aac0 Update delivery_no_pickup.java AconiteGodOfSWG 2020-10-25 01:07:40 -04:00
6366d66443 Merge pull request #151 from Geit/gu-16.9/no-trade-removable Cekis 2020-10-24 21:08:43 -07:00
dc9e712853 Merge pull request #154 from AconiteGodOfSWG/master Cekis 2020-10-24 21:04:41 -07:00
c6a50da87e Merge branch 'master' of github.com:SWG-Source/dsrc CekisSWG 2020-10-24 23:54:01 -04:00
e371f4d199 Issue 115: Broken Empire Day Conversation Strings Fixed. CekisSWG 2020-10-24 23:53:47 -04:00
601be3d3a3 Fix exclusiveLootChoiceCount in OnQuestCompleted AconiteGodOfSWG 2020-10-16 21:07:21 -04:00
b890557f60 Add getExclusiveItemRewardCount method AconiteGodOfSWG 2020-10-16 21:03:26 -04:00
4f699f41e7 Removing linter Cekis 2020-10-13 12:02:28 -07:00
9bf240c385 Update ant-java.yml Cekis 2020-10-12 10:59:38 -07:00
83b797cfc0 Revert "CI Test - Ignore" CekisSWG 2020-10-11 18:29:52 -04:00
3d5501f33b Merge branch 'master' of github.com:SWG-Source/dsrc CekisSWG 2020-10-11 18:22:46 -04:00
e7201f77fc CI Test - Ignore CekisSWG 2020-10-11 18:22:05 -04:00
46a425e7ad Update ant-java.yml Cekis 2020-10-11 15:21:00 -07:00
3f565e9dee Revert "CI Test - ignore." CekisSWG 2020-10-11 18:18:54 -04:00
1fec87233d CI Test - ignore. Cekis 2020-10-11 15:15:23 -07:00
183bf7455b Rename ant.yml to ant-java.yml Cekis 2020-10-11 15:10:47 -07:00
53a1969738 Update ant.yml Cekis 2020-10-11 15:10:25 -07:00
45e9c2766f Update ant.yml Cekis 2020-10-11 15:00:09 -07:00
1f2c638071 Update build.xml Cekis 2020-10-11 14:11:28 -07:00
42e7e91198 Update build.xml Cekis 2020-10-11 00:33:34 -07:00
d918509833 Update ant.yml Cekis 2020-10-11 00:28:42 -07:00
298eb3e5e2 Update build.xml Cekis 2020-10-11 00:28:33 -07:00
9bb3a8c377 Update build.xml Cekis 2020-10-11 00:16:05 -07:00
2913d79bb7 Update build.xml Cekis 2020-10-11 00:10:09 -07:00
e3df5ea226 Create ant.yml Cekis 2020-10-11 00:07:37 -07:00
044c6fe69e Added dsrc build.properties CekisSWG 2020-10-10 20:58:53 -04:00
323ab0a439 Created DSRC build file CekisSWG 2020-10-10 20:25:17 -04:00
9da603417b Merge pull request #152 from AconiteGodOfSWG/master IrishDarkshadow 2020-10-08 09:05:53 +01:00
752963c5fe bugfix: mutant rancor costume AconiteGodOfSWG 2020-10-04 22:27:51 -04:00
8f909368e2 fixes wayfar warp on the blue frog to place you inside the town not 400m outside it & adds warps for the three terrestrial TCG Black Markets IrishDarkshadow 2020-10-03 07:31:50 -04:00
00abd55e5e removes a quest signal in the Darklighter Cache quest that has been congfirmed as being superfluous by Blood and Aconite IrishDarkshadow 2020-09-27 17:48:12 -04:00
ccbcf3bcb1 corrects an issue on the legacy quest Darklighter Cache quest that stopped players from receiving the list of terminals inside the cave in their quest update IrishDarkshadow 2020-09-27 09:29:59 -04:00
a2fdb18727 Detach script and add Customer Service logging Geit 2020-09-22 13:24:55 -04:00
2ed8587a7a Remove unused line Geit 2020-09-22 12:50:08 -04:00
a1bada5ab6 Move an errant bracket into the correct place. Geit 2020-09-22 12:49:04 -04:00
7ef9f92822 Update from code review comments Geit 2020-09-21 18:42:29 -04:00
476b705432 GU 16.9 - No Trade Removable Geit 2020-09-21 14:32:16 -04:00

... 2 3 4 5 6 ...