swg-source-1.2/dsrc-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/dsrc-1.2.git synced 2026-01-15 23:04:22 -05:00
Code Issues Projects Releases Wiki Activity
3,743 Commits 3 Branches 0 Tags
master
Commit Graph

3743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tekaoh
7b2d9d0fb2 Merged in tekaoh/dsrc-1.2/soloposter (pull request #3) 
Added templates for solo poster

Approved-by: Tekaoh <mrkvchm@gmail.com>
Approved-by: Cekis SWG <cekisswg@gmail.com>
 2018-10-11 04:44:00 +00:00
Tekaoh
a909665298 Fixed path in solo template 2018-10-10 20:03:30 -05:00
Tekaoh
b51db621a7 Added templates for solo poster 2018-10-10 19:50:59 -05:00
Tekaoh
dfdb63b84e Merged theswgsource/dsrc-1.2 into master 2018-10-10 17:30:00 -05:00
Alec Harley
6d8123922b Merged in fix_tieln_requirements (pull request #2) 
fix TIE/LN requirements - library.space_utils

Approved-by: Cekis SWG <cekisswg@gmail.com>
 2018-10-10 17:12:36 +00:00
Alec Harley
07be4e75b4 fix TIE/LN requirements - library.space_utils 2018-10-10 16:43:17 +00:00
Cekis SWG
4225739975 Fix the drinking glass error. 2018-10-08 07:25:20 +00:00
CekisSWG
7f30064531 Put in a fix (slight hack) to handle negative location changes when using the homing beacon. 2018-10-07 06:59:12 +01:00
Cekis SWG
634ca3b1d6 Fixed issues with mining lasers 2018-10-05 22:42:18 +00:00
CekisSWG
2756d77594 Merge branch 'master' of https://bitbucket.org/theswgsource/dsrc-1.2 2018-07-25 06:18:19 +01:00
CekisSWG
c240203222 Fixed issue where Space GCW fighters were not awarding GCW points. 2018-07-25 06:17:56 +01:00
erusman
3caf78884f update frog TCG House pack now generates all TCG houses and Jabba's sailbarge 2018-07-01 14:32:14 -07:00
erusman
830d806e73 fix typo on item_schematic_efol_prop_sparkler_r 2018-06-29 21:44:47 -07:00
erusman
665c98e3c3 update EFoL vendor with 2011 items 2018-06-29 21:30:07 -07:00
erusman
e370d7d430 minor EFoL update to allow all prof to equip 2011 flowers 2018-06-29 20:34:00 -07:00
erusman
885544694a initial commit for 2011 Ewok Festival of Love items 2018-06-29 19:37:37 -07:00
erusman
c373d19ef6 add additional wookiee vendor to celebration plus randomize the lifeday gifts so players could have chance to receive items from previous years 2018-06-28 17:23:00 -07:00
erusman
35399d3480 add 2011 Lifeday gifts/badge to lifeday_tree.java Changed default player eligibility to receive Lifeday gifts from 10 to 5 days 2018-06-28 16:24:57 -07:00
erusman
00d12d5bea add 2011 Lifeday robe to master_item 2018-06-28 16:14:07 -07:00
erusman
39bd96e789 few corrections to 2010 lifeday gift box items 2018-06-28 16:12:16 -07:00
theswgsource
311eef38f5 corrects title of tauntaun dna item on the bm vendor 2018-06-28 08:38:33 -07:00
theswgsource
f3ff88f4a3 Merge branch 'master' of https://bitbucket.org/theswgsource/dsrc-1.2 2018-06-28 06:18:51 -07:00
theswgsource
5b15f0bb76 merge conflict on master_item.tab 2018-06-28 06:18:11 -07:00
erusman
f4348c636d add 2010 Lifeday ornament & Musician Figrin D'an jacket 2018-06-27 16:37:04 -07:00
erusman
7d2a0b4999 add 2010 Lifeday Paintings s01 s02 s03 s04 to master_item table 2018-06-27 15:59:18 -07:00
erusman
69699c4045 add 2011 Lifeday gift boxes / items to datatables master_item item_stats 2018-06-27 14:00:23 -07:00
erusman
bf19861564 initial commit for additional 2011 Lifeday items 2018-06-27 13:58:12 -07:00
erusman
83da0b440b fix compile error from 0685be9 commit, double entry on ponda arm 2018-06-27 11:55:18 -07:00
theswgsource
0685be9c56 initial commit for missing vet rewards 2018-06-27 01:04:53 -07:00
erusman
385f9bec5a another fix for Empire Day converstaion string Rebel Capt. Derlin 2018-06-26 15:00:21 -07:00
erusman
952357422b fix Empire Day conversations Imperial Kaythree and Rebel Capt. Derlin 2018-06-26 13:49:29 -07:00
erusman
fcaed2b9c3 add AT_XT AT_ST vehicles from Empire Day vendors to vehicle_template & stats 2018-06-26 05:16:45 -07:00
erusman
b04194be77 update to master_item and item_stats tab for final day Empire day vendor items 2018-06-26 05:14:35 -07:00
erusman
cd42d3ed1f add Rebel scum Empire Day final day items to vendor 2018-06-26 05:12:01 -07:00
erusman
84977cbe96 add Imperial Empire Day final day items to vendor 2018-06-26 05:10:38 -07:00
theswgsource
9145597370 adds beast muzzle, shock collar & auto-feeder to the BM vendor 2018-06-25 16:42:03 -07:00
theswgsource
0f39af4b88 Merge branch 'master' of https://bitbucket.org/theswgsource/dsrc-1.2 2018-06-25 16:40:50 -07:00
theswgsource
84851dcd7d removes Mustafar / Kashyyyk travel restrictions from the Flight Of The Veteran reward item 2018-06-25 16:38:39 -07:00
erusman
3ac02b2187 fix broken Major Tantor conversation strings, Empire Day 2018-06-24 18:19:51 -07:00
erusman
345e784cd2 fix broken Mara Jade conversation strings, Empire Day 2018-06-24 18:08:33 -07:00
erusman
38d82c8f1c more updates to frog with holoshrouds spawn options for costume testing 2018-06-24 17:01:31 -07:00
erusman
6f4e434a16 update frog with token spawn options for event testing 2018-06-24 16:41:24 -07:00
theswgsource
e16c0a2d68 Merge branch 'master' of https://bitbucket.org/theswgsource/dsrc-1.2 2018-06-24 10:36:22 -07:00
theswgsource
8c5ac72b4e restores missing mounts (snorbal / reptilian flier / binjinphant / whisper bird 2018-06-24 10:35:47 -07:00
erusman
b107ca6e59 fix for null pointer exception trick_or_treater.java 2018-06-24 01:28:33 -07:00
erusman
091a377f18 fix buff for halloween ponda hand/arm 2018-06-24 00:37:17 -07:00
erusman
2b7f41e718 another fix for 2011 GMF badge 2018-06-23 23:18:07 -07:00
erusman
bd1f84437c add Galactic Moon Festival 2011 badge 2018-06-23 23:04:47 -07:00
erusman
27535b1b77 update halloween vendor 2010 / 2011 items 2018-06-23 22:19:06 -07:00
erusman
adc5ae0d04 add halloween ponda hand to master_item 2018-06-23 22:10:01 -07:00