DarthArgus
aed336bde4
broken switches
2015-10-30 13:46:12 -05:00
DarthArgus
d4213197e9
more script fixes
2015-10-30 13:30:22 -05:00
DarthArgus
e886f63a79
fixing borked scripts
2015-10-30 13:19:14 -05:00
DarthArgus
fd4b19dd64
update the wses from masters
2015-10-25 22:07:18 -05:00
DarthArgus
70d0110a30
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
63663ce450
try a new persist function
2015-10-19 22:15:11 -05:00
DarthArgus
741ed98708
Merge branch 'master' into 'master'
...
Master
See merge request !5
2015-10-18 15:03:52 -04:00
DarthArgus
fe602f3e87
for whatever reason spawned_tracker for npc_died just refuses to work
2015-10-18 14:02:21 -05:00
DarthArgus
1d0dfca9c7
more fixups
2015-10-18 13:36:53 -05:00
DarthArgus
9618fe0df9
more script fixups
2015-10-18 13:28:36 -05:00
DarthArgus
572a3b75dc
fix casing typo
2015-10-18 13:13:47 -05:00
DarthArgus
5c2ecdf79b
remove blank line
2015-10-18 12:54:37 -05:00
DarthArgus
dfd69c2add
duplicate broken tpf
2015-10-18 12:29:28 -05:00
DarthArgus
b1738ebdbc
Merge branch 'master' into 'master'
...
fix a busted tab file
See merge request !4
2015-10-18 05:06:57 -04:00
DarthArgus
889d3ded97
fix broken tab file
2015-10-18 03:47:13 -05:00
DarthArgus
227844f4a0
we at least had this one...
2015-10-18 03:18:27 -05:00
DarthArgus
a5a135e5fe
Merge branch 'master' into 'master'
...
cleanup
See merge request !3
2015-10-17 02:50:57 -04:00
DarthArgus
c6c5635225
repo cleanup
2015-10-17 01:20:46 -05:00
DarthArgus
27dbae72a2
i'm not sure these are supposed to be swap files
2015-10-17 01:17:23 -05:00
DarthArgus
bc61c261be
Merge branch 'master' into 'master'
...
remove old qatool
See merge request !2
2015-10-10 21:52:33 -04:00
DarthArgus
8e05d7acc4
remove old qatool
2015-10-10 20:46:35 -05:00
DarthArgus
95cbf0fb0c
Merge branch 'master' into 'master'
...
Master
merge
See merge request !1
2015-10-06 23:42:57 -04:00
DarthArgus
ce698fd2f3
fixed persistplanet
2015-10-06 01:42:20 -05:00
DarthArgus
1130c8ad4d
add fixed qatool
2015-09-25 23:04:28 -05:00
CodeCodon
ef730f9b89
fix character issue
2015-08-01 18:28:15 -05:00
CodeCodon
819b272591
remove slack file
2015-07-26 23:28:17 -05:00
CodeCodon
4daee7c857
remove btm files
2015-07-26 23:27:36 -05:00
CodeCodon
de7e37655c
Merge branch 'master' of swgilluminati.com:staff/dsrc
2015-07-15 10:32:09 -05:00
CodeCodon
33515448b9
lowercase naming...
2015-07-13 14:46:54 -05:00
CodeCodon
902b4a0162
add default tab for ship fix...prob unneeded but thows annoying errors
2015-07-13 14:46:43 -05:00
DarthArgus and CodeCodon
45bf179357
or backticks
2015-07-13 14:46:35 -05:00
DarthArgus and CodeCodon
87448f7c27
no likey () [] {}
2015-07-13 14:46:08 -05:00
DarthArgus and CodeCodon
88600870e1
fix annoying cipher bug on meatlump puzzle
2015-07-13 14:45:52 -05:00
CodeCodon
b1f7057abe
lowercase naming...
2015-07-12 15:56:47 -05:00
CodeCodon
eb8e364d3b
add default tab for ship fix...prob unneeded but thows annoying errors
2015-07-12 15:07:58 -05:00
DarthArgus
71dd5def7d
or backticks
2015-05-17 18:33:05 -05:00
DarthArgus
0fde01a03e
no likey () [] {}
2015-05-17 18:30:07 -05:00
DarthArgus
0afeb89088
fix annoying cipher bug on meatlump puzzle
2015-05-17 18:27:11 -05:00
DarthArgus
a4ae5fdfc7
! 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
47980fa623
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
6bda05d73b
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
04b195c7fa
Merge remote-tracking branch 'revs/EnthaRepop'
2015-05-17 13:58:31 -05:00
DarthArgus
de5c3c0115
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
426d8a17fb
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
DarthArgus
a1bf7ecbd3
hopefully fix some object templates
2015-05-17 13:47:59 -05:00
DarthArgus
654b67eda3
fix a script logical error
2015-05-17 13:47:58 -05:00
DarthArgus
c4198141c6
Added further furniture
...
Added rebel mission terminals in cantina basement
Added a commoner
Fixed a few issues with furniture orientation
2015-05-17 13:47:57 -05:00
DarthArgus
ee3cf736dc
added more furniture to cantina.
2015-05-17 13:47:56 -05:00
DarthArgus
4d789de9b0
changed rebel recruiters yaw near bank terminal
2015-05-17 13:47:55 -05:00
DarthArgus
798c5bc3b8
Added quest NPC nitra vendallan to Anchorhead cantina (datatable "anchorhead_cantina")
...
Added scripts and object VARS to Nitra vendallan
Added missing furniture (three tables) to Anchorhead cantina:
object/tangible/furniture/tatooine/frn_tatt_table_cantina_table_1.iff
object/tangible/furniture/tatooine/frn_tatt_table_cantina_table_1.iff
object/tangible/furniture/modern/table_modern_style_01.iff
rebel recruiter inside the cantina and near the bank terminal also spawned.
2015-05-17 13:47:55 -05:00
DarthArgus