Skip to content

Commit

Permalink
Update root files
Browse files Browse the repository at this point in the history
  • Loading branch information
acidicMercury8 committed Jul 28, 2023
1 parent f481ef1 commit c3a00ee
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 55 deletions.
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,37 @@

Full changelog of _IX-Ray_ 1.0 project

## Release 0.3 (March 2023)

### Common

- Migration to __Visual Studio 2022__
- Fixed compilation errors
- Fixed a lot of issues with linking
- Enabled multicore building for all projects
- Enabled __x86-64__ toolchain for all projects
- Enabled __GitHub Actions__

### Core

- Replaced custom `xr_deque<T>` and `xr_vector<T>` with aliases of `std::deque<T>` and `std::vector<T>`
- Placed `clear_and_reserve()` method of `xr_vector<T>` class in a separate function
- Partially replaced STL extension aliases with `using` analogs
- Deleted `DEF_*` and `DEFINE_*` macroses from STL extensions

### Engine

- Fixed __VSync__

### Dependencies

- Deleted unused __Intel VTune__ functionality

### Resources

- Added resources
- Normalized encoding of scripts

## Release 0.2 (November 2022)

### Common
Expand Down
12 changes: 0 additions & 12 deletions ConvertLibraries.bat

This file was deleted.

11 changes: 0 additions & 11 deletions InstallElpack.bat

This file was deleted.

21 changes: 0 additions & 21 deletions InstallOther.bat

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# IX-Ray

*IX-Ray* project license information
_IX-Ray_ project license information

## License details

Expand Down
18 changes: 8 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,22 @@
</p>

<p>
<a href="https://github.com/ixray-team/ixray-1.0-stsoc/releases/tag/r0.2">
<a href="https://github.com/ixray-team/ixray-1.0-stsoc/releases/tag/r0.3">
<img src="https://img.shields.io/github/v/release/ixray-team/ixray-1.0-stsoc?include_prereleases" alt="Latest release" />
</a>
<a href="https://github.com/ixray-team/ixray-1.0-stsoc/actions/workflows/build-engine.yml">
<img src="https://github.com/ixray-team/ixray-1.0-stsoc/actions/workflows/build-engine.yml/badge.svg" alt="Build engine" />
</a>
</p>
</div>

Stable repository of the modernized _X-Ray_ 1.0 game engine

## Requirements

* Visual Studio 2015 Community Edition
- Visual Studio 2022 Community Edition
- MFC
- Windows SDK 10.0.19041.0

## Building

Expand All @@ -28,16 +33,9 @@ Download the repository:
git clone https://github.com/ixray-team/ixray-1.0-stsoc.git
```

Download needed components:

* DirectX SDK March 2009

Unpack a contents to the root agreeing to merge

### Engine

#### Debug

- Run `download-dependencies.ps1`
- Build `XRay.sln` on `Win32` without projects from `utils`

## Changelog
Expand Down
28 changes: 28 additions & 0 deletions XRay.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"folders": [
{
"name": "IX-Ray 1.0",
"path": "."
}
],
"settings": {
"files.associations": {
// Configs
"*.inf": "ini",
"*.ltx": "ini",
"**/gamedata/config/**/*.ltx": "ini",
// Scripts
"**/gamedata/scripts/*.script": "lua",
"**/gamedata/shaders/**/*.s": "lua",
"**/gamedata/shaders/**/*.s_": "lua",
// Shaders
"**/gamedata/shaders/**/*.h": "hlsl",
"**/gamedata/shaders/**/*.ps": "hlsl",
"**/gamedata/shaders/**/*.vs": "hlsl",
"**/gamedata/shaders/**/*.ds": "hlsl",
"**/gamedata/shaders/**/*.hs": "hlsl",
"**/gamedata/shaders/**/*.gs": "hlsl",
"**/gamedata/shaders/**/*.cs": "hlsl",
}
}
}

0 comments on commit c3a00ee

Please sign in to comment.