Commit Graph

4740 Commits

Author SHA1 Message Date
Luke Usher 5e2fe4406d
Merge pull request #1227 from LukeUsher/log-test-case
Update LOG_TEST_CASE to add a log entry instead of a dialog.
2018-05-31 11:16:37 +01:00
Luke Usher 04b618cf1d LOG_TEST_CASE now shows an identifable log entry rather than a popup message 2018-05-31 11:04:53 +01:00
Luke Usher f5c3cb5e1c Update cx_x86 submodule 2018-05-31 11:02:07 +01:00
Luke Usher 282d8ac043
Merge pull request #1226 from RadWolfie/fix-rc-encode-issue
Fix rc encode issue
2018-05-31 08:17:28 +01:00
jackchentwkh 2ad3f2bad6 fix typos of controller mapping dialog and virtual SB dialog.
correct control names accordingly.
2018-05-30 16:52:53 +08:00
RadWolfie fef067833e Preview change from Visual Studio directly
First update cause it relocate for some reason. (Might be cause of manual edit.)
2018-05-29 13:51:34 -05:00
RadWolfie 9ded390a87 Enforce rc files as UTF-8 encode 2018-05-29 13:41:03 -05:00
PatrickvL 2d81b79587
Merge pull request #1216 from PatrickvL/FixPushbufferResources
D3D : Fix pushbuffer based drawing
2018-05-29 19:37:05 +02:00
Luke Usher cc0ebf1cb4
Merge pull request #1221 from LukeUsher/master
Update Submodules
2018-05-29 18:10:32 +01:00
Luke Usher c1bc34eb80 Update Submodules 2018-05-29 18:03:19 +01:00
RadWolfie 00c90319ad
Merge pull request #1220 from Cxbx-Reloaded/revert-1218-master
Revert "Revert rc files to binary (changed in 02141bd1c6)"
2018-05-29 11:37:52 -05:00
RadWolfie 986760cb4c
Revert "Revert rc files to binary (changed in 02141bd1c6)" 2018-05-29 11:37:06 -05:00
PatrickvL e8353f565f D3D : Fix detection of unused registers in vertex shader recompiler - `declaredRegisters` wasn't zero-initialized, it's random contents lead to random vertex-shader conversion errors. 2018-05-29 17:13:40 +02:00
Luke Usher 601ba35c8b
Merge pull request #1218 from jagotu/master
Revert rc files to binary (changed in 02141bd1c6)
2018-05-29 16:04:07 +01:00
Jan Gocník 859d329c72 Revert rc files to binary (changed in 02141bd1c6)
The reason it was added in f0a409a1 is probably still valid.
2018-05-29 16:59:04 +02:00
Luke Usher 1684bf4565
Oops: Fix typo 2018-05-29 14:56:02 +01:00
PatrickvL a38da81d7f D3D : Fix pushbuffer based drawing by calling CxbxUpdateNativeD3DResources from there too. 2018-05-29 15:55:41 +02:00
Luke Usher 9eb7df406f
Retarget CxbxVSBC to $(DefaultPlatformToolset) and SDK 8.1
This keeps it consistent with the rest of Cxbx-Reloaded
2018-05-29 14:26:25 +01:00
Luke Usher 86a3f88cf6
Merge pull request #1200 from PatrickvL/d3d9_vertex_shader
More porting work towards Direct3D 9
2018-05-29 13:33:22 +01:00
jackchentwkh 6edf293699 Add controller port configuration GUI and support virtual SB controller with feedback status (#1196)
* Add XB_ prefix for xbox XInput related structures and variables to prevent mis-use host equivalent.
Add newly findings for device table related info.

* Revert g_Controller ZeroMemory() calls.
now the XINPUT_STATE is correctly refering to host type, no need to specify the name space.

* Add X_CONTROLLER_HOST_BRIDGE structure type.
Prepare for configurabale host input, and virtual xbox controller.

* Fix DeviceInfo initialization when device table is not found.
always set state to enable rumble.

* experimenting virtual SteelBatalion controller.
using console as controller output.
using XInput and direct input combined keys

* first attem to emulat SteelBatalion controller works.

* add dialog file to solution

* Restore missing dialog files and functions

* Minor fix

* fix dialog control grouping
now registry works.

* refine some controller related constants

* Using Dialog for showing
SBC controller feedback
add possibility of using same dialog for virtual controller input.

* using EmuUpdateTickCount() as modeless dialog message handler.
sort of working.
revert the dlg message handling from wnd.cpp

* Finally the dialog for virtual SB controller feedback status works!
modeless dialog got issues. modal dialog will occupy focus. only way is to use a DLL, load the DLL when cxbx-r emulation child process started, and create a dummy window from DLL then create a modal dialog.
lots of code change and clean up.

* fix debug build,  use same character set setting for all configurations.

* restore C++ optimiztion setting in master

* remove unitended included ribbon resources

* removed necessary official document mentioning

* Add src/CxbxVSBC/Release and src/CxbxVSBC/Debug to .gitignore

* Move Host Port assignment related code to src/common/win32

* fix merge confliction

* oops, fix merge conflictions again.

* Add OLD_XINPUT mark for those marked out old XInput code. need to be reviewed in the future.

* remove unintended binary files

* fix debug build, again.
revert unindteded changes to submodule

* rever unintended submodule change

* Relocate project to build/Win32 folder

Co-Authored-By: anita999 <anita999@ms12.hinet.net>

* Restore sln file base on master

* Include project dependency to build

* Final fixup for sln file

* Restore original new line code

* Update Wnd.cpp

* Remove old include

* Include CxbxVSBC.dll into AppVeyor

This should be the last fixup for pull request.

* Fix merge-conflict

* Fix files encode format to UTF-8

* treat .rc file as text instead of binary

* Revert "treat .rc file as text instead of binary"

This reverts commit 034039d723.
2018-05-29 13:33:01 +01:00
RadWolfie 1e61144bb6
Merge pull request #1214 from RadWolfie/fix-rc-files
Fix rc files
2018-05-29 01:14:10 -05:00
RadWolfie 02141bd1c6 remove enforce assume binary on rc files 2018-05-29 01:08:17 -05:00
RadWolfie c37492b27e Fix rc file to UTF-8 encode format 2018-05-29 01:01:26 -05:00
RadWolfie b05ac86548
Merge pull request #1213 from RadWolfie/gitignore-update
Force remove ignored file from source control system
2018-05-29 00:26:11 -05:00
RadWolfie 0a4c3bf6bf Force remove ignored file from source control system 2018-05-29 00:25:10 -05:00
PatrickvL 3f885fb202 D3D9 : More accurate decoding of packed integer to float 2018-05-28 16:54:24 +02:00
PatrickvL 73de67367a D3D9 : Vertex shader declaration recompile fixes 2018-05-28 16:15:04 +02:00
Luke Usher 636e3955fc
Merge pull request #1212 from Voxel9/LLE-HLE-labels
Implement LLE flags in place of LED text
2018-05-28 13:03:29 +01:00
Voxel9 5939f68125 Remove unnecesary space after brace 2018-05-28 11:27:16 +01:00
Voxel9 18a48546fe Remove "LED" text and replace with LLE flags text 2018-05-28 11:24:57 +01:00
patrickvl b23e8cf3f3 D3D9 : More capability checks 2018-05-27 21:04:22 +02:00
patrickvl d0a499c545 D3D9 : Also check D3DDTCAPS during vertex element conversion 2018-05-27 20:57:16 +02:00
Luke Usher 57a70654ee
Merge pull request #1210 from blueshogun96/master
Keep track of thread handles duplicated for APCs
2018-05-27 19:25:56 +01:00
PatrickvL edcf95dcc6
Merge pull request #1211 from ergo720/eeprom_serial
Align serial number text in eeprom menu
2018-05-27 20:09:29 +02:00
blueshogun96 7c06c9b7c1 Cleanup duplicate handle on initial APC creation failure 2018-05-27 10:50:29 -07:00
patrickvl 2668a01a87 D3D9 : Honour D3DCaps for all DECLTYPES 2018-05-27 15:55:17 +02:00
ergo720 bc2a551ee5 Align serial number text in eeprom menu 2018-05-27 14:54:00 +02:00
patrickvl 25dc517226 D3D9 : Use an alias for pixel shader constant type 2018-05-27 14:45:56 +02:00
blueshogun96 9800c0d494 Keep original formatting 2018-05-26 12:41:18 -07:00
blueshogun96 ec7cd60b97 Cleanup duplicated handles for APCs 2018-05-26 12:14:04 -07:00
blueshogun96 a81db113ee Cleanup duplicated handles for APCs 2018-05-26 12:14:03 -07:00
RadWolfie 06632b2794
Merge pull request #1208 from LukeUsher/optimising-tweaks
Tweak Compiler Optimization Settings
2018-05-26 01:32:19 -05:00
Luke Usher e864f301a7 Oops 2018-05-25 23:08:11 +01:00
Luke Usher f86d3d9509 Even more aggressive optimization (Use LTCG) 2018-05-25 22:59:57 +01:00
Luke Usher e6013ba225 Tweak optimization settings: This should give a (slight) speed boost for some users 2018-05-25 22:39:39 +01:00
Luke Usher 3457c6b185
Merge pull request #1205 from jagotu/master
QueryMemory reports host allocated memory
2018-05-25 22:01:06 +01:00
Jan Gocník 006b49937c QueryMemory reports host allocated memory 2018-05-25 15:15:09 +02:00
patrickvl 341edd2512 D3D9 : Honour D3DCaps for UBTYE4 support 2018-05-25 08:38:05 +02:00
RadWolfie aaf6579c45
Merge pull request #1202 from RadWolfie/eeprom-hotfix
Hotfix EEPROM
2018-05-24 20:48:23 -05:00
RadWolfie 3dc9d0dfd7 Hotfix EEPROM
Found the source of cause, after this change. Attempted to reproduce the issue no longer return. Now everything works as intended.
2018-05-24 20:46:47 -05:00