Skip to content

Commit

Permalink
Merge from dev [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
xrSimpodin committed Aug 31, 2020
2 parents 1959fbb + 4969542 commit f8bb81c
Show file tree
Hide file tree
Showing 7 changed files with 1,298 additions and 72 deletions.
44 changes: 41 additions & 3 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,52 @@
<a href="https://github.com/OGSR/OGSR-Engine/releases/latest"><img src="https://img.shields.io/github/downloads/OGSR/OGSR-Engine/total.svg?style=flat-square" alt="Total downloads"></a>
<a href="https://github.com/OGSR/OGSR-Engine/actions?query=branch%3Adev+event%3Apush+workflow%3A%22Main+Workflow%22"><img src="https://img.shields.io/github/workflow/status/OGSR/OGSR-Engine/Main%20Workflow?label=build&logo=github&style=flat-square" alt="Build Status"></a>

<h3 align="center"> <a href="#english"><b>English</b></a>/<a href="#русский"><b>Русский</b></a></h3>

![Logo](https://camo.githubusercontent.com/abf193ef26e3b22a66cc0cf2a4bcb63a345d7620/68747470733a2f2f63646e2e646973636f72646170702e636f6d2f6174746163686d656e74732f3534353632383830383438313334313434302f3733303737383730323636393135323239362f6c6f676f2e706e67)

### Цели проекта: ###
## English ##

### Aim of the project: ###
* Fix original engine errors
* Improve and optimize graphics
* Update engine components
* Implement new features for developers

### [>>Developers<<](https://github.com/OGSR/OGSR-Engine/graphs/contributors) ###
### [>>Wiki, changelog and more<<](https://github.com/OGSR/OGSR-Engine/wiki) ###
### [>>Latest release<<](https://github.com/OGSR/OGSR-Engine/releases/latest) ###
### [Write here](https://github.com/OGSR/OGSR-Engine/issues) to report bugs and share suggestions ###
#### For the engine to work with the worldwide version of SoC, use the ` -steam` launch parameter ####

### Compilation guide: ###
* Visual Studio 15.5 or later required.
* Open Engine.sln
* Set the platform to x64 and the configuration to Release, then select Build -> Build solution
### Thanks to: ###
* [Im-dex](https://github.com/Im-dex)
* [xrOxygen](https://github.com/xrOxygen/xray-oxygen)
* [OpenXRay](https://github.com/OpenXRay/xray-16)
* [CoC-Xray](https://github.com/revolucas/CoC-Xray)
* [X-Ray Engine by Alpet & KD](https://xp-dev.com/summary/210311)
* [abramcumner](https://github.com/abramcumner)
* [ForserX](https://github.com/ForserX)
* [Xottab-DUTY](https://github.com/Xottab-DUTY)
* [Shoker](https://github.com/ShokerStlk)
* [morrey](https://github.com/morrey)
* [SkyLoader](https://github.com/SkyLoaderr)

And everyone else whose work has been used. If you are not mentioned, send a message and you will be added.

## Русский ##

### Цели проекта: ###
* Исправление ошибок оригинального движка
* Улучшение графики и оптимизация
* Обновление компонентов движка
* Внедрение новых возможностей для разработчиков

### [>>Разработчики<<](https://github.com/OGSR/OGSR-Engine/graphs/contributors) ###
### [>>Разработчики<<](https://github.com/OGSR/OGSR-Engine/graphs/contributors) ###
### [>>Wiki, cписок изменений и прочая информация<<](https://github.com/OGSR/OGSR-Engine/wiki) ###
### [>>Свежий релиз<<](https://github.com/OGSR/OGSR-Engine/releases/latest) ###
### С багами и предложениями - [писать сюда](https://github.com/OGSR/OGSR-Engine/issues) ###
Expand All @@ -33,4 +70,5 @@
* [Shoker](https://github.com/ShokerStlk)
* [morrey](https://github.com/morrey)
* [SkyLoader](https://github.com/SkyLoaderr)
* И всех остальных, чьи работы я использовал. Пишите, если забыл кого-то, добавлю в список.

И всех остальных, чьи работы я использовал. Пишите, если забыл кого-то, добавлю в список.

0 comments on commit f8bb81c

Please sign in to comment.