Commit Graph

3715 Commits

Author SHA1 Message Date
blitzmann
febc2eee09 Add some conditionals to disable Attribute Editor for wxPython 2.8 2015-11-06 20:23:09 -05:00
blitzmann
b302a0a6e5 Weak ciphers aren't needed to CREST it seems (probably was at one point) 2015-11-06 20:06:08 -05:00
blitzmann
1f6a14ee36 Fallback to wx2.8 if 3.0 is not found 2015-11-06 16:04:20 -05:00
blitzmann
99a15af26e Merge pull request #408 from fj/patch-1
Fix typo in README.md
2015-11-06 14:40:43 -05:00
John Feminella
dff7a4d6ac Fix typo in README.md
"liscense" ⇒ "license"
2015-11-06 11:32:28 -05:00
blitzmann
3c8e6a61f2 Fix #406 2015-11-05 20:30:11 -05:00
blitzmann
fb997ab16d bump stable 1.16.1 2015-11-03 22:44:52 -05:00
blitzmann
8fe5f43875 fix some stuff 2015-11-03 22:44:01 -05:00
blitzmann
c8cfee3511 More mac fixes 2015-11-03 22:12:35 -05:00
blitzmann
bf0b89f3b5 Old mac client shouldn't even know about CREST / override. Disable all instances of them for this build. 2015-11-03 21:25:52 -05:00
blitzmann
1d295c04e3 Fix for missing attributes 2015-11-03 20:43:49 -05:00
blitzmann
11ebde87c9 Change attr override window from ctrl+a to ctrl+b 2015-11-03 19:38:03 -05:00
blitzmann
88c4de9820 reintroduce mac-wx3. Split platform build are likely needed right now 2015-11-03 19:28:08 -05:00
blitzmann
09e0a0576c MainFrame pointer was accidentally deleted from characterEditor.py, causing issues. 2015-11-03 19:21:45 -05:00
blitzmann
fc84c5dc94 Whoops 2015-11-03 13:24:49 -05:00
blitzmann
687ebbc41b Bump Stable 2015-11-03 06:21:29 -05:00
blitzmann
0abe953a70 Update dist script to replace mac skel 2015-11-02 21:34:55 -05:00
blitzmann
2a8f3e4855 Merge branch 'singularity' 2015-11-02 21:28:26 -05:00
blitzmann
8cd36f3cbf Add item renames 2015-11-02 21:06:54 -05:00
blitzmann
5577e1976b Update to SISI w/ effects 2015-11-02 20:55:23 -05:00
blitzmann
4b27becb5f Merge branch 'overrides' into singularity
Conflicts:
	eos/db/__init__.py
	eos/db/saveddata/__init__.py
	eos/db/saveddata/queries.py
	gui/mainFrame.py
	gui/mainMenuBar.py
2015-11-02 19:01:12 -05:00
blitzmann
3c055b78d3 Fix clearing of all overrides 2015-11-02 18:55:21 -05:00
blitzmann
eb5ce91cb2 Fix gitignore 2015-11-02 18:47:06 -05:00
blitzmann
ef36dc5ba3 Import/export/clear overrides, add missing files due to bad gitignore entry 2015-11-02 18:45:56 -05:00
blitzmann
d9c710c5a1 Minor improvements 2015-11-01 21:36:04 -05:00
blitzmann
c436e0e669 Create a proper menu item toggle for overrides 2015-11-01 21:19:49 -05:00
blitzmann
e80917e3d1 Things are saved now via GUI 2015-11-01 20:52:22 -05:00
blitzmann
0d0ec42daf Initial GUI commit. Still need to actually handle the attribute change 2015-11-01 19:49:22 -05:00
blitzmann
0e4cca6138 Load overrides from database 2015-11-01 15:00:09 -05:00
blitzmann
b701acb275 Overrides work properly now. Currently toggled on/off by opening character editor, this will be taken over by a menu option 2015-11-01 13:02:29 -05:00
blitzmann
4eb61051c6 Add overrides to the modifiedAttributeDict. Still need to figure out how to switch between the original and the override 2015-11-01 12:04:02 -05:00
blitzmann
56aba37758 Fix PoC so that it actually works, and add a working test case for Web II (changing speedfactor to -80%) 2015-11-01 09:43:34 -05:00
blitzmann
f432b08149 Proof of concept. Need to save overrides in user database and create GUI for it. May be difficult to collect and apply considering the Item container is attached to the eve db and not the user. 2015-10-31 16:53:20 -04:00
blitzmann
3e0b2fd09c Add debug info 2015-10-31 16:52:10 -04:00
blitzmann
c7b8d94e4f Merge branch 'crest_fitting' into singularity 2015-10-31 15:02:24 -04:00
blitzmann
31a9b03436 Merge pull request #390 from OISumeko/weaponStagger
Added option for disabling capacitor simulation staggering for certain modules
2015-10-31 14:55:22 -04:00
blitzmann
f33f558006 Fix prep_data.py 2015-10-31 14:27:43 -04:00
blitzmann
bb4fe63a7c Add CREST preference icon (basic EVE icon), and fix menus when changing modes and whatnot 2015-10-31 14:10:41 -04:00
blitzmann
ccb9e085b2 Setting to change server for CREST, and some other improvements. 2015-10-31 13:20:13 -04:00
Cameron Grout
702d249bad Updated turret detection as advised 2015-10-31 16:15:35 +13:00
Cameron Grout
cc2835a341 Turrets of the same type now do not stagger
Playing with the cap simulator, I noticed that turrets of the same type
stack and have staggering applied when running through the cap
simulator. This is not realistic behaviour as most (all?) pilots will
have grouped their turrets in-game, meaning they will all activate
simultaneously rather than activating individually, offset from
each other.

This change introduces a 'disable stagger' field to the drain tuple that
is passed through to the cap simulator, allowing us to disable
staggering on certain modules. This will enable us to add GUI options in the
future to allow users to choose whether to stagger certain modules (eg,
cap boosters, neuts) or have them all fire simultaneously. Currently
this defaults to False (existing behavior) for all modules except for
turrets, which will now behave more like in-game turrets for cap
simulation purposes.
2015-10-31 15:30:20 +13:00
blitzmann
d73c53cb10 Merge pull request #389 from OISumeko/issue300
Fix for issue #300
2015-10-30 21:26:39 -04:00
OISumeko
73409a3324 Fix for issue 300
Modified capsim so that for non-capstable fits, the capacitor time will
indicate the time at which the first module failed to activate due to
insufficient capacitor rather than the time of the last successful
activation.
2015-10-31 14:14:44 +13:00
blitzmann
24f770aa7b Use + instead of space (fixes an Iceweasel browser issue) 2015-10-30 21:09:06 -04:00
blitzmann
649b99d7bd Another possible fix for server issues. 2015-10-30 21:07:56 -04:00
blitzmann
a8b50032c4 Merge pull request #388 from OISumeko/master
Fix for 387
2015-10-30 12:41:40 -04:00
Cameron Grout
d1d276ae68 Fix for 387
Modified capsim to deal with reload/clipSize logic before grouping
modules for staggering. This prevents loaded AARs from being sent
through as seperate cap drain elements to other repairers of the same
size.
2015-10-30 16:18:33 +13:00
blitzmann
6eafbb0a25 Possible fix for server issues. Instead of using a timer, use the socket timeout, and ensure that we stop server before spawning a new one. 2015-10-28 21:25:01 -04:00
blitzmann
aedd7ce2de Add support to delete fit from EVE 2015-10-26 21:27:54 -04:00
blitzmann
b0511ed856 Delete crest chars when changing client settings 2015-10-26 23:54:42 -04:00