swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-07-31 00:15:54 -04:00
Code Issues Projects Releases Wiki Activity
617 Commits 20 Branches 0 Tags
bbee2d328cf22da1c2f53750e8aff3538bacfb2a
Commit Graph
617 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DarthArgus bbee2d328c who isn't sick of converting the freaking scripts? this negates the need 2015-11-24 09:27:45 -06:00
DarthArgus 2e64106bc8 syntax fix 2015-11-16 19:32:51 -06:00
DarthArgus 9eac27256b try the order of operations from the rollup 2015-11-16 19:25:54 -06:00
DarthArgus 7ecf412d30 shot in the dark 2015-11-16 11:23:59 -06:00
DarthArgus 3a22303bb0 house packup: shouldn't it always go into the owner's datapad? we have a 
separate func for non-owner packup so this may need cleanup
 2015-11-16 10:30:16 -06:00
DarthArgus 69bcd8f708 Merge branch 'master' into 'master' 
rename veteran_deprecated to veteran as it's all we have



See merge request !21
 2015-11-15 00:27:29 -05:00
DarthArgus f77b405657 Merge remote-tracking branch 'upstream/master' 2015-11-13 09:55:00 -06:00
swgnoobs 1a312f5b17 Merge branch 'master' into 'master' 
Mos Eisley Cantina Pilot Trainers and City Registrations Tatooine



See merge request !20
 2015-11-12 17:44:00 -05:00
swgnoobs 665f0287a5 Still not the right positions for the pilot trainers, but atleast both can be seen now ... 2015-11-12 23:16:43 +01:00
swgnoobs c2ec481205 Tatooine City Map Registrations and new Positions for Pilot Trainer. 2015-11-12 22:45:14 +01:00
swgnoobs 0dcf695cfd Adding Pilot Trainers to Mos Eisley Cantina. Positions arent totally correct yet. 2015-11-12 22:11:59 +01:00
DarthArgus e8850b3e5f this helped nothingRevert "REVERT THIS once the mail system works" 
This reverts commit 5a0d2eebff747f22c980594e5317daff2e1970e2.
 2015-11-11 21:02:03 -06:00
DarthArgus f16f3419fc remove dupe 2015-11-11 20:31:07 -06:00
DarthArgus 518be01e77 REVERT THIS once the mail system works 2015-11-11 20:24:50 -06:00
DarthArgus d24a0081f9 Merge remote-tracking branch 'main/master' 2015-11-11 18:00:13 -06:00
swgnoobs 70168b1de9 Merge branch 'master' into 'master' 
Fixing City Map Registrations



See merge request !19
 2015-11-11 05:00:29 -05:00
swgnoobs 1419dee0c6 More City Map Registration Fixes. 2015-11-11 10:22:07 +01:00
swgnoobs 6aa3e3e449 Fixing more City Map Registrations. 2015-11-11 10:07:30 +01:00
swgnoobs 9873d331ea Empty Line issue from last commit fixed. 2015-11-11 08:54:46 +01:00
swgnoobs 95db60ec0d Add City Register on Map. 2015-11-11 08:20:38 +01:00
DarthArgus e95f9ea8c1 deprecated no more 2015-11-08 22:06:56 -06:00
DarthArgus c99d1c682e i hope i didn't just break something 2015-11-08 21:31:01 -06:00
swgnoobs be4f0796ef Merge branch 'master' into 'master' 
Add last Cells from swgrevs Files



See merge request !18
 2015-11-08 15:49:13 -05:00
swgnoobs b414c821da Add Cells to Yavin4 WS Files according to Revs Files. 2015-11-08 21:28:06 +01:00
swgnoobs e1d419201f Add Cells to Talus WS Files according to Revs Files. 2015-11-08 21:06:31 +01:00
swgnoobs fd0355411b Add Cells to Naboo WS Files according to Revs Files. 2015-11-08 20:47:13 +01:00
swgnoobs 81f506faa4 Merge branch 'master' into 'master' 
Adding Cells to WS Files according to Revs



See merge request !17
 2015-11-08 03:04:57 -05:00
swgnoobs fb2ce3b7b0 Add Cells to Lok WS Files according to Revs Files. 2015-11-08 08:46:05 +01:00
swgnoobs c4d485859e Add Cells to Endor WS Files according to Revs Files. 2015-11-08 08:21:16 +01:00
swgnoobs efcbeeb514 Add Cells to Dathomir WS Files according to Revs Files. 2015-11-08 07:55:27 +01:00
swgnoobs 7c06b5bf0a Add Cells to Dantooine WS Files according to Revs Files. 2015-11-08 07:05:50 +01:00
swgnoobs 17b03b0562 Merge branch 'master' into 'master' 
Corellia WS Files Pull



See merge request !16
 2015-11-08 00:40:47 -05:00
swgnoobs 85cfe35f4e Fixing Line Issues from last Commit, that prevent Gameserver from running. 2015-11-08 05:47:06 +01:00
swgnoobs a2b8eddddc Add Cells to Corellia WS Files according to Revs Files. 2015-11-08 05:15:06 +01:00
swgnoobs 7572a22904 Merge remote-tracking branch 'upstream/master' 2015-11-08 03:51:07 +01:00
swgnoobs 9ea8433189 Added Cells/CellIds from Revs Repo to Rori WS Files 2015-11-08 02:43:03 +01:00
DarthArgus 780af8a09f Merge branch 'master' into 'master' 
properly add sovi, the chassis dealer to eisley sp



See merge request !15
 2015-11-07 17:16:48 -05:00
swgnoobs 99228e3cf6 Changes to rori WS Files 
modified:   sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_1_1_ws.tab
	modified:   sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_1_7_ws.tab
	modified:   sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_2_2_ws.tab
	modified:   sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_2_3_ws.tab
	modified:   sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_3_6_ws.tab
	modified:   sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_4_2_ws.tab
 2015-11-07 23:03:41 +01:00
DarthArgus a3d691a656 since we haven't used space_chassis_broker_02 yet - and there are 5 of 
them
 2015-11-07 15:53:01 -06:00
DarthArgus fb8a24b68a EXAMPLE of adding a creature and putting them in the proper place 2015-11-07 15:49:24 -06:00
DarthArgus 1f6497cb6d this one is already hooked up in creatures.tab, we can change later 2015-11-07 15:24:11 -06:00
DarthArgus 600a1a1e61 attempt to put the chassis broker in eisley 2015-11-07 14:57:38 -06:00
DarthArgus 7e8ba3c768 Merge branch 'master' into 'master' 
fix typo



See merge request !14
 2015-11-06 00:32:03 -05:00
DarthArgus 533831ad7d fix typo 2015-11-05 23:24:17 -06:00
DarthArgus e3194a47c9 Merge branch 'master' into 'master' 
fix the rest of the tat poi spawners



See merge request !13
 2015-11-06 00:00:24 -05:00
DarthArgus 91b6a34806 fix the rest of the tat poi spawners 2015-11-05 22:47:19 -06:00
DarthArgus 1824329a03 Merge branch 'master' into 'master' 
bestine spawns - possibly more later



See merge request !12
 2015-11-04 00:10:43 -05:00
DarthArgus 0f5aac28ea typo 2015-11-03 23:07:58 -06:00
DarthArgus aa7fd21ba2 add some missing bestine spawns, probably more to come 2015-11-03 22:44:21 -06:00
DarthArgus 1b68b4e3f5 Revert "theoretically this should prevent calls to getCellId when we're wanting to" 
This reverts commit f9f25505f034c8b829223bc1df83e60326029273.
 2015-11-03 21:01:37 -06:00