Commit Graph
3946 Commits
Author SHA1 Message Date
DarthArgus 8871393630 use the proper version of the wses 2015-11-28 23:46:45 -06:00
DarthArgus 7a0139d579 use the proper version of the wses 2015-11-28 23:46:45 -06:00
DarthArgus 18be9038ee try seefo's tools with planet only stuff, just for kicks, using our "old"
tabs since they have more scripts and objvars
2015-11-28 23:11:42 -06:00
DarthArgus 3b783478ee try seefo's tools with planet only stuff, just for kicks, using our "old"
tabs since they have more scripts and objvars
2015-11-28 23:11:42 -06:00
DarthArgus 4995942e38 fix errors 2015-11-24 20:00:18 -06:00
DarthArgus b143f75ee5 fix errors 2015-11-24 20:00:18 -06:00
DarthArgus cd4436fc05 who isn't sick of converting the freaking scripts? this negates the need 2015-11-24 09:27:45 -06:00
DarthArgus bbee2d328c who isn't sick of converting the freaking scripts? this negates the need 2015-11-24 09:27:45 -06:00
DarthArgus 3d9bcc5075 Merge branch 'master' into 'master'
tried rearranging the packup but it didn't really help...it just fails more efficiently now, lol



See merge request !23
2015-11-16 22:14:10 -05:00
DarthArgus cfd6c86593 Merge branch 'master' into 'master'
tried rearranging the packup but it didn't really help...it just fails more efficiently now, lol



See merge request !23
2015-11-16 22:14:10 -05:00
DarthArgus b4db3dbb67 syntax fix 2015-11-16 19:32:51 -06:00
DarthArgus 2e64106bc8 syntax fix 2015-11-16 19:32:51 -06:00
DarthArgus ffe9325360 try the order of operations from the rollup 2015-11-16 19:25:54 -06:00
DarthArgus 9eac27256b try the order of operations from the rollup 2015-11-16 19:25:54 -06:00
swgnoobs e43a4287cd Merge branch 'master' into 'master'
Trying to fix armor, armor_penalty.tab generated from xml file.



See merge request !22
2015-11-16 17:54:10 -05:00
swgnoobs 6e1f6e64f9 Merge branch 'master' into 'master'
Trying to fix armor, armor_penalty.tab generated from xml file.



See merge request !22
2015-11-16 17:54:10 -05:00
swgnoobs 0ff34874ab Trying to fix armor, armor_penalty.tab generated from xml file. 2015-11-16 23:51:45 +01:00
swgnoobs 6bd22879dd Trying to fix armor, armor_penalty.tab generated from xml file. 2015-11-16 23:51:45 +01:00
DarthArgus a0ee0de75c shot in the dark 2015-11-16 11:23:59 -06:00
DarthArgus 7ecf412d30 shot in the dark 2015-11-16 11:23:59 -06:00
DarthArgus 438df7dc07 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 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 8df318abfe 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 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 7020921e59 Merge remote-tracking branch 'upstream/master' 2015-11-13 09:55:00 -06:00
DarthArgus f77b405657 Merge remote-tracking branch 'upstream/master' 2015-11-13 09:55:00 -06:00
swgnoobs ca46ca6bb0 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 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 76dcad6206 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 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 bc27cf5d64 Tatooine City Map Registrations and new Positions for Pilot Trainer. 2015-11-12 22:45:14 +01:00
swgnoobs c2ec481205 Tatooine City Map Registrations and new Positions for Pilot Trainer. 2015-11-12 22:45:14 +01:00
swgnoobs d1270a4267 Adding Pilot Trainers to Mos Eisley Cantina. Positions arent totally correct yet. 2015-11-12 22:11:59 +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 97bf69354c this helped nothingRevert "REVERT THIS once the mail system works"
This reverts commit 5a0d2eebff747f22c980594e5317daff2e1970e2.
2015-11-11 21:02:03 -06: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 7e417b742f remove dupe 2015-11-11 20:31:07 -06:00
DarthArgus f16f3419fc remove dupe 2015-11-11 20:31:07 -06:00
DarthArgus a93f0c816c REVERT THIS once the mail system works 2015-11-11 20:24:50 -06:00
DarthArgus 518be01e77 REVERT THIS once the mail system works 2015-11-11 20:24:50 -06:00
DarthArgus 52f417ae88 Merge remote-tracking branch 'main/master' 2015-11-11 18:00:13 -06:00
DarthArgus d24a0081f9 Merge remote-tracking branch 'main/master' 2015-11-11 18:00:13 -06:00
swgnoobs 3e1d0c5c25 Merge branch 'master' into 'master'
Fixing City Map Registrations



See merge request !19
2015-11-11 05:00:29 -05: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 656630c831 More City Map Registration Fixes. 2015-11-11 10:22:07 +01:00
swgnoobs 1419dee0c6 More City Map Registration Fixes. 2015-11-11 10:22:07 +01:00
swgnoobs 3ec1f81ef9 Fixing more City Map Registrations. 2015-11-11 10:07:30 +01:00
swgnoobs 6aa3e3e449 Fixing more City Map Registrations. 2015-11-11 10:07:30 +01:00
swgnoobs c8861a5581 Empty Line issue from last commit fixed. 2015-11-11 08:54:46 +01:00
swgnoobs 9873d331ea Empty Line issue from last commit fixed. 2015-11-11 08:54:46 +01:00