Skip to content

Commit

Permalink
Merge pull request #3 from ricardodalarme/Development
Browse files Browse the repository at this point in the history
v0.7.0
  • Loading branch information
ricardodalarme authored Mar 13, 2020
2 parents ed15ef6 + d44bc4e commit 51c8564
Show file tree
Hide file tree
Showing 196 changed files with 3,602 additions and 2,261 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -330,4 +330,6 @@ ASALocalRun/
.mfractor/

# Dev things
Dev/
Dev/
Build/Server/Data/Accounts
Build/Server/Data/Characters.dat
Binary file modified Build/Client/Client.exe
Binary file not shown.
Binary file added Build/Client/Data/Maps/1.dat
Binary file not shown.
Binary file added Build/Client/Data/Maps/2.dat
Binary file not shown.
Binary file added Build/Client/Data/Options.dat
Binary file not shown.
Binary file modified Build/Client/Data/Tools.dat
Binary file not shown.
File renamed without changes.
Binary file removed Build/Client/Graphics/Interface/1.png
Binary file not shown.
Binary file removed Build/Client/Graphics/Interface/2.png
Binary file not shown.
Binary file removed Build/Client/Graphics/Interface/3.png
Binary file not shown.
Binary file added Build/Client/Graphics/Interface/Buttons/11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Build/Client/Graphics/Interface/Buttons/23.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Build/Client/Graphics/Interface/Buttons/24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Build/Client/Graphics/Interface/Buttons/25.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Build/Client/Graphics/Interface/Buttons/26.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Build/Client/Graphics/Interface/Intro.png
Binary file added Build/Client/Graphics/Interface/Panels/13.png
Binary file added Build/Client/Graphics/Interface/Panels/16.png
Binary file added Build/Client/Graphics/Interface/Panels/17.png
Binary file added Build/Client/Graphics/Interface/Panels/5.png
Binary file removed Build/Client/Graphics/Interface/Tools/Buttons/11.png
Diff not rendered.
Binary file removed Build/Client/Graphics/Interface/Tools/Buttons/12.png
Diff not rendered.
Binary file removed Build/Client/Graphics/Interface/Tools/Panels/13.png
Diff not rendered.
Binary file removed Build/Client/Graphics/Interface/Tools/Panels/5.png
Diff not rendered.
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added Build/Client/Graphics/Misc/Blood.png
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added Build/Client/Graphics/Misc/Party_Bars.png
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added Build/Client/SFML.Audio.dll
Binary file not shown.
Binary file added Build/Client/SFML.Graphics.dll
Binary file not shown.
Binary file added Build/Client/SFML.System.dll
Binary file not shown.
Binary file added Build/Client/SFML.Window.dll
Binary file not shown.
Binary file removed Build/Client/csfml-audio-2.dll
Binary file not shown.
Binary file added Build/Client/csfml-audio.dll
Binary file not shown.
Binary file removed Build/Client/csfml-graphics-2.dll
Binary file not shown.
Binary file added Build/Client/csfml-graphics.dll
Binary file not shown.
Binary file added Build/Client/csfml-system.dll
Binary file not shown.
Binary file removed Build/Client/csfml-window-2.dll
Binary file not shown.
Binary file added Build/Client/csfml-window.dll
Binary file not shown.
Binary file removed Build/Client/libsndfile-1.dll
Binary file not shown.
Binary file modified Build/Client/openal32.dll
Binary file not shown.
Binary file removed Build/Client/sfmlnet-audio-2.dll
Binary file not shown.
Binary file removed Build/Client/sfmlnet-graphics-2.dll
Binary file not shown.
Binary file removed Build/Client/sfmlnet-window-2.dll
Binary file not shown.
Binary file modified Build/Editors/Editors.exe
Binary file not shown.
Binary file modified Build/Editors/Lidgren.Network.dll
Binary file not shown.
Binary file added Build/Editors/Options.dat
Binary file not shown.
Binary file added Build/Editors/SFML.Audio.dll
Binary file not shown.
Binary file added Build/Editors/SFML.Graphics.dll
Binary file not shown.
Binary file added Build/Editors/SFML.System.dll
Binary file not shown.
Binary file added Build/Editors/SFML.Window.dll
Binary file not shown.
Binary file removed Build/Editors/csfml-audio-2.dll
Binary file not shown.
Binary file added Build/Editors/csfml-audio.dll
Binary file not shown.
Binary file removed Build/Editors/csfml-graphics-2.dll
Binary file not shown.
Binary file added Build/Editors/csfml-graphics.dll
Binary file not shown.
Binary file added Build/Editors/csfml-system.dll
Binary file not shown.
Binary file removed Build/Editors/csfml-window-2.dll
Binary file not shown.
Binary file added Build/Editors/csfml-window.dll
Binary file not shown.
Binary file removed Build/Editors/libsndfile-1.dll
Binary file not shown.
Binary file modified Build/Editors/openal32.dll
Binary file not shown.
Binary file removed Build/Editors/sfmlnet-audio-2.dll
Binary file not shown.
Binary file removed Build/Editors/sfmlnet-graphics-2.dll
Binary file not shown.
Binary file removed Build/Editors/sfmlnet-window-2.dll
Binary file not shown.
Binary file modified Build/Server/Data/Classes/1.dat
Binary file not shown.
Binary file modified Build/Server/Data/Classes/2.dat
Binary file not shown.
Binary file added Build/Server/Data/Classes/3.dat
Binary file not shown.
Binary file modified Build/Server/Data/General.dat
Binary file not shown.
Binary file modified Build/Server/Data/Items/1.dat
Binary file not shown.
Binary file modified Build/Server/Data/Items/2.dat
Binary file not shown.
Binary file modified Build/Server/Data/Items/3.dat
Binary file not shown.
Binary file modified Build/Server/Data/Items/4.dat
Binary file not shown.
Binary file modified Build/Server/Data/Items/5.dat
Binary file not shown.
Binary file modified Build/Server/Data/Items/6.dat
Binary file not shown.
Binary file modified Build/Server/Data/Items/7.dat
Binary file not shown.
Binary file modified Build/Server/Data/Maps/1.dat
Binary file not shown.
Binary file added Build/Server/Data/Maps/2.dat
Binary file not shown.
Binary file modified Build/Server/Data/NPCs/1.dat
Binary file not shown.
Binary file modified Build/Server/Data/NPCs/2.dat
Binary file not shown.
Binary file added Build/Server/Data/NPCs/3.dat
Binary file not shown.
Binary file added Build/Server/Data/NPCs/4.dat
Binary file not shown.
Binary file modified Build/Server/Server.exe
Binary file not shown.
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<p align="center">
<img src="http://img910.imageshack.us/img910/8273/kRm5as.png">
<img src="https://camo.githubusercontent.com/28b7bc2cc8b19a661d442f25e2cc538071c2057b/687474703a2f2f696d673931302e696d616765736861636b2e75732f696d673931302f383237332f6b526d3561732e706e67">
</p>

CryBits is a completely open-source 2D ORPG game engine written in C#.
CryBits is a completely open-source 2D ORPG game engine written in C#.

## Images
[![GitHub version](https://badge.fury.io/gh/ricardodalarme%2FCryBits.svg)](https://travis-ci.org/ricardodalarme/CryBits)

## Screenshots
<p align="center">
<img src="https://i.ibb.co/P6CJ704/Post.jpg">
<img src="https://i.ibb.co/34rgmYm/Post.jpg">
</p>

## Development
## Contributing
Pull requests are very welcome. You can check the project [roadmap page](https://github.com/ricardodalarme/CryBits/projects/) to check the planned resources to try to implement them. For other changes, please open an issue first to discuss what you would like to change. Bug fixes are always welcome too.

You can monitor the roadmap for the next versions at https://github.com/ricardodalarme/CryBits/projects/ and the checkout in the Development branch
## Support
For help you can access the [official project page](https://www.ascensiongamedev.com/topic/2588-c-crybits-v060/), start a discussion or even send me an [email]([email protected]), I am always able to help!
35 changes: 16 additions & 19 deletions Source/Client/Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>Client</RootNamespace>
<AssemblyName>Client</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -44,20 +44,29 @@
<Reference Include="Lidgren.Network">
<HintPath>..\..\Build\Client\Lidgren.Network.dll</HintPath>
</Reference>
<Reference Include="sfmlnet-audio-2">
<HintPath>..\..\Build\Client\sfmlnet-audio-2.dll</HintPath>
<Reference Include="SFML.Audio, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Dev\Referências\SFML.Audio.dll</HintPath>
</Reference>
<Reference Include="sfmlnet-graphics-2">
<HintPath>..\..\Build\Client\sfmlnet-graphics-2.dll</HintPath>
<Reference Include="SFML.Graphics, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Dev\Referências\SFML.Graphics.dll</HintPath>
</Reference>
<Reference Include="sfmlnet-window-2">
<HintPath>..\..\Build\Client\sfmlnet-window-2.dll</HintPath>
<Reference Include="SFML.System, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Dev\Referências\SFML.System.dll</HintPath>
</Reference>
<Reference Include="SFML.Window, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Dev\Referências\SFML.Window.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="Interface\Chat.cs" />
<Compile Include="Interface\Window.cs" />
<Compile Include="Program.cs" />
<Compile Include="Interface\Buttons.cs" />
<Compile Include="Interface\CheckBoxes.cs" />
Expand All @@ -80,18 +89,6 @@
<Compile Include="Network\Send.cs" />
<Compile Include="Network\Socket.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Window.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Window.Designer.cs">
<DependentUpon>Window.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\..\Build\Client\sfmlnet-audio-2.dll" />
<Analyzer Include="..\..\Build\Client\sfmlnet-graphics-2.dll" />
<Analyzer Include="..\..\Build\Client\sfmlnet-window-2.dll" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Loading

0 comments on commit 51c8564

Please sign in to comment.