Commit Graph

20 Commits (e66a97c01290d583e6b6eb4021af029a3cb79fa0)

Author SHA1 Message Date
Nemirtingas 4f5d281822 Merge branch 'master' into 'use_cross_compilers_and_vcpkg'
# Conflicts:
#   build_win_debug_experimental_steamclient.bat
2021-01-19 06:33:49 +00:00
Mr_Goldberg 671277a154
Remove useless build. 2021-01-18 00:01:05 -05:00
Nemirtingas 7ad4fc1fdf Change includes for nlohmann libs. 2020-10-14 06:43:33 +02:00
Mr_Goldberg db2a803cf7
A few improvements to the overlay merge request.
NO_OVERLAY define becomes EMU_OVERLAY which enables the overlay instead of disabling it.

disable_overlay.txt moved to steam_settings.
2020-01-19 12:55:14 -05:00
Nemirtingas daaa14d7f6 Update build_win_debug_experimental.bat 2019-12-09 06:40:27 +00:00
Nemirtingas d1a4adc5bd Merge branch 'master' into 'overlay_h'
# Conflicts:
#   .gitlab-ci.yml
#   dll/steam_client.cpp
#   dll/steam_inventory.h
#   dll/steam_user_stats.h
2019-12-06 12:44:43 +00:00
Nemirtingas 8d22fb72ae Merge branch 'master' into 'achievements_support'
# Conflicts:
#   dll/steam_remote_storage.h
2019-10-05 19:48:41 +00:00
Nemirtingas 5ad434e190 Merge branch 'master' into overlay_h 2019-09-20 13:26:34 +02:00
Mr_Goldberg 2af93427fe
Initial Xinput ISteamInput/ISteamController support. 2019-09-10 14:54:54 -04:00
Nemirtingas 7a59f48000 Merge branch 'master' into achievements_support 2019-08-26 19:45:58 +02:00
Nemirtingas 2365b50c38 Merge branch 'master' into overlay_h 2019-08-26 19:32:06 +02:00
Mr_Goldberg 1d920c538a
Christsnatcher .bat improvements. 2019-08-26 13:01:00 -04:00
Nemirtingas b17e3b7be3 Added win static build for curl 2019-08-21 21:35:41 +02:00
Nemirtingas 71d3e301c2 Added Winmm (Wav Play) 2019-08-16 18:33:51 +02:00
Nemirtingas d7f6d254eb Added static glew to build scripts 2019-08-16 11:27:07 +02:00
Nemirtingas 664d9a29b1 Updated build paths 2019-08-14 23:22:56 +02:00
Nemirtingas 411c2c2dda Revert Test Fix 2019-08-14 22:31:44 +02:00
Nemirtingas 6ef60bfe63 Test fix 2019-08-14 22:08:22 +02:00
Mr_Goldberg 320063c339
Fix building on latest vspkg protobuf package. 2019-04-13 12:51:54 -04:00
Mr_Goldberg d968c3e1b5
Initial commit. 2019-04-13 12:21:56 -04:00