petosorus
|
b6871c72ca
|
Merge remote-tracking branch 'origin/price-system-selection' into price-system-selection
# Conflicts:
# gui/builtinStatsViews/priceViewFull.py
|
2017-02-09 23:33:14 +01:00 |
|
petosorus
|
aaece725aa
|
Saving price system preference
|
2017-02-09 23:26:31 +01:00 |
|
petosorus
|
bfa772609a
|
Transfer of the price dropbox in the preferences pane.
Moving of the modules list compiling from priceview to price service.
|
2017-02-09 18:27:26 +01:00 |
|
petosorus
|
d15acf89ba
|
refresh modules price view
|
2017-02-09 18:27:26 +01:00 |
|
petosorus
|
d25673b8fe
|
Price listing price panel
|
2017-02-09 18:27:26 +01:00 |
|
petosorus
|
9df54238d9
|
refresh modules price view
|
2017-01-05 00:18:20 +01:00 |
|
petosorus
|
fcd934319d
|
Price listing price panel
|
2017-01-05 00:18:20 +01:00 |
|
petosorus
|
48ccc7ff06
|
System list
|
2017-01-05 00:18:17 +01:00 |
|
petosorus
|
edc48f0017
|
beginnings of price system choice
|
2017-01-05 00:17:56 +01:00 |
|
tgraviou
|
2f2800c360
|
System list
|
2016-11-24 12:00:53 +01:00 |
|
tgraviou
|
7eb3ad98fa
|
beginnings of price system choice
|
2016-11-21 17:38:28 +01:00 |
|
petosorus
|
54c950f951
|
Multibuy format export feature
|
2016-09-14 23:38:09 +02:00 |
|
blitzman
|
ef06a1ccb1
|
Merge remote-tracking branch 'origin/master'
|
2016-08-30 23:16:12 -04:00 |
|
Ryan Holmes
|
9f9cd29a7f
|
Merge pull request #712 from pyfa-org/feature/citadels
Feature/citadels
|
2016-08-30 09:23:34 -04:00 |
|
blitzman
|
c5b78c20e5
|
Do not allow projection to citadels
|
2016-08-28 20:00:46 -04:00 |
|
blitzman
|
f98f6a120b
|
Bump dev, fix issue with applying fleet boosts
|
2016-08-28 19:35:55 -04:00 |
|
blitzman
|
fd91f56e55
|
Give citadels their own Upwell logo
|
2016-08-24 21:46:14 -04:00 |
|
PageArkanis
|
9ace9815b6
|
fixed exception that froze interface
|
2016-08-19 15:11:06 +01:00 |
|
blitzmann
|
faed0ce159
|
Merge remote-tracking branch 'origin/master' into citadel
Conflicts:
config.py
|
2016-07-16 21:45:28 -04:00 |
|
blitzmann
|
45d338ba3d
|
Add price to item compare (#673)
|
2016-07-06 22:30:31 -04:00 |
|
blitzmann
|
f141fac3a2
|
Add fighters to overall fitting price (#674)
|
2016-07-05 23:34:19 -04:00 |
|
blitzmann
|
4d158d99fd
|
Fix crash related to structure rigs not having meta level, and a traceback that might happen occasionally.
|
2016-07-05 23:23:55 -04:00 |
|
blitzmann
|
1c194b67f3
|
Restrict projected view after speaking with CCP Larrikin about mechanics
|
2016-07-04 11:18:47 -04:00 |
|
blitzmann
|
72e77d2264
|
Fix some wording
|
2016-07-04 11:05:50 -04:00 |
|
blitzmann
|
10c79ac812
|
More work on restrictions
|
2016-07-04 11:01:08 -04:00 |
|
blitzmann
|
fe8c3a4957
|
Disable fit add on pages based on context (ship vs citadel)
|
2016-07-04 10:30:04 -04:00 |
|
blitzmann
|
6e2878194c
|
Merge branch 'master' into citadel
Conflicts:
config.py
service/market.py
|
2016-07-03 01:10:26 -04:00 |
|
blitzmann
|
7020f4bda9
|
Fix compare when item doesn't have a meta (#667)
|
2016-07-03 00:38:22 -04:00 |
|
blitzmann
|
2df01c7157
|
Merge branch 'singularity'
|
2016-07-01 22:04:25 -04:00 |
|
blitzmann
|
01a0745b9b
|
Update database and fix some icon related bugs
|
2016-07-01 22:03:51 -04:00 |
|
blitzmann
|
b9f0812b38
|
Fix issue with entity editor and wxPython 2.8
|
2016-06-28 23:24:01 -04:00 |
|
blitzmann
|
c8175d1191
|
Only compare attributes with display names (ones that don't have display names are normally internal attributes)
|
2016-06-23 23:19:08 -04:00 |
|
blitzmann
|
7a7a0f1eff
|
Merge branch 'feature/item-compare' into singularity
|
2016-06-23 22:57:09 -04:00 |
|
blitzmann
|
5176fe0366
|
Sort by meta level
|
2016-06-23 22:56:40 -04:00 |
|
blitzmann
|
b4bd6e7acd
|
Ensure we have an active fit when exporting to crest
|
2016-06-23 22:44:24 -04:00 |
|
blitzmann
|
d9fc3d436b
|
Allow EHP toggle to persist between fits (#641)
|
2016-06-19 23:50:42 -04:00 |
|
blitzmann
|
ed3b2eb1bf
|
Fix energy warfare
|
2016-06-19 23:04:52 -04:00 |
|
blitzmann
|
faa9c0a2b9
|
Fix my merge fail
|
2016-06-18 23:29:53 -04:00 |
|
Ryan Holmes
|
0456973093
|
Merge pull request #639 from Ebag333/default-database-profiles
Default database profiles
|
2016-06-18 23:25:07 -04:00 |
|
blitzmann
|
4a79a4e4d9
|
Merge remote-tracking branch 'origin/master'
Conflicts:
gui/mainMenuBar.py
|
2016-06-18 23:14:23 -04:00 |
|
Ebag333
|
b79009517e
|
Updated po-ta-toe to po-tah-toh
|
2016-06-16 14:46:22 -07:00 |
|
Ebag333
|
47828c38d2
|
Merged differences from master (more catching up)
|
2016-06-15 19:40:45 -07:00 |
|
blitzmann
|
afdae6a3d6
|
Added first iteration of item comparisons.
|
2016-06-15 22:26:48 -04:00 |
|
Ebag333
|
03d1d8f5a4
|
Merged changes from pyfa-org/master into branch
Merged changes to see if we can clear up the merge conflict warning
|
2016-06-15 18:24:40 -07:00 |
|
Ryan Holmes
|
cc4e4c0f13
|
Merge pull request #649 from Ebag333/ECM-Misc-Column-Improvements
Updated ECM to be more descriptive
|
2016-06-13 21:21:29 -04:00 |
|
Ebag333
|
2f6f14fef2
|
Update misc.py
|
2016-06-13 18:14:41 -07:00 |
|
Ryan Holmes
|
fb590ddfdd
|
Merge pull request #644 from Ebag333/Item-Attributes--Show-Base-Value
Added base column to item window
|
2016-06-13 20:44:15 -04:00 |
|
Ryan Holmes
|
a5e674cdc4
|
Merge pull request #650 from Ebag333/Group-Attribute-Overrides-Menu
Grouped Attributes override
|
2016-06-13 20:37:56 -04:00 |
|
blitzmann
|
e28883dd47
|
Merge branch 'default-database-profiles' of git://github.com/Ebag333/Pyfa
|
2016-06-13 20:01:35 -04:00 |
|
Ebag333
|
b4694dcf03
|
Implemented menu option to import default database values
Allows for existing databases to be updated with the current default
profiles. Can also be used to inject other defaults (maybe 0 and V
chars?)
|
2016-06-13 14:13:38 -07:00 |
|