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
DarthArgus and CodeCodon
1dfc51fa69
or backticks
2015-07-13 14:46:35 -05:00
DarthArgus and CodeCodon
1046d73824
no likey () [] {}
2015-07-13 14:46:08 -05:00
DarthArgus and CodeCodon
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
DarthArgus
c50ed7d404
hopefully fix some object templates
2015-05-17 13:47:59 -05:00
DarthArgus
98f67ac56b
fix a script logical error
2015-05-17 13:47:58 -05:00
DarthArgus
bc033a7278
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
b7f53bdc4e
added more furniture to cantina.
2015-05-17 13:47:56 -05:00
DarthArgus
781136737e
changed rebel recruiters yaw near bank terminal
2015-05-17 13:47:55 -05:00
DarthArgus
681405813c
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
cd58727f64
Added missing rebel recruiter inside basement of anchorhead cantina
...
Added missing rebel recruiter near bank terminal.
2015-05-17 13:47:54 -05:00
DarthArgus
58756bb23d
Added commoners and other world NPCs to Mos Entha City, Starport and Theater.
...
Needs further work.
2015-05-17 13:47:00 -05:00
DarthArgus
7cf9ddf1c3
Added commoners, rebel recruiter and junk dealers to WORLD monea
2015-05-17 13:46:59 -05:00
DarthArgus
c5d9a45605
Added 100's of last day publish NPC's to a new datatable and attached relevant spawning scripts to naboo_2_7_ws file.
2015-05-17 13:46:58 -05:00
DarthArgus
8db25b06c3
added terminals to cloud house
2015-05-17 13:46:57 -05:00
DarthArgus
238f827509
bespin house_ tons of fixes. house now spawns
2015-05-17 13:46:56 -05:00
DarthArgus
17460c1002
Added more fixes to bespin house. Deed now spawns. Templates added. Building not spawing still
2015-05-17 13:46:56 -05:00
DarthArgus
8488c1ecdb
further work on bespin house
2015-05-17 13:46:32 -05:00
DarthArgus
1ad62d4627
files associated with cloud house implementation
2015-05-17 13:46:07 -05:00
Redacted by Stellabellum INC
682416e4af
added terminals to cloud house
2015-05-17 01:49:20 +01:00
Redacted by Stellabellum INC
ab5f74f5c1
bespin house_ tons of fixes. house now spawns
2015-05-17 00:51:57 +01:00
Redacted by Stellabellum INC
61733e3940
Added more fixes to bespin house. Deed now spawns. Templates added. Building not spawing still
2015-05-16 16:59:33 +01:00
Redacted by Stellabellum INC
2a430aeafc
further work on bespin house
2015-05-15 20:43:42 +01:00
DarthArgus