Skip to content

Commit 4b0512d

Browse files
xoxor4dxoxor4d
committed
Merge remote-tracking branch 'origin/develop'
2 parents a7e7409 + e0e8506 commit 4b0512d

File tree

21 files changed

+4184
-4090
lines changed

21 files changed

+4184
-4090
lines changed

‎.github/workflows/build-debug.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: Build-Debug
2+
3+
on:
4+
push:
5+
branches:
6+
- "develop"
7+
8+
jobs:
9+
build:
10+
name: Build binary
11+
runs-on: windows-2022
12+
strategy:
13+
matrix:
14+
configuration:
15+
- Debug
16+
steps:
17+
- name: Wait for previous workflows
18+
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
19+
uses: softprops/turnstyle@v1
20+
with:
21+
poll-interval-seconds: 10
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
25+
- name: Check out files
26+
uses: actions/checkout@v3
27+
with:
28+
submodules: true
29+
fetch-depth: 0
30+
lfs: false
31+
32+
- name: Add msbuild to PATH
33+
uses: microsoft/setup-msbuild@v1.1
34+
35+
- name: Generate project files
36+
run: tools/premake5 vs2022
37+
38+
- name: Set up problem matching
39+
uses: ammaraskar/msvc-problem-matcher@master
40+
41+
- name: Build ${{matrix.configuration}} binaries
42+
run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=Win32 build/iw3xo-dev.sln
43+
44+
- name: Upload ${{matrix.configuration}} binaries
45+
uses: actions/upload-artifact@v2
46+
with:
47+
name: ${{matrix.configuration}} binaries
48+
path: |
49+
build/bin/${{matrix.configuration}}/iw3x.dll
50+
build/bin/${{matrix.configuration}}/iw3x.pdb
51+
52+
webbook:
53+
needs: build
54+
runs-on: ubuntu-latest
55+
steps:
56+
- uses: actions/checkout@v2
57+
with:
58+
fetch-depth: 0
59+
- name: Tag String
60+
id: tag
61+
run: |
62+
echo "GIT_TAG=`echo $(git describe --tags --dirty --always)`" >> $GITHUB_ENV
63+
64+
git describe --tags --dirty --always
65+
# …
66+
67+
- uses: tsickert/discord-webhook@v4.0.0
68+
with:
69+
webhook-url: ${{ secrets.WEBHOOK_URL }}
70+
username: "GitHub Workflow"
71+
avatar-url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png"
72+
embed-author-icon-url: "https://raw.githubusercontent.com/xoxor4d/xoxor4d.github.io/master/assets/img/iw3xo.png"
73+
embed-author-name: "iw3xo-dev"
74+
embed-author-url: "https://github.com/xoxor4d/iw3xo-dev"
75+
embed-title: "Successful build (debug)"
76+
embed-color: 0xc680ff
77+
embed-description: "${{ env.GIT_TAG }} [nightly link](https://nightly.link/xoxor4d/iw3xo-dev/workflows/build-debug/develop/Debug%20binaries.zip)"

‎.github/workflows/build-release.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: Build-Release
2+
3+
on:
4+
push:
5+
branches:
6+
- "develop"
7+
jobs:
8+
build:
9+
name: Build binary
10+
runs-on: windows-2022
11+
strategy:
12+
matrix:
13+
configuration:
14+
- Release
15+
steps:
16+
- name: Wait for previous workflows
17+
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
18+
uses: softprops/turnstyle@v1
19+
with:
20+
poll-interval-seconds: 10
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
24+
- name: Check out files
25+
uses: actions/checkout@v3
26+
with:
27+
submodules: true
28+
fetch-depth: 0
29+
lfs: false
30+
31+
- name: Add msbuild to PATH
32+
uses: microsoft/setup-msbuild@v1.1
33+
34+
- name: Generate project files
35+
run: tools/premake5 vs2022
36+
37+
- name: Set up problem matching
38+
uses: ammaraskar/msvc-problem-matcher@master
39+
40+
- name: Build ${{matrix.configuration}} binaries
41+
run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=Win32 build/iw3xo-dev.sln
42+
43+
- name: Upload ${{matrix.configuration}} binaries
44+
uses: actions/upload-artifact@v2
45+
with:
46+
name: ${{matrix.configuration}} binaries
47+
path: |
48+
build/bin/${{matrix.configuration}}/iw3x.dll
49+
build/bin/${{matrix.configuration}}/iw3x.pdb
50+
51+
webbook:
52+
needs: build
53+
runs-on: ubuntu-latest
54+
steps:
55+
- uses: actions/checkout@v2
56+
with:
57+
fetch-depth: 0
58+
- name: Tag String
59+
id: tag
60+
run: |
61+
echo "GIT_TAG=`echo $(git describe --tags --dirty --always)`" >> $GITHUB_ENV
62+
63+
git describe --tags --dirty --always
64+
# …
65+
66+
- uses: tsickert/discord-webhook@v4.0.0
67+
with:
68+
webhook-url: ${{ secrets.WEBHOOK_URL }}
69+
username: "GitHub Workflow"
70+
avatar-url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png"
71+
embed-author-icon-url: "https://raw.githubusercontent.com/xoxor4d/xoxor4d.github.io/master/assets/img/iw3xo.png"
72+
embed-author-name: "iw3xo-dev"
73+
embed-author-url: "https://github.com/xoxor4d/iw3xo-dev"
74+
embed-title: "Successful build (release)"
75+
embed-color: 0x82ff80
76+
embed-description: "${{ env.GIT_TAG }} [nightly link](https://nightly.link/xoxor4d/iw3xo-dev/workflows/build-release/develop/Release%20binaries.zip)"

‎README.md‎

Lines changed: 133 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,133 @@
1-
## IW3xo - A Call of Duty 4 Modification
2-
This project is aimed at developers and includes various modifications/additions.
3-
IW3xo is not compatible with CoD4x, so make sure you do have a stock non-steam 1.7 CoD4.
4-
A compatible Radiant, built for use with IW3xo, that enables a live-link between CoD4 and Radiant can be found below.
5-
6-
7-
8-
Pre-build binaries: https://github.com/xoxor4d/iw3xo-dev/releases
9-
Changelog: https://github.com/xoxor4d/iw3xo-dev/wiki/Changelog
10-
Project Page: https://xoxor4d.github.io/projects/iw3xo/
11-
12-
13-
<img src="https://xoxor4d.github.io/assets/img/iw3xo/banner.jpg"/>
14-
15-
___
16-
17-
#### Building the project:
18-
1. Clone the repo (zip does not include deps)
19-
2. Hit "generate.bat" to build project files with premake
20-
3. Load the project in Visual Studio and open project->settings to setup paths (Debug/Release):
21-
- General: output directory path -> "path-to-cod4-root\\"
22-
- Debugging: command -> "path-to-cod4-root\iw3xo.exe"
23-
- Debugging: working directory -> "path-to-cod4-root\\"
24-
- You may need to change the Toolset of both glm and iw3x if you do not have v142 installed. For each go to General -> Platform Toolset -> set to your installed version
25-
4. Build -> Build Solution
26-
27-
#### Generating the exe:
28-
1. Copy a non-steam (1.7) "iw3mp.exe" into the "\assets\\" folder
29-
2. Install required resource tools by running "\res\res-tools.ps1"
30-
3. "\res\generate-exe.ps1" will generate and place "iw3xo.exe" into the project root
31-
4. Copy the generated exe into your cod4-root
32-
5. You only need to do this once
33-
34-
___
35-
36-
Requires:
37-
1. CoD4 1.7
38-
2. https://github.com/xoxor4d/xcommon_iw3xo (compiled, placed into root/zone/english/)
39-
3. https://github.com/xoxor4d/xcommon_iw3xo_menu (compiled, placed into root/zone/english/)
40-
4. English localization (other languages work when renamed:)
41-
- __root/localization.txt__ -> change first line to "english"
42-
- __root/main/__ -> rename "localized_yourlanguage_iw**.iwd" files to "localized_english_iw**.iwd"
43-
- __root/zone/__ -> rename folder "yourlanguage" to "english"
44-
45-
___
46-
47-
Optional:
48-
https://github.com/xoxor4d/iw3xo-radiant
49-
50-
Project Page:
51-
https://xoxor4d.github.io/projects/iw3xo/
52-
53-
Discord:
54-
https://discord.gg/t5jRGbj
55-
56-
<p float="left">
57-
<img src="https://xoxor4d.github.io/assets/img/iw3xo/collisionClip.jpg" width="47%" />
58-
<img src="https://xoxor4d.github.io/assets/img/iw3xo/originVelocity.jpg" width="47%" align="right" />
59-
</p>
60-
<br>
61-
62-
## Credits / Dependencies
63-
- The IW4x Team
64-
- The Plutonium Project Team
65-
- Nukem
66-
- https://github.com/ocornut/imgui
67-
- https://github.com/g-truc/glm/
68-
- https://github.com/devKlausS/dxsdk
69-
- https://github.com/Goblenus/WinHttpClient
70-
- https://github.com/Jelvan1/cgame_proxymod
71-
<br>
72-
73-
## Disclaimer
74-
This software has been created purely for the purposes of academic research. Project maintainers are not responsible or liable for misuse of the software. Use responsibly.
1+
2+
<h1 align="center">IW3xo - A Call of Duty 4 Modification</h3>
3+
4+
<p align="center">
5+
This project is aimed at developers and includes various modifications/additions.
6+
IW3xo is not compatible with CoD4x, so make sure you do have a stock non-steam 1.7 CoD4.
7+
A compatible Radiant, built for use with IW3xo, that enables a live-link between CoD4 and Radiant can be found below.
8+
</p>
9+
10+
<br>
11+
<div align="center" markdown="1">
12+
13+
[![GitHub release (latest by date)](https://img.shields.io/github/v/release/xoxor4d/iw3xo-dev?color=%2368BC71&logo=github)](https://github.com/xoxor4d/iw3xo-dev/releases)&ensp;
14+
![GitHub commits since latest release (by date)](https://img.shields.io/github/commits-since/xoxor4d/iw3xo-dev/latest/develop?logo=github)&ensp;
15+
[![Downloads](https://img.shields.io/github/downloads/xoxor4d/iw3xo-dev/total?logo=github&label=total-downloads)](https://github.com/xoxor4d/iw3xo-dev/releases)&ensp;
16+
[![Discord](https://img.shields.io/discord/677574256678141973?label=Discord&logo=discord&logoColor=%23FFFF&)](https://discord.gg/t5jRGbj)&ensp;
17+
18+
<br>
19+
20+
### nightly builds - develop branch
21+
( download and install the [latest release](https://github.com/xoxor4d/iw3xo-dev/releases) before using nightly's )
22+
23+
[![build-develop](https://img.shields.io/github/workflow/status/xoxor4d/iw3xo-dev/Build-Debug/develop?logo=github&label=nightly-develop)](https://nightly.link/xoxor4d/iw3xo-dev/workflows/build-debug/develop/Debug%20binaries.zip)&ensp;
24+
[![build-release](https://img.shields.io/github/workflow/status/xoxor4d/iw3xo-dev/Build-Release/develop?logo=github&label=nightly-release)](https://nightly.link/xoxor4d/iw3xo-dev/workflows/build-release/develop/Release%20binaries.zip)&ensp;
25+
26+
<br>
27+
28+
### > Features / Guides / In-Depth <
29+
https://xoxor4d.github.io/projects/iw3xo/
30+
31+
</div>
32+
33+
<br>
34+
35+
<div align="center">
36+
<img src="https://xoxor4d.github.io/assets/img/iw3xo/banner.jpg"/>
37+
<img src="https://raw.githubusercontent.com/xoxor4d/xoxor4d.github.io/master/assets/img/daynight/small_gif.gif"/>
38+
</div>
39+
40+
<br>
41+
<br>
42+
43+
___
44+
## Installation
45+
46+
<br>
47+
48+
1. Download the latest [release](https://github.com/xoxor4d/iw3xo-dev/releases)
49+
2. Copy the `.zip` contents into your cod4 root folder
50+
3. Start __IW3xo.exe__
51+
52+
- [NIGHTLY]&ensp; unpack and replace `iw3x.dll` with the one found in your cod4 root folder
53+
54+
<br>
55+
56+
___
57+
## Requirements:
58+
59+
<br>
60+
61+
1. CoD4 1.7
62+
2. https://github.com/xoxor4d/xcommon_iw3xo (compiled, placed into root/zone/english/)
63+
3. https://github.com/xoxor4d/xcommon_iw3xo_menu (compiled, placed into root/zone/english/)
64+
4. English localization (other languages work when renamed:)
65+
> - __root/localization.txt__ &ensp; -> change first line to "english"
66+
> - __root/main/__ &ensp; -> rename "localized_yourlanguage_iw**.iwd" files to "localized_english_iw**.iwd"
67+
> - __root/zone/__ &ensp; -> rename folder "yourlanguage" to "english"
68+
69+
<br>
70+
71+
___
72+
## Build / Compile
73+
74+
<br>
75+
76+
### > How to build / compile the project using Visual Studio
77+
1. Clone the repo! __(zip does not include deps!)__
78+
2. Use __generate-buildfiles.bat__ to build project files with premake
79+
3. Load the solution `(build/iw3xo-dev.sln)` and open the iw3x project-settings to setup paths:
80+
> - General &ensp; &ensp; &ensp; output directory path -> `path-to-cod4-root\`
81+
> - Debugging &ensp; command -> `path-to-cod4-root\IW3xo.exe`
82+
> - Debugging &ensp; working directory -> `path-to-cod4-root`
83+
4. Build -> Build Solution or run with debugger
84+
85+
<br>
86+
87+
### > Generating the exe:
88+
1. Copy a non-steam (1.7) `iw3mp.exe` into the `\assets\\` folder
89+
2. Install required resource tools by running `\res\res-tools.ps1`
90+
3. `\res\generate-exe.ps1` will generate and place `iw3xo.exe` into the project root
91+
4. Copy the generated exe into your cod4-root
92+
5. You only need to do this once
93+
94+
<br>
95+
96+
___
97+
98+
<br>
99+
100+
Optional:
101+
https://github.com/xoxor4d/iw3xo-radiant
102+
103+
Project Page:
104+
https://xoxor4d.github.io/projects/iw3xo/
105+
106+
Discord:
107+
https://discord.gg/t5jRGbj
108+
109+
<br>
110+
111+
## Credits
112+
- [X Labs](https://github.com/XLabsProject) (especially [Snake](https://github.com/momo5502))
113+
- [The Plutonium Project Team](https://plutonium.pw/) (especially [Rektinator](https://github.com/RektInator))
114+
- [Nukem9 - LinkerMod](https://github.com/Nukem9/LinkerMod)
115+
- [g-truc - glm](https://github.com/g-truc/glm/)
116+
- [ocornut - Dear ImGui](https://github.com/ocornut/imgui)
117+
- [Jelvan1 - cgame proxymod](https://github.com/Jelvan1/cgame_proxymod)
118+
119+
<br>
120+
121+
___
122+
## Images
123+
124+
<br>
125+
126+
<img src="https://xoxor4d.github.io/assets/img/iw3xo/collisionClip.jpg"/>
127+
<img src="https://raw.githubusercontent.com/xoxor4d/xoxor4d.github.io/master/assets/img/iw3xo/mainmenu.jpg"/>
128+
<img src="https://raw.githubusercontent.com/xoxor4d/xoxor4d.github.io/master/assets/img/iw3xo/feat_spmap.jpg"/>
129+
130+
<br>
131+
132+
## Disclaimer
133+
This software has been created purely for the purposes of academic research. Project maintainers are not responsible or liable for misuse of the software. Use responsibly.

0 commit comments

Comments
 (0)