1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git synced 2024-11-14 10:50:13 +01:00
Commit graph

36 commits

Author SHA1 Message Date
Mr_Goldberg
8cdf5cee26
Proper vcpkg directory for protobuf (thanks Christsnatcher). 2020-02-14 15:00:16 -05: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
Mr_Goldberg
ffdaf72597
Merge branch 'overlay_h' of https://gitlab.com/Nemirtingas/goldberg_emulator
# Conflicts:
#	build_steamos.sh
#	dll/dll.cpp
2020-01-19 12:50:01 -05:00
Mr_Goldberg
0c4831260e
Forgot this. 2020-01-15 14:27:27 -05:00
Mr_Goldberg
d9173e7b50
Fix yaml. 2020-01-15 13:27:15 -05:00
Mr_Goldberg
47c8f0a2a1
Fix yaml? 2020-01-15 13:21:37 -05:00
Mr_Goldberg
0ed433cb26
Add a bundle of the source code to the git builds zip. 2020-01-15 13:18:12 -05:00
Nemirtingas
118dee9278 Merge remote-tracking branch 'Mr_Goldberg/master' into overlay_h 2020-01-10 08:16:16 +01:00
Nemirtingas
7ebb5a0ce5 Update .gitlab-ci.yml 2019-12-09 06:37:58 +00:00
Mr_Goldberg
82eaf4f684
Add steamclient debug build to ci. 2019-12-06 14:42:46 -05:00
Nemirtingas
e72d0590af Update .gitlab-ci.yml 2019-12-06 13:11:54 +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
Mr_Goldberg
949a327b8a
Implement inventory functions.
Fix CI build.
2019-12-04 08:44:14 -05:00
Mr_Goldberg
233835c576
Use fedora wine for windows cmake build. 2019-12-03 15:13:38 -05:00
Mr_Goldberg
ff566ec810
Check if downgrading image will fix build. 2019-12-03 14:13:00 -05:00
Mr_Goldberg
10cd4cea80
Small code cleanup. 2019-12-03 13:39:17 -05:00
Nemirtingas
45db63a738 Merge branch 'master' into overlay_h 2019-08-26 21:25:32 +02:00
Mr_Goldberg
734ff89291
Gitlab ci fix. 2019-08-26 14:45:49 -04:00
Nemirtingas
78ffbc6571 Added ImGui wildcard escape 2019-08-16 10:42:43 +02:00
Nemirtingas
3516b98042 Replaced wildcard with sed. 2019-08-15 22:23:59 +02:00
Nemirtingas
bbfdcd848f Moved download of glew 2019-08-15 14:02:40 +02:00
Nemirtingas
631bcd96ce Added glew and pointing to the right directory for imgui 2019-08-15 12:54:18 +02:00
Nemirtingas
86d74c7a05 Added EMU_EXPERIMENTAL_BUILD define 2019-08-14 23:57:47 +02:00
Nemirtingas
9729ae9e4d Added overlay files to cmake 2019-08-14 23:01:56 +02:00
vergeten
70a519e4e5 Very rough update to the CMakeLists.txt adding steamclient, steamnetworkingsockets and lobby_connect targets and fallbacks defines for the protobuf libraries and protoc executable 2019-08-12 13:53:23 +00:00
Mr_Goldberg
d07ffec5f3
Add windows debug experimental build to latest git build. 2019-05-25 18:06:18 -04:00
Mr_Goldberg
2b1368ccac
Use windows line endings for txt files in latest git build. 2019-05-17 14:55:14 -04:00
Mr_Goldberg
3552eed3ec
Tiny fixes. 2019-05-03 08:47:40 -04:00
Mr_Goldberg
17c1e12c58
Remove some wine warnings. 2019-05-03 06:44:21 -04:00
Mr_Goldberg
1c7a6339f7
Added stuff to gitlab pages page. 2019-05-03 06:43:43 -04:00
Mr_Goldberg
8918d8f6d4
Add basic gitlab page with link to latest build. 2019-05-01 14:43:32 -04:00
Mr_Goldberg
9f72f3db06
Fix deploy. 2019-05-01 12:29:46 -04:00
Mr_Goldberg
798f9d71c1
Build fix. 2019-05-01 11:53:57 -04:00
Mr_Goldberg
a74c0e6344
Fix yaml. 2019-05-01 11:42:34 -04:00
Mr_Goldberg
a50568340a
Automatic windows builds. 2019-05-01 11:38:21 -04:00
Mr_Goldberg
52f0f550b0
Automatic linux builds. 2019-04-27 17:15:31 -04:00