Commit Graph
3946 Commits
Author SHA1 Message Date
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 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 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 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 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 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 dd7f22d341 Merge remote-tracking branch 'revs/EnthaRepop' 2015-05-17 13:58:31 -05:00
DarthArgus 04b195c7fa 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 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 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 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 c50ed7d404 hopefully fix some object templates 2015-05-17 13:47:59 -05:00
DarthArgus a1bf7ecbd3 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 654b67eda3 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 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 b7f53bdc4e added more furniture to cantina. 2015-05-17 13:47:56 -05:00
DarthArgus ee3cf736dc 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 4d789de9b0 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 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 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 1c19cece7e 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 b975d6ec60 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 07aeda55eb 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 00bfebdca7 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 df7a3ad9ea 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 09aa352478 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 cf74c96246 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 a36a581e85 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
DarthArgus 58fcebb41d 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
NightSister e38baa1bcd 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
NightSister 88a2ad69ab 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
NightSister 018f77f9ae 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
NightSister f0b0141c6c further work on bespin house 2015-05-15 20:43:42 +01:00