 DarthArgus
|
cb5f46fb57
|
theoretically this will spawn troops and npcs for the starport in eisley
|
2015-10-31 15:28:56 -05:00 |
|
|
DarthArgus
|
de81b38225
|
Merge branch 'master' of swgilluminati.com:DarthArgus/dsrc
|
2015-10-31 13:51:34 -05:00 |
|
|
DarthArgus
|
f3e2d82d79
|
add mayor spawner
|
2015-11-01 01:52:05 -05:00 |
|
|
DarthArgus
|
3ee66412ff
|
add portalproperty to silence warn, hopefully
|
2015-10-31 13:50:23 -05:00 |
|
|
DarthArgus
|
dbc898f061
|
add some extra sanity checks
|
2015-10-31 06:18:38 -05:00 |
|
|
DarthArgus
|
7250c49f44
|
fix mistake
|
2015-10-31 02:12:38 -05:00 |
|
|
DarthArgus
|
2f15c2569b
|
broken switches
|
2015-10-30 13:46:12 -05:00 |
|
|
DarthArgus
|
c08547f51e
|
more script fixes
|
2015-10-30 13:30:22 -05:00 |
|
|
DarthArgus
|
8e3179f3d5
|
fixing borked scripts
|
2015-10-30 13:19:14 -05:00 |
|
|
DarthArgus
|
78e036bfe0
|
update the wses from masters
|
2015-10-25 22:07:18 -05:00 |
|
|
DarthArgus
|
6f8f18bbc3
|
cleanly functionalized version of the persist java crap...too bad that
we're not getting the right id's
|
2015-10-19 23:12:47 -05:00 |
|
|
DarthArgus
|
2f64967ee1
|
try a new persist function
|
2015-10-19 22:15:11 -05:00 |
|
|
DarthArgus
|
924a7e7bd3
|
Merge branch 'master' into 'master'
Master
See merge request !5
|
2015-10-18 15:03:52 -04:00 |
|
|
DarthArgus
|
9bc434aca3
|
for whatever reason spawned_tracker for npc_died just refuses to work
|
2015-10-18 14:02:21 -05:00 |
|
|
DarthArgus
|
f5a435f541
|
more fixups
|
2015-10-18 13:36:53 -05:00 |
|
|
DarthArgus
|
a7857cc4d0
|
more script fixups
|
2015-10-18 13:28:36 -05:00 |
|
|
DarthArgus
|
f211ab6d50
|
fix casing typo
|
2015-10-18 13:13:47 -05:00 |
|
|
DarthArgus
|
7a14753b37
|
remove blank line
|
2015-10-18 12:54:37 -05:00 |
|
|
DarthArgus
|
5daa853bc5
|
duplicate broken tpf
|
2015-10-18 12:29:28 -05:00 |
|
|
DarthArgus
|
6f749dd3af
|
Merge branch 'master' into 'master'
fix a busted tab file
See merge request !4
|
2015-10-18 05:06:57 -04:00 |
|
|
DarthArgus
|
3353059f16
|
fix broken tab file
|
2015-10-18 03:47:13 -05:00 |
|
|
DarthArgus
|
cfacf1dc0a
|
we at least had this one...
|
2015-10-18 03:18:27 -05:00 |
|
|
DarthArgus
|
effad20255
|
Merge branch 'master' into 'master'
cleanup
See merge request !3
|
2015-10-17 02:50:57 -04:00 |
|
|
DarthArgus
|
ea67363be3
|
repo cleanup
|
2015-10-17 01:20:46 -05:00 |
|
|
DarthArgus
|
761bf00a2a
|
i'm not sure these are supposed to be swap files
|
2015-10-17 01:17:23 -05:00 |
|
|
DarthArgus
|
c665bcee4e
|
Merge branch 'master' into 'master'
remove old qatool
See merge request !2
|
2015-10-10 21:52:33 -04:00 |
|
|
DarthArgus
|
d89ac07a6d
|
remove old qatool
|
2015-10-10 20:46:35 -05:00 |
|
|
DarthArgus
|
bc489b141b
|
Merge branch 'master' into 'master'
Master
merge
See merge request !1
|
2015-10-06 23:42:57 -04:00 |
|
|
DarthArgus
|
7a0df1f9b9
|
fixed persistplanet
|
2015-10-06 01:42:20 -05:00 |
|
|
DarthArgus
|
bb8f9a4351
|
add fixed qatool
|
2015-09-25 23:04:28 -05:00 |
|
|
CodeCodon
|
56355e7965
|
fix character issue
|
2015-08-01 18:28:15 -05:00 |
|
|
CodeCodon
|
feaa8195cf
|
remove slack file
|
2015-07-26 23:28:17 -05:00 |
|
|
CodeCodon
|
aae2ca7df7
|
remove btm files
|
2015-07-26 23:27:36 -05:00 |
|
|
CodeCodon
|
b1269703b8
|
Merge branch 'master' of swgilluminati.com:staff/dsrc
|
2015-07-15 10:32:09 -05:00 |
|
|
CodeCodon
|
712d5e40ec
|
lowercase naming...
|
2015-07-13 14:46:54 -05:00 |
|
|
CodeCodon
|
ecfb328dc5
|
add default tab for ship fix...prob unneeded but thows annoying errors
|
2015-07-13 14:46:43 -05:00 |
|
|
DarthArgusandCodeCodon
|
1dfc51fa69
|
or backticks
|
2015-07-13 14:46:35 -05:00 |
|
|
DarthArgusandCodeCodon
|
1046d73824
|
no likey () [] {}
|
2015-07-13 14:46:08 -05:00 |
|
|
DarthArgusandCodeCodon
|
b27957323e
|
fix annoying cipher bug on meatlump puzzle
|
2015-07-13 14:45:52 -05:00 |
|
|
CodeCodon
|
76f2e7bc8a
|
lowercase naming...
|
2015-07-12 15:56:47 -05:00 |
|
|
CodeCodon
|
7222b34fa1
|
add default tab for ship fix...prob unneeded but thows annoying errors
|
2015-07-12 15:07:58 -05:00 |
|
|
DarthArgus
|
40ec59089b
|
or backticks
|
2015-05-17 18:33:05 -05:00 |
|
|
DarthArgus
|
b492d0dd09
|
no likey () [] {}
|
2015-05-17 18:30:07 -05:00 |
|
|
DarthArgus
|
78a727835b
|
fix annoying cipher bug on meatlump puzzle
|
2015-05-17 18:27:11 -05:00 |
|
|
DarthArgus
|
d94ecf0b53
|
! THIS ONE MAY BE REMOVING INSTEAD OF ADDING, SEE DIFF! Merge remote-tracking branch 'revs/Monea_NPC'
Conflicts:
sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_7_2_ws.tab
|
2015-05-17 14:04:00 -05:00 |
|
|
DarthArgus
|
358dba3ef1
|
Merge remote-tracking branch 'revs/TheedEndgameForFurtherWork'
Conflicts:
sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7_ws.tab
|
2015-05-17 14:01:30 -05:00 |
|
|
DarthArgus
|
a87937fa89
|
Merge remote-tracking branch 'revs/AnchorheadRepopulation'
Conflicts:
sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_5_2_ws.tab
|
2015-05-17 14:00:21 -05:00 |
|
|
DarthArgus
|
dd7f22d341
|
Merge remote-tracking branch 'revs/EnthaRepop'
|
2015-05-17 13:58:31 -05:00 |
|
|
DarthArgus
|
b97052dda5
|
Merge remote-tracking branch 'revs/TheedWorldNPC'
Conflicts:
sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7_ws.tab
|
2015-05-17 13:58:13 -05:00 |
|
|
DarthArgus
|
8f33f3b5b2
|
Merge remote-tracking branch 'revs/cloudHouse'
Conflicts:
sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab
sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/tat_commoner.tab
|
2015-05-17 13:51:05 -05:00 |
|