blitzmann
9029c04ce6
Merge branch 'master' into singularity
2015-11-27 22:45:28 -05:00
blitzmann
c7c0c49218
Fix #434
2015-11-27 20:12:02 -05:00
blitzmann
350f4c9f89
Add new effects. This commit uses a new helper script that automatically writes the effect file for the more straightforward effects.
2015-11-27 01:14:59 -05:00
blitzmann
9c9a6b69fe
Revert "Add new nos/neut effect files, and change module/drone files to account for new attributes. This does not add the database"
...
This reverts commit 7dbe6dbe2d
2015-11-27 00:07:24 -05:00
blitzmann
7dbe6dbe2d
Add new nos/neut effect files, and change module/drone files to account for new attributes. This does not add the database
2015-11-22 23:03:46 -05:00
blitzmann
2a8f3e4855
Merge branch 'singularity'
2015-11-02 21:28:26 -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
ef36dc5ba3
Import/export/clear overrides, add missing files due to bad gitignore entry
2015-11-02 18:45:56 -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
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
781abeea53
Implement a character cache, as the database-layer cache is seemingly not working. =/
2015-10-25 19:41:12 -04:00
blitzmann
1ce2921eb7
Put current character info in titlebar, and disable getting image.
2015-10-25 18:14:12 -04:00
blitzmann
c04b7e0552
Revert "Add tomorrow to repo rather than dependency" - going to including it in skel rebuild
...
This reverts commit ff87d5e456
2015-10-24 22:51:46 -04:00
blitzmann
ff87d5e456
Add tomorrow to repo rather than dependency
2015-10-24 22:39:43 -04:00
blitzmann
c81774a3aa
Move pycrest to service (might move it to utils later, dunno)
2015-10-24 22:28:31 -04:00
blitzmann
a5920a9c9c
Added missing files (and fix why they were missing)
2015-10-24 16:46:45 -04:00
blitzmann
a67b46bb9a
Fix some mining effects
2015-10-05 20:37:41 -04:00
blitzmann
f17fb82ce7
Fix issue with ship bonuses not applying when fit is projected ( #374 )
2015-10-05 18:10:39 -04:00
blitzmann
a5f1370eec
Fit system effects not applying to projected fits.
2015-10-04 13:17:13 -04:00
blitzmann
05b9d1e607
Fixed some bugs, added character action buttons on editor
2015-09-25 12:13:17 -04:00
blitzmann
2a88e3114b
Skill color goes back to normal when saving/reverting skill.
2015-09-25 11:15:08 -04:00
blitzmann
a0f9fb6ad6
Enable/disable edit menu options, and add color to character editor to show which skills are edited
2015-09-24 22:11:31 -04:00
blitzmann
61614553a2
Fix bug with char copy, and added char revert and save as (unfinished)
2015-09-24 19:03:30 -04:00
blitzmann
ae870f9535
Merge branch 'newTempChar'
2015-09-24 17:16:14 -04:00
blitzmann
30a8437515
Fix returning unicode with __repr__ and __str__. Fixes #356
2015-09-24 14:15:54 -04:00
blitzmann
a08bb2494b
Fix system effect states
2015-09-22 21:45:32 -04:00
blitzmann
3ea4439b8d
Allow changing all 5 and 0 from editor
2015-09-18 11:59:52 -04:00
blitzmann
bd53785667
Allow all 5 and 0 to change skills from affecting skill menu
2015-09-14 20:35:36 -04:00
blitzmann
f2b4400834
Do auto-save when editing in character editor.
2015-09-14 20:30:12 -04:00
blitzmann
b8d01d5ecb
Fix a few things
2015-09-13 16:59:59 -04:00
blitzmann
2c7bfd14b6
Revert "Separate characters from Fit relationship..."
...
This reverts commit 3521b3887d
2015-09-13 16:53:42 -04:00
blitzmann
1584586fd2
Try a different approach to temp skill levels
2015-09-13 16:51:36 -04:00
blitzmann
4663270067
Since we now have a list of skills by default on our character, remove the iterSkills iterator which helped fetch skills that were not previously loaded
2015-09-12 11:06:21 -04:00
blitzmann
0b9cdaa944
Change the way skills are loaded. We now load all skills when character is created, instead of just creating character and loading skills on demand. This fixes a bug in which new characters were not saving their skills to the database.
2015-09-12 10:59:44 -04:00
blitzmann
89c011d37e
Minor modifications.
2015-09-12 10:30:51 -04:00
blitzmann
ca34217f3b
Added character saving.
...
Deleting characters is broken for now due to using wrong session, but I believe creating character works. Further tests needed
2015-09-09 20:33:15 -04:00
blitzmann
3521b3887d
Separate characters from Fit relationship and create new character session. At this point, changes to characters do not persist. Efforts must still be made to focus on creating a character save function as well as ensure characters that are dirty are loaded correctly for fresh fits.
2015-09-09 19:08:38 -04:00
blitzmann
decf7ff028
Fix #351
2015-09-01 23:23:52 -04:00
blitzmann
6e95f69565
Support speedLimit introduced with Entosis Link
2015-08-25 17:26:25 -04:00
Ryan Holmes
01db1efdf7
Merge pull request #336 from blitzmann/regSkills
...
Register skills when applying ship bonuses
2015-07-23 15:58:07 -04:00
blitzmann
e74e2615ad
Merge remote-tracking branch 'origin/projections'
2015-07-23 15:46:32 -04:00
blitzmann
9de3600d7f
Fix self-boosting
2015-07-23 01:38:51 -04:00
blitzmann
5a4f526b2b
Fix fit copying
2015-07-22 14:27:44 -04:00
blitzmann
17733d5951
Added missing tactical mode calculations... whoops
2015-07-22 13:02:08 -04:00
blitzmann
182104a010
Fix #109
2015-07-19 16:20:42 -04:00
blitzmann
71b258a8f5
Merge fit attributes with ship
2015-07-17 16:32:42 -04:00
blitzmann
cd7579a4bf
Fix #332 - offline rigs calculated in calibration stats
2015-07-17 00:01:31 -04:00
blitzmann
d6199a58c2
Separate projected fits from list of affectors. Also, show when affected module is projected. Still need to clean up affector tree stuff
2015-07-16 23:59:37 -04:00
blitzmann
3ad5aaac89
Fix #331 - gang boosts not applied to self projection
2015-07-15 16:52:09 -04:00
