Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1720 commits
Select commit Hold shift + click to select a range
2ec9dba
Blast damage to all parts within 10% of the blast radius
jrodrigv Nov 25, 2018
829e57b
ignoring files
jrodrigv Nov 25, 2018
bc522d8
Fixing explosion with detonation distance 0
jrodrigv Nov 25, 2018
1f666dc
modular missiles enhancements
jrodrigv Nov 25, 2018
0b98a96
update deviations
Gedas-S Nov 29, 2018
eb0c717
adding explosion potential
jrodrigv Dec 1, 2018
e0a79cf
Update EngageableWeapon.cs
SuicidalInsanity Dec 4, 2018
28f227d
Update MissileFire.cs
SuicidalInsanity Dec 4, 2018
a168b75
Merge pull request #1 from SuicidalInsanity/patch-2
SuicidalInsanity Dec 4, 2018
1bd5d5c
Update ModuleWeapon.cs
SuicidalInsanity Dec 4, 2018
f47940a
Merge pull request #2 from SuicidalInsanity/patch-2
SuicidalInsanity Dec 4, 2018
4ee29b6
Update PartExtensions.cs
Acea-K Dec 5, 2018
43ce59f
Ignoring local files
jrodrigv Dec 16, 2018
03ea759
Modular missiles fixes
Dec 16, 2018
a21b2ee
fix for detonation on proximity
jrodrigv Dec 26, 2018
f58ee20
fixing hitpoints calculations for mods like AP+
jrodrigv Dec 26, 2018
0f3d37c
removing hitpoints persistant #598
jrodrigv Dec 26, 2018
1db1cb1
Merge from master
jrodrigv Dec 27, 2018
3bec2e8
Merge branch 'pr/606-feature-weapon-groups' into dev
jrodrigv Dec 27, 2018
d727025
fixing merge
jrodrigv Dec 27, 2018
5c055f5
New version for KSP 1.6
jrodrigv Dec 28, 2018
d626670
Merge pull request #615 from jrodrigv/dev
jrodrigv Dec 28, 2018
8bbc297
Merge pull request #616 from PapaJoesSoup/dev
jrodrigv Dec 28, 2018
a467280
Merge branch 'papas/master'
jrodrigv Dec 28, 2018
55567f5
Merge branch 'dev'
jrodrigv Dec 28, 2018
dbbb18f
fixing weapon group text
jrodrigv Dec 30, 2018
62e5bfd
Merge branch 'dev'
jrodrigv Dec 30, 2018
12ce58b
Merge pull request #618 from jrodrigv/master
jrodrigv Dec 30, 2018
9272bc7
Fix for ripple fire
SuicidalInsanity Dec 30, 2018
97a6c64
limit acceleration extrapolation
Gedas-S Jan 4, 2019
0f369e1
final fix to ripple code
SuicidalInsanity Jan 7, 2019
8ed108d
Merge pull request #621 from Gedas-S/aim_accel_noise_fix
Gedas-S Jan 8, 2019
be828be
AI can now blow itself up with torpedoes like a boss
Gedas-S Jan 9, 2019
fe2ab7f
Enable sonar if torpedoes are selected
Gedas-S Jan 9, 2019
2886095
Merge pull request #624 from Gedas-S/ai_torpedoes
Gedas-S Jan 9, 2019
97c82fc
Remove legacy targeting
Gedas-S Jan 9, 2019
13d5d0b
rename legacyTargetVessel to visualTargetVessel
Gedas-S Jan 9, 2019
bb41c50
empty group resets the weapon nicely
Gedas-S Jan 9, 2019
dcaee4a
remove max physics range
Gedas-S Jan 10, 2019
da2fea3
remove guard mode "scanning"
Gedas-S Jan 10, 2019
044cac6
save old shortname
Gedas-S Jan 10, 2019
b5cb2b9
Fixes for Flak weapons
SuicidalInsanity Jan 10, 2019
e01cf85
Merge pull request #607 from Acea-K/Acea-K-patch-1
Gedas-S Jan 11, 2019
821f4a7
missile turrets no longer bypass drop time
Gedas-S Jan 13, 2019
dc1dec8
Merge pull request #631 from Gedas-S/missile_turrets_no_longer_bypass…
Gedas-S Jan 14, 2019
926abd1
Merge pull request #625 from Gedas-S/remove_guard_mode_scan_and_legac…
Gedas-S Jan 14, 2019
e101146
remove test parts with duplicated names
Gedas-S Jan 15, 2019
c631f34
Merge pull request #632 from Gedas-S/remove_test_parts
Gedas-S Jan 15, 2019
112c891
Update TargetInfo.cs
SuicidalInsanity Jan 20, 2019
f312bf3
Merge pull request #636 from SuicidalInsanity/patch-6
Gedas-S Jan 20, 2019
d9b0a85
fix capitalization
Gedas-S Jan 20, 2019
6395132
Merge pull request #638 from Gedas-S/fix_pilot_chivalry_2
Gedas-S Jan 20, 2019
aecf062
update for dev changes
Gedas-S Jan 20, 2019
3baa8c7
BDTeam object
Gedas-S Jan 11, 2019
20f0ebf
a bit of team changing logic
Gedas-S Jan 11, 2019
aa150ba
Update team object
Gedas-S Jan 11, 2019
2040c12
WIP
Gedas-S Jan 13, 2019
6ff6058
fix unnecessarily convoluted if
Gedas-S Jan 16, 2019
a23c0f5
target and gps databases update for new teams
Gedas-S Jan 16, 2019
49793d3
update competition mode to deal with multiple teams
Gedas-S Jan 16, 2019
180dd06
Remove legacy objects
Gedas-S Jan 16, 2019
1dfc98a
remove legacy target stuff
Gedas-S Jan 16, 2019
b0bfdcd
update vessel switcher
Gedas-S Jan 16, 2019
ce6c43c
TargetInfo updates
Gedas-S Jan 17, 2019
0450de2
Cannot figure out how to fix this one, maybe I can just delete it?
Gedas-S Jan 17, 2019
d8d758a
use unity json
Gedas-S Jan 17, 2019
582d3a0
minor fixes
Gedas-S Jan 17, 2019
aa1f71e
kspfield json compat
Gedas-S Jan 17, 2019
ce8e1ae
Fix GPS serialization
Gedas-S Jan 18, 2019
e2eb558
fix competition mode
Gedas-S Jan 18, 2019
6516f3f
fix misc new bugs
Gedas-S Jan 18, 2019
1e6af02
BDTeamSelector
Gedas-S Jan 19, 2019
7a063f7
fix SLW selection nullrefs and add blocks to the cases for compiler s…
Gedas-S Jan 20, 2019
57ccd71
No longer report friendlies
Gedas-S Jan 20, 2019
f5c1464
update changelog
Gedas-S Jan 20, 2019
a035c1d
customizable clearance radius
Gedas-S Jan 21, 2019
f2127f0
customizable clearance for modular missiles
Gedas-S Jan 21, 2019
3f38e8f
save gps targets when changed
Gedas-S Jan 22, 2019
40cb14e
Merge pull request #639 from Gedas-S/multiple_teams
Gedas-S Jan 23, 2019
f9c5d23
Merge pull request #634 from Gedas-S/rayleygh_spread
Gedas-S Jan 23, 2019
6857375
Merge pull request #640 from Gedas-S/clerance_enhancements
Gedas-S Jan 23, 2019
f66e0f1
Merge pull request #619 from SuicidalInsanity/patch-2
Gedas-S Jan 23, 2019
afd614d
Merge pull request #626 from SuicidalInsanity/patch-5
Gedas-S Jan 23, 2019
f9b5593
Revert "Fix for ripple fire"
Gedas-S Jan 23, 2019
077b565
Merge pull request #642 from PapaJoesSoup/revert-619-patch-2
Gedas-S Jan 23, 2019
0c73cfd
Merge pull request #643 from PapaJoesSoup/master
Gedas-S Jan 23, 2019
a7d6052
Fix for ripple fire
SuicidalInsanity Dec 30, 2018
04b75ad
final fix to ripple code
SuicidalInsanity Jan 7, 2019
7de7ca3
fix indent
Gedas-S Jan 23, 2019
f5eeb26
Merge pull request #644 from Gedas-S/SuicidalInsanity-ripple-fix
Gedas-S Jan 23, 2019
5218f5f
update changelog for SuicidalInsanity's changes
Gedas-S Jan 23, 2019
0cb6144
Merge pull request #645 from Gedas-S/update_changelog
Gedas-S Jan 23, 2019
f38c855
Reduce safety check distance
Gedas-S Jan 25, 2019
de49c73
only run weapon simulation when it can be used
Gedas-S Jan 25, 2019
d7c6adb
fix weapon safety check
Gedas-S Jan 26, 2019
423d141
Merge pull request #648 from Gedas-S/weapon_sim_optimization
Gedas-S Jan 29, 2019
c980183
rename current category to tools
Gedas-S Jan 30, 2019
658c9e6
add bdacategory to parts
Gedas-S Jan 30, 2019
ddea69f
intermediate debug
Gedas-S Jan 31, 2019
98c71b1
more intermediate debug
Gedas-S Feb 1, 2019
0c89949
Adds ammo gauges to rocket launchers
SuicidalInsanity Feb 1, 2019
e75755d
Adds ammo gauges to ModuleWeapon
SuicidalInsanity Feb 1, 2019
b2bdabc
adds ammocount controller for ammogauges
SuicidalInsanity Feb 1, 2019
c81d672
Proper bda subcategories nao
Gedas-S Feb 2, 2019
574b35e
Only add category if it has parts, and remove old category
Gedas-S Feb 2, 2019
7a22022
fix behaviour on subsequent entries
Gedas-S Feb 2, 2019
4ab026e
Bring back formation parameters
Gedas-S Feb 2, 2019
7b3ada4
New icons
Gedas-S Feb 5, 2019
e1e5495
autocategorize unspecified parts containing bda modules
Gedas-S Feb 6, 2019
47c85f9
Toggleable subcategories
Gedas-S Feb 6, 2019
74fc35d
Add more categories
Gedas-S Feb 6, 2019
85a95f2
Clearer parameter names
Gedas-S Feb 6, 2019
2754d0a
Fix missing references
Gedas-S Feb 6, 2019
6954cef
Add back missing method
Gedas-S Feb 6, 2019
801ee30
Move gauges out of module weapon
Gedas-S Feb 7, 2019
08ba991
move gauges out of rocketLauncher
Gedas-S Feb 7, 2019
a3ba599
Prevent rmb settings clickthrough
Gedas-S Feb 8, 2019
55aaf63
Fix subcategory positioning with other mods present
Gedas-S Feb 8, 2019
3e5388c
fix autocategorization of bombs and torpedoes
Gedas-S Feb 8, 2019
57b56bf
filter extensions adaptation
Gedas-S Feb 8, 2019
9ad0941
UI setting for turning off ammo gauges
Gedas-S Feb 9, 2019
563271d
Merge pull request #652 from Gedas-S/formation_settings_in_editor
Gedas-S Feb 9, 2019
528aea8
fix swapped radar lock icons
Gedas-S Feb 9, 2019
a614f27
Merge pull request #653 from Gedas-S/fix_radar_icons
Gedas-S Feb 9, 2019
4ce6acc
Merge pull request #651 from Gedas-S/feature_subcategories
Gedas-S Feb 10, 2019
3cad4d7
Merge branch 'dev' into patch-1
Gedas-S Feb 10, 2019
c3940ee
change default visibility
Gedas-S Feb 10, 2019
b979934
Merge pull request #649 from SuicidalInsanity/patch-1
Gedas-S Feb 10, 2019
1d73dde
delete empty file
Gedas-S Feb 10, 2019
97e031b
autocleanup
Gedas-S Feb 10, 2019
a7131e6
Merge pull request #656 from Gedas-S/auto_cleanup
Gedas-S Feb 10, 2019
9e7b22b
catch rwr nullref on evasive PAI
Gedas-S Feb 11, 2019
74bf5b5
Merge pull request #657 from Gedas-S/catch_null_rwr
Gedas-S Feb 11, 2019
e5e18ea
fix radar transform misplacement and add a mark position utility
Gedas-S Feb 12, 2019
00a81fa
Guard mode will turn on all radars when trying to lock missile
Gedas-S Feb 12, 2019
6d01b91
stop including configs in distribution, preserve old ones or create d…
Gedas-S Feb 13, 2019
f6574ba
unclam competition distance
Gedas-S Feb 15, 2019
7cca84b
Merge pull request #661 from Gedas-S/unclamp_competition_distance
Gedas-S Feb 19, 2019
1e2695c
Merge pull request #658 from Gedas-S/radar_fixes
Gedas-S Feb 19, 2019
82cd1fc
change acceleration estimation
Gedas-S Feb 24, 2019
e8d70d3
more acceleration fixes
Gedas-S Feb 24, 2019
e40b1e8
targeting tweaks
Gedas-S Feb 24, 2019
f6dc6cc
a bit of cleanup
Gedas-S Feb 25, 2019
9cb0cb2
average gravity calculation fixup
Gedas-S Feb 25, 2019
78b2d20
fix missile turret turning off
Gedas-S Feb 26, 2019
fa644aa
Merge pull request #666 from Gedas-S/fix_turret_disabling
Gedas-S Feb 26, 2019
564413e
Weapons respect engagement range
SuicidalInsanity Apr 13, 2019
86bd776
Merge pull request #665 from Gedas-S/turret_accuracy_again
Gedas-S Apr 16, 2019
26b8f46
create config file if not present
Gedas-S Apr 16, 2019
1d7bf34
update changelog
Gedas-S Apr 16, 2019
eee1418
Merge pull request #679 from Gedas-S/update_changelog
Gedas-S Apr 16, 2019
ffd4476
Fix ignoring targets in front of you.
Gedas-S Apr 16, 2019
65addfc
Merge pull request #680 from Gedas-S/fix_not_reporting_targets
Gedas-S Apr 16, 2019
23c2a35
Bump version number
Gedas-S Apr 16, 2019
d934a05
version label on weapon manager window
Gedas-S Apr 16, 2019
bed9414
Merge pull request #681 from Gedas-S/version
Gedas-S Apr 16, 2019
94c75ff
fix drag calculation to not increase bullet speed anymore
Gedas-S Apr 16, 2019
1f79999
Merge pull request #682 from Gedas-S/fix_drag_impact_adjustment
Gedas-S Apr 16, 2019
33a1ce5
check if the reloadable rail has ammo before reloading
Gedas-S Apr 17, 2019
74dba57
update changelog
Gedas-S Apr 17, 2019
4ff3d33
Merge pull request #683 from Gedas-S/fix_reloadable_rail_ammo_limitation
Gedas-S Apr 17, 2019
fa42db6
Expanded SmartPick weapon selection
SuicidalInsanity Apr 18, 2019
1fdb956
Beam-Guided munitions track moving targets
SuicidalInsanity Apr 18, 2019
397e1db
resharper ignore
jrodrigv Apr 26, 2019
be5a094
Merge remote-tracking branch 'papas/dev' into dev
jrodrigv Apr 26, 2019
ae4fe63
adding settings file back again
jrodrigv Apr 27, 2019
50263da
Fixing NRE exceptions
jrodrigv Apr 28, 2019
06c03d8
Adding additonal check miss
jrodrigv Apr 28, 2019
f9dede4
changelog updated
jrodrigv Apr 28, 2019
bc5986b
Merge pull request #686 from jrodrigv/dev
jrodrigv Apr 28, 2019
24504c2
Merge pull request #687 from jrodrigv/master
jrodrigv May 1, 2019
335142c
Fixing NRE Heat target
jrodrigv May 1, 2019
9484446
improvement camera tracking position
jrodrigv May 7, 2019
14eec39
Merge branch 'master' into dev_local
Gedas-S May 11, 2019
311ef3c
add bulkhead profiles to all parts
Gedas-S May 11, 2019
04d7fde
Merge pull request #693 from Gedas-S/bulkhead_profiles
Gedas-S May 11, 2019
07d95e7
do not update weapons if same weapon assigned as selected
Gedas-S May 11, 2019
45585f5
update changelog
Gedas-S May 11, 2019
4ff692c
Merge pull request #694 from Gedas-S/fix_rocket_stack_overflow
Gedas-S May 11, 2019
3c29747
increase version to 131
Gedas-S May 11, 2019
1557e72
Merge pull request #695 from Gedas-S/bump_version_131
Gedas-S May 12, 2019
6364402
Merge pull request #696 from PapaJoesSoup/dev
Gedas-S May 12, 2019
f90ea94
fix surface ai description
Gedas-S May 23, 2019
ae241e7
rmb info for pilot ai
Gedas-S May 24, 2019
2fab3a7
ignoring resharper
jrodrigv Jun 5, 2019
379ca79
Improvements to ballistic guidance and code refactor
jrodrigv Jun 9, 2019
0674057
Merge pull request #700 from Gedas-S/ai_documentation_improvements
Gedas-S Jun 19, 2019
d9e45f2
nicer angle math
Gedas-S Jun 19, 2019
70430ca
base yawover on yaw transform origin to reduce wobble
Gedas-S Jun 19, 2019
2af7fd2
fix turret gimbal calculation
Gedas-S Jun 19, 2019
3500b70
turret fix changelog
Gedas-S Jun 19, 2019
2e2dcb2
fix forum link
Gedas-S Jun 19, 2019
a22efae
Merge pull request #706 from Gedas-S/fix_readme_link
Gedas-S Jun 19, 2019
9561783
Merge pull request #705 from Gedas-S/turret_rotation_fix_2
Gedas-S Jun 19, 2019
a48eea1
fix angle conversion formula
Gedas-S Jun 19, 2019
e6c97fd
Merge pull request #707 from Gedas-S/turret_rotation_fix_3
Gedas-S Jun 19, 2019
f936f22
Localization fixes
HebaruSan Jun 29, 2019
4ee5439
Merge remote-tracking branch 'papas/dev' into dev
jrodrigv Jul 27, 2019
957a245
Merge branch 'GuidancesImprovements' into dev
jrodrigv Jul 27, 2019
ae49fb0
Merge pull request #678 from SuicidalInsanity/patch-5
jrodrigv Aug 27, 2019
88b9fc2
Merge pull request #684 from SuicidalInsanity/patch-7
jrodrigv Aug 27, 2019
f89c3da
Add Munition Count to WM GUI
SuicidalInsanity Sep 30, 2019
f13545f
Add Munition count to WM GUI
SuicidalInsanity Sep 30, 2019
795a713
Add Munitions count to WM GUI
SuicidalInsanity Sep 30, 2019
47d0644
Fixes torps acting like missiles in air #710
SuicidalInsanity Sep 30, 2019
f058753
Fix to ProximityFuze radius
SuicidalInsanity Sep 30, 2019
634ad97
Merge pull request #716 from HebaruSan/fix/i18n
jrodrigv Oct 22, 2019
896474c
Merge pull request #731 from SuicidalInsanity/patch-10
jrodrigv Oct 22, 2019
6b16550
Merge pull request #732 from SuicidalInsanity/patch-11
jrodrigv Oct 22, 2019
6b7043e
Merge pull request #733 from SuicidalInsanity/patch-12
jrodrigv Oct 22, 2019
4140cd8
Merge branch 'papasdev' into dev
jrodrigv Oct 22, 2019
950b2bf
ignoring local items
jrodrigv Oct 24, 2019
ca1c128
dds files updated
jrodrigv Oct 24, 2019
5ca3f46
Updating shaders
jrodrigv Oct 24, 2019
47da57a
Revert "Weapons respect engagement range"
jrodrigv Oct 24, 2019
3af4d95
upgrade to ksp 1.8
jrodrigv Oct 24, 2019
c6aa7ad
fixes for heat target missiles
jrodrigv Oct 27, 2019
98863e0
fixing exceptions and warnings
jrodrigv Nov 7, 2019
3a55373
New version 1.3.2 ready
jrodrigv Nov 7, 2019
2fbf0c9
Merge pull request #741 from jrodrigv/dev
jrodrigv Nov 7, 2019
2061875
Merge pull request #743 from jrodrigv/master
jrodrigv Nov 7, 2019
fbceecd
fix laser distance
Gedas-S Nov 13, 2019
d58e853
update laser velocity extrapolation
Gedas-S Nov 14, 2019
63ac73b
Merge pull request #744 from Gedas-S/fix_laser_distance
Gedas-S Nov 17, 2019
bef5461
UI Localization
tinygrox Feb 6, 2020
ca9f808
Localization
tinygrox Feb 6, 2020
8a7cf13
Update zh-cn.cfg
tinygrox Feb 6, 2020
4e55d68
Merge pull request #752 from tinygrox/Localization
jrodrigv Feb 23, 2020
354042c
ShowCategories true
jrodrigv Feb 23, 2020
a9903c5
Merge remote-tracking branch 'papas/dev' into dev
jrodrigv Feb 23, 2020
570a047
fixing localization for competition mode
jrodrigv Feb 23, 2020
793bb70
fixing NRE exception
jrodrigv Feb 23, 2020
7328aeb
New version 1.3.3
jrodrigv Feb 23, 2020
521b7d3
Merge pull request #756 from jrodrigv/master
jrodrigv Feb 23, 2020
b97d9bb
Reverted some of the changes to commit on Oct 27 2019 in order to fix…
TheKurgan Apr 3, 2020
edae9fc
recompiling shaders targeting 3.5
jrodrigv Apr 4, 2020
ff5624a
Merge pull request #762 from TheKurgan/master
jrodrigv Apr 4, 2020
a6c4bc4
Merge remote-tracking branch 'papas/master'
jrodrigv Apr 4, 2020
60493ef
New release 1.3.4
jrodrigv Apr 9, 2020
4b21c9f
Merge pull request #765 from jrodrigv/master
jrodrigv Apr 9, 2020
e37a5e3
Adjustment of the weight of the Saturn AL-31 engine, and a slight cha…
TheKurgan Apr 22, 2020
8c5764c
Small adjustment to Satrun engine specs
TheKurgan Apr 25, 2020
a8c4433
Fixed Tweakscale patch error
TheKurgan Apr 25, 2020
b2acdcf
Modification to the .50 cal rounds to make them actually usable
TheKurgan Apr 25, 2020
e3a20e5
Merge pull request #767 from TheKurgan/master
jrodrigv May 20, 2020
723a661
Fixed CoMOffset on Saturn engine
TheKurgan May 21, 2020
4141aba
Merge pull request #776 from TheKurgan/master
jrodrigv May 22, 2020
d443956
Fix localization regarding name change of Browning AN/M2 to An/M3
TheKurgan May 26, 2020
40ce3a5
Merge pull request #777 from TheKurgan/master
jrodrigv May 31, 2020
f95d84f
1.3.5 Beta
PapaJoesSoup Jul 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
37 changes: 37 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
When reporting issues please provide the following information:

[See this for more information on reporting issues for KSP Mods](http://forum.kerbalspaceprogram.com/?showtopic=83212)

[See the Original Forum Post (OP) for additional info](http://forum.kerbalspaceprogram.com/?showtopic=155014)

##### ISSUE TYPE
<!-- Pick one below and delete the rest: -->
- Support ( Need help getting something to work)
- Bug Report (Something is broken)
- Feature Idea (Something new you want to see)
- Enhancement (Expand on existing features)


##### KSP and BDA Version

```

```

##### OS / ENVIRONMENT


##### SUMMARY
<!-- Explain the problem briefly -->

##### STEPS TO REPRODUCE
<!--
For bugs, show exactly how to reproduce the problem, using a minimal test-case.
For new features, show how the feature would be used.
-->


##### Log Files
<!-- /KSP Directory/KSP.log -->
<!-- /KSP Directory/KSP_x64_Data/Output.txt -->
<!-- You can also paste gist.github.com links for larger files -->
149 changes: 128 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,84 @@
#######################################
BDArmory Ignore
#######################################
BDArmory/BDArmory.csproj.user
_LocalDev

BahaTurret/.vs
BahaTurret/obj
BahaTurret/bin/Debug/
BDArmory/.vs
BDArmory/obj
BDArmory/bin/Debug/

BahaTurret/.vs/config
BahaTurret/LocalDev/7za_dir.txt
BahaTurret/LocalDev/dist_dir.txt
BahaTurret/LocalDev/ksp_dir.txt
BahaTurret/LocalDev/ksp_production_dir.txt
BahaTurret/LocalDev/mono_exe.txt
BahaTurret/LocalDev/pdb2mdb_exe.txt
BahaTurret/BahaTurret.userprefs
BahaTurret/bin/Release

BDArmory/.vs
BDArmory.Core/.vs

BDArmory/obj
BDArmory/bin/Debug/

BDArmory/.vs/config
BDArmory/LocalDev/7za_dir.txt
BDArmory/LocalDev/dist_dir.txt
BDArmory/LocalDev/ksp_dir.txt
BDArmory/LocalDev/ksp_production_dir.txt
BDArmory/LocalDev/mono_exe.txt
BDArmory/LocalDev/pdb2mdb_exe.txt
BDArmory/BahaTurret.userprefs
BDArmory/Distribution/GameData/BDArmory/Plugins/BDArmory.Core.dll
BDArmory/Distribution/GameData/BDArmory/Plugins/BDArmory.dll

BDArmory/packages

BDArmory.Core/obj/Debug/BDArmory.Core.csproj.FileListAbsolute.txt
BDArmory.Core/obj/Release/BDArmory.Core.csproj.FileListAbsolute.txt
BDArmory/bin/Debug
BDArmory.Core/obj/
BDArmory.Core/.vs
BDArmory.Core/packages.config
BDArmory/packages.config
BDArmory.Multiplayer/obj
BDArmory.Core/bin/Debug/Assembly-CSharp.dll
BDArmory.Core/bin/Debug/BDArmory.Core.dll
BDArmory.Core/bin/Debug/KSPAssets.dll
BDArmory.Core/bin/Debug/UnityEngine.dll
BahaTurret/BDArmory.sln.DotSettings.user
BahaTurret/BDArmory.csproj.user
BDArmory.Core/bin/Debug/UnityEngine.UI.dll


#######################################
Unity Ignore
#######################################

TrackIRUnity.dll
Mono*
TDx*
*.pdb
*.jar
*.bat
*.zip
KSPCore.dll
KSPUtil.dll
SaveUpgradePipeline.Core.dll
UnityEngine.xml
Vectrosity.dll

#######################################
#######################################
System*
mscorlib.dll

# Windows image file caches
Thumbs.db
ehthumbs.db
Expand Down Expand Up @@ -33,24 +114,50 @@ Icon
# Files that might appear on external disk
.Spotlight-V100
.Trashes

TrackIRUnity.dll
Assembly-*
Mono*
mscorlib.dll
System*
TDx*
UnityEngine.dll
*.pdb
*.jar
*.bat

BahaTurret/BahaTurret.userprefs
*.zip
KSPAssets.dll
KSPCore.dll
KSPUtil.dll
SaveUpgradePipeline.Core.dll
UnityEngine.UI.dll
UnityEngine.xml
Vectrosity.dll
/.vs
/.vs
/.vs/slnx.sqlite
/.vs/ProjectSettings.json
/.vs/BDArmory_JRODRIGV/v15/Browse.VC.db
/.vs/BDArmory_JRODRIGV/v15
/.vs/slnx.sqlite
/BahaTurret/bin/Release
/BDArmory.Core/obj/Debug/BDArmory.Core.csproj.FileListAbsolute.txt
/BDArmory.Core/obj/Release/BDArmory.Core.csproj.FileListAbsolute.txt
/BDArmory/bin/Debug
BDArmory.Core/obj/
/BDArmory.Multiplayer/obj
BDArmory.Core/bin/Debug/Assembly-CSharp.dll
BDArmory.Core/bin/Debug/BDArmory.Core.dll
BDArmory.Core/bin/Debug/KSPAssets.dll
BDArmory.Core/bin/Debug/UnityEngine.dll
BahaTurret/BDArmory.sln.DotSettings.user
BahaTurret/BDArmory.csproj.user
BDArmory.Core/bin/Debug/UnityEngine.UI.dll
BDArmory/LocalDev/Refs/UnityEngine.UI.dll
BDArmory/LocalDev/Refs/KSPAssets.dll
BDArmory/LocalDev/Refs/Assembly-CSharp.dll
BDArmory/LocalDev/Refs/Assembly-CSharp-firstpass.dll
BDArmory/LocalDev/Refs/UnityEngine.dll
/BDArmory/UpgradeLog3.htm
/BDArmory/UpgradeLog2.htm
/BDArmory/UpgradeLog.htm
/BDArmory/bin/Release
/BDArmory.Core/bin
/BDArmory.Guidance/bin/Release
/BDArmory.Guidance/obj/Release
/BDArmory/BDArmory.sln.DotSettings.user
/BDArmory.Events/obj/Debug
/BDArmory/LocalDev/Refs
/BDArmory.Events/obj/Release
/Binaries
/BDArmory/Distribution/GameData/BDArmory/Plugins
/BDArmory/_ReSharper.Caches/ReSharperPlatformVs15182_74c703de.BDArmory.00
/packages/Microsoft.Net.Compilers.2.8.0
/_ReSharper.Caches/ReSharperPlatformVs15182_74c703de.BDArmory.00
/BDArmory/_ReSharper.Caches/ReSharperPlatformVs15183_74c703de.BDArmory.00
/BDArmory/_ReSharper.Caches/ReSharperPlatformVs16191_4011600b.BDArmory.00
/BDArmory/_ReSharper.Caches/ReSharperPlatformVs16191_4011600b.BDArmory.01
/_ReSharper.Caches/ReSharperPlatformVs16191_4011600b.00
/BDArmory/_ReSharper.Caches/ReSharperPlatformVs16193_4011600b.BDArmory.00
/_ReSharper.Caches/ReSharperPlatformVs16193_4011600b.00
121 changes: 121 additions & 0 deletions .gitignore.orig
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
#######################################
BDArmory Ignore
#######################################
BDArmory/BDArmory.csproj.user

BahaTurret/.vs
BahaTurret/obj
BahaTurret/bin/Debug/
BDArmory/.vs
BDArmory/obj
BDArmory/bin/Debug/

BahaTurret/.vs/config
BahaTurret/LocalDev/7za_dir.txt
BahaTurret/LocalDev/dist_dir.txt
BahaTurret/LocalDev/ksp_dir.txt
BahaTurret/LocalDev/ksp_production_dir.txt
BahaTurret/LocalDev/mono_exe.txt
BahaTurret/LocalDev/pdb2mdb_exe.txt
BahaTurret/BahaTurret.userprefs

BDArmory/.vs
BDArmory/obj
BDArmory/bin/Debug/

BDArmory/.vs/config
BDArmory/LocalDev/7za_dir.txt
BDArmory/LocalDev/dist_dir.txt
BDArmory/LocalDev/ksp_dir.txt
BDArmory/LocalDev/ksp_production_dir.txt
BDArmory/LocalDev/mono_exe.txt
BDArmory/LocalDev/pdb2mdb_exe.txt
BDArmory/BahaTurret.userprefs


#######################################
Unity Ignore
#######################################

TrackIRUnity.dll
Mono*
TDx*
*.pdb
*.jar
*.bat
*.zip
KSPCore.dll
KSPUtil.dll
SaveUpgradePipeline.Core.dll
UnityEngine.xml
Vectrosity.dll

#######################################
#######################################
System*
mscorlib.dll

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Icon must ends with two \r.
Icon
# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes
/.vs
/.vs
/.vs/slnx.sqlite
/.vs/ProjectSettings.json
/.vs/BDArmory_JRODRIGV/v15/Browse.VC.db
/.vs/BDArmory_JRODRIGV/v15
/.vs/slnx.sqlite
/BahaTurret/bin/Release
/BDArmory.Core/obj/Debug/BDArmory.Core.csproj.FileListAbsolute.txt
/BDArmory/bin/Debug
/BDArmory.Core/obj
/BDArmory.Multiplayer/obj
<<<<<<< HEAD
BahaTurret/BDArmory.sln.DotSettings.user
BDArmory.Core/bin/Debug/UnityEngine.dll
BDArmory.Core/bin/Debug/KSPAssets.dll
BDArmory.Core/bin/Debug/BDArmory.Core.dll
BDArmory.Core/bin/Debug/Assembly-CSharp.dll
BDArmory.Core/bin/Debug/UnityEngine.UI.dll
BahaTurret/BDArmory.csproj.user
=======
BDArmory.Core/bin/Debug/Assembly-CSharp.dll
BDArmory.Core/bin/Debug/BDArmory.Core.dll
BDArmory.Core/bin/Debug/KSPAssets.dll
BDArmory.Core/bin/Debug/UnityEngine.dll
BahaTurret/BDArmory.sln.DotSettings.user
BahaTurret/BDArmory.csproj.user
BDArmory.Core/bin/Debug/UnityEngine.UI.dll
>>>>>>> 311105e5c29cb0a842f90aa18021dbbdf54390a8
Loading