Merge remote-tracking branch 'upstream/master'
This commit is contained in:
ergo720
commit
1d9736e5af
|
|
@ -0,0 +1,31 @@
|
|||
<!--
|
||||
|
||||
Questions can be asked at Gitter: https://gitter.im/Cxbx-Reloaded/Lobby
|
||||
|
||||
-->
|
||||
|
||||
### Description
|
||||
|
||||
[Description of the issue]
|
||||
|
||||
---
|
||||
|
||||
### Game info
|
||||
[XBE Dump, KrnlDebug, HLE Cache, Ect]
|
||||
|
||||
---
|
||||
|
||||
### Status
|
||||
**Previous behavior:** [Before regression]
|
||||
|
||||
**Current behavior:** [On the latest build]
|
||||
|
||||
---
|
||||
|
||||
### Screenshots [Errors, Graphics, Glitches, ECT]
|
||||
|
||||
---
|
||||
|
||||
### Additional Information
|
||||
|
||||
Any additional information such as configuration or other comments
|
||||
13
README.md
13
README.md
|
|
@ -20,15 +20,20 @@ Cxbx-Reloaded is early in development and still pretty unstable, so don't expect
|
|||
Cxbx-Reloaded is not yet ready for general release, but the latest development build can always be downloaded from our [AppVeyor](https://ci.appveyor.com/project/SoullessSentinel/cxbx-reloaded/branch/master) (navigate to Configuration: Release => Artifacts => export\Release.zip).
|
||||
|
||||
## Compatibility
|
||||
We have a basic [compatibility list](https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/issues/222). If you have found an issue that has not been reported, please create a report for each issue per game rather than commenting on the list!
|
||||
We have a basic [compatibility list](https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/issues/222). If you have found an issue that has not been reported, please create a report (see below) for each issue per game rather than commenting on the list!
|
||||
|
||||
## Bug Reports
|
||||
As Cxbx-Reloaded is in early stages of development right now, most games will either crash or do nothing. Please do not submit issues for these games.
|
||||
|
||||
Please report games that actually do something. If a game outputs graphics or audio before crashing, please submit a bug report containing the build tested with, error message displayed (if any), screenshots, an Xbe dump (created via [Edit -> Dump Xbe Info To -> File]), and a Kernel Debug file (created when running a game when [View -> Debug Output (Kernel) -> File]) is selected.
|
||||
Please report games that actually do something. If a game outputs graphics or audio before crashing, please submit a bug report at [GitHub](https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/issues) containing the build tested with, error message displayed (if any), screenshots, an Xbe dump (created via [Edit -> Dump Xbe Info To -> File]), and a Kernel Debug file (created when running a game when [View -> Debug Output (Kernel) -> File]) is selected.
|
||||
|
||||
## Screenshot Gallery
|
||||
You can find the regularly updated gallery at http://imgur.com/a/Bzvti.
|
||||
## Additional information
|
||||
Cxbx-Reloaded has a [wiki](http://github.com/Cxbx-Reloaded/Cxbx-Reloaded/wiki) containing various subjects and background information.
|
||||
Chat on [Gitter](https://gitter.im/Cxbx-Reloaded/Lobby) or [Discord](https://discord.gg/26Xjx23).
|
||||
You can find a screenshot gallery at [imgur](http://imgur.com/a/Bzvti).
|
||||
|
||||
## Support
|
||||
You can support Luke Usher (initiator of Cxbx-Reloaded) on [Patreon](https://www.patreon.com/LukeUsher).
|
||||
|
||||
## Special Thanks
|
||||
All contributers to the original Cxbx and Dxbx projects, without which Cxbx-Reloaded would not exist at all.
|
||||
|
|
|
|||
|
|
@ -316,7 +316,6 @@ $(SOLUTIONDIR)Export.bat</Command>
|
|||
<None Include="..\..\CONTRIBUTORS" />
|
||||
<None Include="..\..\COPYING" />
|
||||
<None Include="..\..\README.md" />
|
||||
<None Include="..\..\resource\About.jpg" />
|
||||
<None Include="..\..\resource\Cxbx.ico" />
|
||||
<None Include="..\..\resource\Logo.bmp" />
|
||||
<None Include="..\..\resource\Splash.jpg" />
|
||||
|
|
|
|||
|
|
@ -246,180 +246,15 @@
|
|||
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h">
|
||||
<Filter>EmuD3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4721.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XNet.1.0.4627.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5028.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5233.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5344.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5558.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5788.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5849.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.3936.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4134.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4361.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4432.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4627.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5028.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5233.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5344.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5558.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5788.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5849.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XactEng.1.0.4627.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5028.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5233.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5344.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5558.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5788.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5849.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.3911.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4034.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4361.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4432.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4627.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5028.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5233.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5344.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5558.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5788.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5849.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XNet.1.0.3911.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4627.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5028.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5233.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5344.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5558.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5788.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5849.h">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuKrnlLogging.h">
|
||||
<Filter>Kernel</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -576,176 +411,185 @@
|
|||
<ClInclude Include="..\..\src\Common\Win32\XBAudio.h">
|
||||
<Filter>Shared</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5028.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5233.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5344.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5558.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5788.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5849.h">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.3936.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4134.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4361.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4432.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4627.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5028.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5233.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5344.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5558.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5788.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5849.h">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4721.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5028.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5233.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5344.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5558.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5788.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5849.h">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.3911.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4034.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4361.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4432.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4627.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5028.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5233.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5344.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5558.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5788.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5849.h">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.h">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4627.h">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5028.h">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5233.h">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5344.h">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5558.h">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5788.h">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5849.h">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\resource\About.jpg">
|
||||
<Filter>GUI</Filter>
|
||||
</None>
|
||||
<None Include="..\..\resource\Splash.jpg">
|
||||
<Filter>GUI</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5028.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5233.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5344.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5558.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5788.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5849.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.3936.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4134.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4361.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4432.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4627.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5028.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5233.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5344.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5558.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5849.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XactEng.1.0.4627.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4721.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5028.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5233.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5344.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5558.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5849.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.3911.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4034.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4361.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4432.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4627.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5028.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5233.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5344.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5558.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5849.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XNet.1.0.3911.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XNet.1.0.4627.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4627.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5028.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5233.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5344.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5558.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5849.inl">
|
||||
<Filter>HLEDatabase</Filter>
|
||||
</None>
|
||||
<None Include="..\..\resource\Cxbx.ico">
|
||||
<Filter>Shared</Filter>
|
||||
</None>
|
||||
|
|
@ -755,6 +599,162 @@
|
|||
<None Include="..\..\CONTRIBUTORS" />
|
||||
<None Include="..\..\COPYING" />
|
||||
<None Include="..\..\README.md" />
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5028.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5233.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5344.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5558.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5788.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5849.inl">
|
||||
<Filter>HLEDatabase\D3D8</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5849.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.3936.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4134.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4361.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4432.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4627.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5028.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5233.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5344.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5558.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5788.inl">
|
||||
<Filter>HLEDatabase\DSound</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4721.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5028.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5233.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5344.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5558.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5849.inl">
|
||||
<Filter>HLEDatabase\Xapi</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.3911.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4034.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4361.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4432.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4627.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5028.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5233.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5344.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5558.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5849.inl">
|
||||
<Filter>HLEDatabase\XG</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5849.inl">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.inl">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4627.inl">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5028.inl">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5233.inl">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5344.inl">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5558.inl">
|
||||
<Filter>HLEDatabase\XOnline</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Filter Include="GUI">
|
||||
|
|
@ -775,6 +775,21 @@
|
|||
<Filter Include="Shared">
|
||||
<UniqueIdentifier>{d8ef7ef5-cbb9-4dba-9cab-585519a9756b}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="HLEDatabase\D3D8">
|
||||
<UniqueIdentifier>{e78a3cc3-abce-4577-90aa-b7535bb09768}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="HLEDatabase\DSound">
|
||||
<UniqueIdentifier>{a942f43a-b405-4c5d-85cd-ffc84b66ad3f}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="HLEDatabase\Xapi">
|
||||
<UniqueIdentifier>{736110f8-9b79-47db-86f5-250d1d4d8b9a}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="HLEDatabase\XG">
|
||||
<UniqueIdentifier>{8347c248-d327-4438-a465-a3a6d408c9e6}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="HLEDatabase\XOnline">
|
||||
<UniqueIdentifier>{40bc9467-7e4d-4ab5-b062-1aa0ba4af44d}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="..\..\resource\Cxbx.rc">
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB |
|
|
@ -288,8 +288,6 @@ END
|
|||
// JPEG
|
||||
//
|
||||
|
||||
IDR_JPEG_ABOUT JPEG "About.jpg"
|
||||
|
||||
IDR_JPEG_SPLASH JPEG "Splash.jpg"
|
||||
|
||||
#endif // English (United States) resources
|
||||
|
|
|
|||
|
|
@ -2294,11 +2294,11 @@ HRESULT WINAPI XTL::EMUPATCH(Direct3D_CreateDevice)
|
|||
//g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_COLORKEYOP, D3DTCOLORKEYOP_DISABLE);
|
||||
//g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_COLORSIGN, 0);
|
||||
//g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_ALPHAKILL, D3DTALPHAKILL_DISABLE);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_COLOROP, D3DTOP_DISABLE);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_COLOROP, D3DTOP_MODULATE); // D3DTOP_DISABLE caused textures to go opaque
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_COLORARG0, D3DTA_CURRENT);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_COLORARG1, D3DTA_TEXTURE);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_COLORARG2, D3DTA_CURRENT);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_ALPHAARG0, D3DTA_CURRENT);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_ALPHAARG2, D3DTA_CURRENT);
|
||||
|
|
@ -2310,10 +2310,11 @@ HRESULT WINAPI XTL::EMUPATCH(Direct3D_CreateDevice)
|
|||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_BUMPENVMAT10, 0);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_BUMPENVLSCALE, 0);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_BUMPENVLOFFSET, 0);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_TEXCOORDINDEX, 0);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_TEXCOORDINDEX, stage);
|
||||
g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_BORDERCOLOR, 0);
|
||||
//g_pD3DDevice8->SetTextureStageState(stage, D3DTSS_COLORKEYCOLOR, 0);
|
||||
}
|
||||
|
||||
return g_EmuCDPD.hRet;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ static int g_bDSoundCreateCalled = FALSE;
|
|||
unsigned int g_iDSoundSynchPlaybackCounter = 0;
|
||||
|
||||
#define RETURN_RESULT_CHECK(hRet) { static bool bPopupShown = false; if (!bPopupShown && hRet) { bPopupShown = true; \
|
||||
printf("Return result report: 0x%08X\nIn %s (%s)", hRet, __func__, __FILE__); \
|
||||
printf("Return result report: 0x%08X\nIn %s (%s)\n", hRet, __func__, __FILE__); \
|
||||
MessageBoxA(NULL, "An issue has been found. Please report game title and console's output of return result," \
|
||||
" function, and file name to https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/issues/485", \
|
||||
"WARNING", MB_OK | MB_ICONWARNING); } return hRet; }
|
||||
|
|
@ -959,15 +959,28 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetBufferData)
|
|||
LOG_FUNC_ARG(dwBufferBytes)
|
||||
LOG_FUNC_END;
|
||||
|
||||
// update buffer data cache
|
||||
pThis->EmuBuffer = pvBufferData;
|
||||
pThis->EmuLockOffset = 0;
|
||||
|
||||
ResizeIDirectSoundBuffer(pThis->EmuDirectSoundBuffer8, pThis->EmuBufferDesc, pThis->EmuPlayFlags, dwBufferBytes, pThis->EmuDirectSound3DBuffer8);
|
||||
|
||||
if (pThis->EmuFlags & DSB_FLAG_XADPCM) {
|
||||
DSoundBufferXboxAdpcmDecoder(pThis->EmuDirectSoundBuffer8, pThis->EmuBufferDesc, 0, pvBufferData, dwBufferBytes, NULL, 0, false);
|
||||
//TODO: Current workaround method since dwBufferBytes do set to zero. Otherwise it will produce lock error message.
|
||||
if (dwBufferBytes == 0) {
|
||||
leaveCriticalSection;
|
||||
return DS_OK;
|
||||
}
|
||||
ResizeIDirectSoundBuffer(pThis->EmuDirectSoundBuffer8, pThis->EmuBufferDesc, pThis->EmuPlayFlags, dwBufferBytes, pThis->EmuDirectSound3DBuffer8);
|
||||
|
||||
XTL::EMUPATCH(IDirectSoundBuffer_Lock)(pThis, 0, dwBufferBytes, &pThis->EmuLockPtr1, &pThis->EmuLockBytes1, NULL, NULL, pThis->EmuLockFlags);
|
||||
|
||||
if (pThis->EmuLockPtr1 != 0) {
|
||||
memcpy(pThis->EmuLockPtr1, pvBufferData, pThis->EmuLockBytes1);
|
||||
}
|
||||
|
||||
DSoundGenericUnlock(pThis->EmuFlags,
|
||||
pThis->EmuDirectSoundBuffer8,
|
||||
pThis->EmuBufferDesc,
|
||||
pThis->EmuLockOffset,
|
||||
pThis->EmuLockPtr1,
|
||||
pThis->EmuLockBytes1,
|
||||
pThis->EmuLockPtr2,
|
||||
pThis->EmuLockBytes2,
|
||||
pThis->EmuLockFlags);
|
||||
|
||||
leaveCriticalSection;
|
||||
|
||||
|
|
@ -1038,37 +1051,32 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_Lock)
|
|||
|
||||
HRESULT hRet = D3D_OK;
|
||||
|
||||
if (pThis->EmuBuffer != 0) {
|
||||
*ppvAudioPtr1 = pThis->EmuBuffer;
|
||||
*pdwAudioBytes1 = dwBytes;
|
||||
} else {
|
||||
if (dwBytes > pThis->EmuBufferDesc->dwBufferBytes) {
|
||||
ResizeIDirectSoundBuffer(pThis->EmuDirectSoundBuffer8, pThis->EmuBufferDesc, pThis->EmuPlayFlags, dwBytes, pThis->EmuDirectSound3DBuffer8);
|
||||
}
|
||||
|
||||
DSoundGenericUnlock(pThis->EmuFlags,
|
||||
pThis->EmuDirectSoundBuffer8,
|
||||
pThis->EmuBufferDesc,
|
||||
pThis->EmuLockOffset,
|
||||
pThis->EmuLockPtr1,
|
||||
pThis->EmuLockBytes1,
|
||||
pThis->EmuLockPtr2,
|
||||
pThis->EmuLockBytes2,
|
||||
pThis->EmuLockFlags);
|
||||
|
||||
hRet = pThis->EmuDirectSoundBuffer8->Lock(dwOffset, dwBytes, ppvAudioPtr1, pdwAudioBytes1, ppvAudioPtr2, pdwAudioBytes2, dwFlags);
|
||||
|
||||
if (FAILED(hRet)) {
|
||||
CxbxKrnlCleanup("DirectSoundBuffer Lock Failed!");
|
||||
}
|
||||
pThis->EmuLockOffset = dwOffset;
|
||||
pThis->EmuLockPtr1 = *ppvAudioPtr1;
|
||||
pThis->EmuLockBytes1 = *pdwAudioBytes1;
|
||||
pThis->EmuLockPtr2 = (ppvAudioPtr2 != NULL) ? *ppvAudioPtr2 : NULL;
|
||||
pThis->EmuLockBytes2 = (pdwAudioBytes2 != NULL) ? *pdwAudioBytes2 : NULL;
|
||||
pThis->EmuLockFlags = dwFlags;
|
||||
if (dwBytes > pThis->EmuBufferDesc->dwBufferBytes) {
|
||||
ResizeIDirectSoundBuffer(pThis->EmuDirectSoundBuffer8, pThis->EmuBufferDesc, pThis->EmuPlayFlags, dwBytes, pThis->EmuDirectSound3DBuffer8);
|
||||
}
|
||||
|
||||
DSoundGenericUnlock(pThis->EmuFlags,
|
||||
pThis->EmuDirectSoundBuffer8,
|
||||
pThis->EmuBufferDesc,
|
||||
pThis->EmuLockOffset,
|
||||
pThis->EmuLockPtr1,
|
||||
pThis->EmuLockBytes1,
|
||||
pThis->EmuLockPtr2,
|
||||
pThis->EmuLockBytes2,
|
||||
pThis->EmuLockFlags);
|
||||
|
||||
hRet = pThis->EmuDirectSoundBuffer8->Lock(dwOffset, dwBytes, ppvAudioPtr1, pdwAudioBytes1, ppvAudioPtr2, pdwAudioBytes2, dwFlags);
|
||||
|
||||
if (FAILED(hRet)) {
|
||||
CxbxKrnlCleanup("DirectSoundBuffer Lock Failed!");
|
||||
}
|
||||
pThis->EmuLockOffset = dwOffset;
|
||||
pThis->EmuLockPtr1 = *ppvAudioPtr1;
|
||||
pThis->EmuLockBytes1 = *pdwAudioBytes1;
|
||||
pThis->EmuLockPtr2 = (ppvAudioPtr2 != NULL) ? *ppvAudioPtr2 : NULL;
|
||||
pThis->EmuLockBytes2 = (pdwAudioBytes2 != NULL) ? *pdwAudioBytes2 : NULL;
|
||||
pThis->EmuLockFlags = dwFlags;
|
||||
|
||||
leaveCriticalSection;
|
||||
|
||||
RETURN_RESULT_CHECK(hRet);
|
||||
|
|
@ -1449,7 +1457,7 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreateStream)
|
|||
}
|
||||
pDSBufferDesc->dwSize = sizeof(DSBUFFERDESC);
|
||||
//pDSBufferDesc->dwFlags = (pdssd->dwFlags & dwAcceptableMask) | DSBCAPS_CTRLVOLUME | DSBCAPS_GETCURRENTPOSITION2;
|
||||
pDSBufferDesc->dwFlags = DSBCAPS_CTRLVOLUME;
|
||||
pDSBufferDesc->dwFlags = DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFREQUENCY; //aka DSBCAPS_DEFAULT
|
||||
pDSBufferDesc->dwBufferBytes = DSBSIZE_MIN;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ void CxbxInitAudio();
|
|||
#define X_DSBPAUSE_PAUSE 0x00000001
|
||||
#define X_DSBPAUSE_SYNCHPLAYBACK 0x00000002
|
||||
|
||||
// EmuIDirectSoundBuffer_Pause flags
|
||||
// EmuIDirectSoundStream_Pause flags
|
||||
#define X_DSSPAUSE_RESUME 0x00000000
|
||||
#define X_DSSPAUSE_PAUSE 0x00000001
|
||||
#define X_DSSPAUSE_SYNCHPLAYBACK 0x00000002
|
||||
|
|
|
|||
|
|
@ -207,6 +207,7 @@ inline void GeneratePCMFormat(
|
|||
DWORD &dwEmuFlags)
|
||||
{
|
||||
bool bIsSpecial = false;
|
||||
DWORD checkAvgBps;
|
||||
|
||||
// convert from Xbox to PC DSound
|
||||
{
|
||||
|
|
@ -239,6 +240,13 @@ inline void GeneratePCMFormat(
|
|||
switch (pDSBufferDesc->lpwfxFormat->wFormatTag) {
|
||||
case WAVE_FORMAT_PCM:
|
||||
dwEmuFlags |= DSB_FLAG_PCM;
|
||||
|
||||
//TODO: Phantasy Star Online Episode I & II made an attempt to use avg byte/second below sample/second requirement.
|
||||
//In other word, this is a workaround to fix title mistake...
|
||||
checkAvgBps = lpwfxFormat->nSamplesPerSec * lpwfxFormat->nBlockAlign;
|
||||
if (lpwfxFormat->nAvgBytesPerSec < checkAvgBps) {
|
||||
pDSBufferDesc->lpwfxFormat->nAvgBytesPerSec = checkAvgBps;
|
||||
}
|
||||
break;
|
||||
case WAVE_FORMAT_XBOX_ADPCM:
|
||||
dwEmuFlags |= DSB_FLAG_XADPCM;
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ OOVPA_END;
|
|||
// ******************************************************************
|
||||
// * CDirectSoundStream::SetFrequency
|
||||
// ******************************************************************
|
||||
OOVPA_XREF(CDirectSoundStream_SetFrequency, 5233, 8,
|
||||
OOVPA_XREF(CDirectSoundStream_SetFrequency, 5233, 11,
|
||||
|
||||
XRefNoSaveIndex,
|
||||
XRefOne)
|
||||
|
|
@ -304,11 +304,20 @@ OOVPA_XREF(CDirectSoundStream_SetFrequency, 5233, 8,
|
|||
XREF_ENTRY( 0x36, XREF_DSBUFFERSETFREQUENCYB ),
|
||||
|
||||
{ 0x0E, 0xB6 },
|
||||
// je XXXXXXXX + 0x0B
|
||||
{ 0x14, 0x74 },
|
||||
{ 0x15, 0x0B },
|
||||
// jmp XXXXXXXX + 0x26
|
||||
{ 0x26, 0xEB },
|
||||
{ 0x27, 0x26 },
|
||||
|
||||
{ 0x2A, 0x24 },
|
||||
// je XXXXXXXX + 0x0B
|
||||
{ 0x3E, 0x74 },
|
||||
{ 0x4D, 0x5F },
|
||||
{ 0x3F, 0x0B },
|
||||
|
||||
// ret 8
|
||||
{ 0x4F, 0xC2 },
|
||||
{ 0x50, 0x08 },
|
||||
OOVPA_END;
|
||||
|
||||
|
|
|
|||
|
|
@ -1509,26 +1509,6 @@ OOVPA_XREF(CDirectSoundStream_SetRolloffCurve, 5558, 8,
|
|||
{ 0x53, 0x8B },
|
||||
OOVPA_END;
|
||||
|
||||
// ******************************************************************
|
||||
// * DirectSound::CDirectSoundStream::SetFrequency
|
||||
// ******************************************************************
|
||||
OOVPA_XREF(CDirectSoundStream_SetFrequency, 5558, 9,
|
||||
|
||||
XRefNoSaveIndex,
|
||||
XRefOne)
|
||||
|
||||
XREF_ENTRY( 0x36, XREF_DSBUFFERSETFREQUENCYB ),
|
||||
|
||||
{ 0x00, 0x56 },
|
||||
{ 0x0C, 0x00 },
|
||||
{ 0x14, 0x74 },
|
||||
{ 0x21, 0xB8 },
|
||||
{ 0x2A, 0x24 },
|
||||
{ 0x35, 0xE8 },
|
||||
{ 0x40, 0x68 },
|
||||
{ 0x4B, 0x8B },
|
||||
OOVPA_END;
|
||||
|
||||
// ******************************************************************
|
||||
// * DirectSound::CDirectSound::SetAllParameters
|
||||
// ******************************************************************
|
||||
|
|
@ -1698,7 +1678,7 @@ OOVPATable DSound_5558[] = {
|
|||
REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4134, PATCH),
|
||||
REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF),
|
||||
REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF),
|
||||
REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5558, PATCH),
|
||||
REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH),
|
||||
REGISTER_OOVPA(IDirectSoundBuffer_SetFrequency, 4134, PATCH),
|
||||
REGISTER_OOVPA(CMcpxVoiceClient_SetVolume, 4134, XREF),
|
||||
REGISTER_OOVPA(CDirectSound_CreateSoundStream, 4361, XREF),
|
||||
|
|
|
|||
|
|
@ -689,7 +689,7 @@ OOVPATable DSound_5788[] = {
|
|||
REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5788, PATCH),
|
||||
REGISTER_OOVPA(CDirectSoundVoice_SetFrequency, 4134, XREF),
|
||||
REGISTER_OOVPA(CDirectSoundBuffer_SetFrequency, 4134, XREF),
|
||||
REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5558, PATCH),
|
||||
REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH),
|
||||
REGISTER_OOVPA(CDirectSoundVoice_SetDopplerFactor, 5558, XREF),
|
||||
REGISTER_OOVPA(CDirectSoundBuffer_SetDopplerFactor, 5558, XREF),
|
||||
REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 5558, PATCH),
|
||||
|
|
|
|||
|
|
@ -305,7 +305,8 @@ OOVPATable DSound_5849[] = {
|
|||
REGISTER_OOVPA(IDirectSoundBuffer_Use3DVoiceData, 5558, PATCH),
|
||||
REGISTER_OOVPA(CDirectSoundStream_Use3DVoiceData, 5558, XREF),
|
||||
REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF),
|
||||
REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 4627, PATCH)
|
||||
REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 4627, PATCH),
|
||||
REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH)
|
||||
};
|
||||
|
||||
// ******************************************************************
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ size_t MemoryManager::QueryAllocationSize(void* addr)
|
|||
TypedMemoryBlock *info = FindContainingTypedMemoryBlock(addr);
|
||||
if (info != nullptr) {
|
||||
// Return the total size in this block
|
||||
ret = info->block.size;// -((size_t)addr - (size_t)info->block.addr);
|
||||
ret = info->block.size - ((size_t)addr - (size_t)info->block.addr);
|
||||
}
|
||||
else {
|
||||
#if 1 // TODO : Only log this in DEBUG builds (as a failure is already indicated by a null result)?
|
||||
|
|
|
|||
Loading…
Reference in New Issue