Skip to content

Commit 888ae41

Browse files
COZITIMEJayden CosgroveAHPKillSwitch
authored
Merged 3rd person and waterfall update changes/Fixes (#3)
* > Added Camera tabs to all of the Halos * > think i may have fixed things up? * updated addresses for waterfall update (#2) Co-authored-by: AHPKillSwitch <78087818+AHPKillSwitch@users.noreply.github.com> * >Removed Unused Designers * > Added 3rd person camera for all Halos Co-authored-by: Jayden Cosgrove <Magic.turd@hotmail.com> Co-authored-by: AHPKillSwitch <78087818+AHPKillSwitch@users.noreply.github.com>
1 parent 8c16cb7 commit 888ae41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+568
-2769
lines changed

32Stuff/32Stuff.csproj

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -164,36 +164,6 @@
164164
<Compile Include="TrainerTreeList.Designer.cs">
165165
<DependentUpon>TrainerTreeList.cs</DependentUpon>
166166
</Compile>
167-
<Compile Include="UC_Halo2a.cs">
168-
<SubType>UserControl</SubType>
169-
</Compile>
170-
<Compile Include="UC_Halo2a.Designer.cs">
171-
<DependentUpon>UC_Halo2a.cs</DependentUpon>
172-
</Compile>
173-
<Compile Include="UC_Halo3.cs">
174-
<SubType>UserControl</SubType>
175-
</Compile>
176-
<Compile Include="UC_Halo3.Designer.cs">
177-
<DependentUpon>UC_Halo3.cs</DependentUpon>
178-
</Compile>
179-
<Compile Include="UC_Halo4.cs">
180-
<SubType>UserControl</SubType>
181-
</Compile>
182-
<Compile Include="UC_Halo4.Designer.cs">
183-
<DependentUpon>UC_Halo4.cs</DependentUpon>
184-
</Compile>
185-
<Compile Include="UC_HaloReach.cs">
186-
<SubType>UserControl</SubType>
187-
</Compile>
188-
<Compile Include="UC_HaloReach.Designer.cs">
189-
<DependentUpon>UC_HaloReach.cs</DependentUpon>
190-
</Compile>
191-
<Compile Include="UC_Welcome.cs">
192-
<SubType>UserControl</SubType>
193-
</Compile>
194-
<Compile Include="UC_Welcome.Designer.cs">
195-
<DependentUpon>UC_Welcome.cs</DependentUpon>
196-
</Compile>
197167
<EmbeddedResource Include="ButtonArray.resx">
198168
<DependentUpon>ButtonArray.cs</DependentUpon>
199169
</EmbeddedResource>
@@ -240,21 +210,6 @@
240210
<EmbeddedResource Include="TrainerTreeList.resx">
241211
<DependentUpon>TrainerTreeList.cs</DependentUpon>
242212
</EmbeddedResource>
243-
<EmbeddedResource Include="UC_Halo2a.resx">
244-
<DependentUpon>UC_Halo2a.cs</DependentUpon>
245-
</EmbeddedResource>
246-
<EmbeddedResource Include="UC_Halo3.resx">
247-
<DependentUpon>UC_Halo3.cs</DependentUpon>
248-
</EmbeddedResource>
249-
<EmbeddedResource Include="UC_Halo4.resx">
250-
<DependentUpon>UC_Halo4.cs</DependentUpon>
251-
</EmbeddedResource>
252-
<EmbeddedResource Include="UC_HaloReach.resx">
253-
<DependentUpon>UC_HaloReach.cs</DependentUpon>
254-
</EmbeddedResource>
255-
<EmbeddedResource Include="UC_Welcome.resx">
256-
<DependentUpon>UC_Welcome.cs</DependentUpon>
257-
</EmbeddedResource>
258213
<None Include="Properties\Settings.settings">
259214
<Generator>SettingsSingleFileGenerator</Generator>
260215
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

32Stuff/ButtonArray.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
5-
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
9-
using System.Windows.Forms;
10-
using System.Linq;
1+
using System.Windows.Forms;
112
namespace HaloPogSwitch
123
{
13-
using UI32;
144
public partial class ButtonArray : UserControl
155
{
166
public ButtonArray(string text)

32Stuff/UC_Halo2a.Designer.cs

Lines changed: 0 additions & 541 deletions
This file was deleted.

32Stuff/UC_Halo2a.cs

Lines changed: 0 additions & 25 deletions
This file was deleted.

32Stuff/UC_Halo2a.resx

Lines changed: 0 additions & 120 deletions
This file was deleted.

32Stuff/UC_Halo3.Designer.cs

Lines changed: 0 additions & 63 deletions
This file was deleted.

32Stuff/UC_Halo3.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)