Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

revert to fix option screen #1122

Merged
merged 36 commits into from Aug 21, 2021
Merged

revert to fix option screen #1122

Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0378f7d
Merge pull request #154 from caveman2cosmos/master
MattOttawa Jun 8, 2021
f41a380
Merge pull request #155 from caveman2cosmos/master
MattOttawa Jun 10, 2021
bc2f408
Merge pull request #156 from caveman2cosmos/master
MattOttawa Jun 12, 2021
2a3a3d7
switched a unit build types loop to foreach
MattOttawa Jun 12, 2021
21f114b
Merge pull request #157 from caveman2cosmos/master
MattOttawa Jun 15, 2021
8e43b80
Merge pull request #158 from caveman2cosmos/master
MattOttawa Jun 16, 2021
eeb5714
Merge branch 'master' of https://github.com/MattOttawa/Caveman2Cosmos
MattOttawa Jun 16, 2021
9f623fb
deleted change on my master
MattOttawa Jun 16, 2021
0dd22a8
Merge pull request #159 from caveman2cosmos/master
MattOttawa Jun 20, 2021
66f07e0
Merge pull request #160 from caveman2cosmos/master
MattOttawa Jun 21, 2021
80aea90
Merge pull request #161 from caveman2cosmos/master
MattOttawa Jun 23, 2021
6cbb6b7
Merge pull request #162 from caveman2cosmos/master
MattOttawa Jun 27, 2021
48586e3
switched int to enum
MattOttawa Jun 28, 2021
368a6ca
Merge pull request #163 from caveman2cosmos/master
MattOttawa Jul 1, 2021
d27d75b
Merge branch 'master' of https://github.com/MattOttawa/Caveman2Cosmos
MattOttawa Jul 1, 2021
fdb6172
Merge pull request #164 from caveman2cosmos/master
MattOttawa Jul 4, 2021
1c1712d
Merge pull request #165 from caveman2cosmos/master
MattOttawa Jul 7, 2021
e2d636a
Merge pull request #166 from caveman2cosmos/master
MattOttawa Jul 8, 2021
4d2b06c
Merge pull request #167 from caveman2cosmos/master
MattOttawa Jul 8, 2021
f655034
Merge pull request #168 from caveman2cosmos/master
MattOttawa Jul 9, 2021
cdc17f3
Merge pull request #169 from caveman2cosmos/master
MattOttawa Jul 12, 2021
22bc6a9
fixed assert
MattOttawa Jul 12, 2021
8bc59a0
Merge pull request #170 from caveman2cosmos/master
MattOttawa Jul 12, 2021
c16165e
Merge pull request #171 from caveman2cosmos/master
MattOttawa Jul 18, 2021
1fc19a4
Merge pull request #172 from caveman2cosmos/master
MattOttawa Jul 22, 2021
7da4403
Merge pull request #173 from caveman2cosmos/master
MattOttawa Jul 24, 2021
1576e57
Merge pull request #174 from caveman2cosmos/master
MattOttawa Jul 24, 2021
44349f3
made the viewport for every map the same size as earth when viewports…
MattOttawa Jul 26, 2021
03fd762
Merge pull request #175 from caveman2cosmos/master
MattOttawa Jul 27, 2021
9b4f4f1
Merge pull request #176 from caveman2cosmos/master
MattOttawa Jul 29, 2021
7162459
Merge pull request #177 from caveman2cosmos/master
MattOttawa Aug 7, 2021
822edc0
Merge pull request #178 from caveman2cosmos/master
MattOttawa Aug 7, 2021
57b9f77
Merge pull request #179 from caveman2cosmos/master
MattOttawa Aug 8, 2021
8af1493
Merge pull request #180 from caveman2cosmos/master
MattOttawa Aug 15, 2021
e309969
Merge pull request #181 from caveman2cosmos/master
MattOttawa Aug 20, 2021
80ace4f
fixed options screen
MattOttawa Aug 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/CyInfoInterface3.cpp
View file
Open in desktop
Expand Up @@ -346,7 +346,7 @@ void CyInfoPythonInterface3()
;


python::class_<CvGameText, python::bases<CvInfoBase> >("CvGameText", python::no_init)
python::class_<CvGameText, python::bases<CvInfoBase> >("CvGameText")

.def("getText", &CvGameText::pyGetText, "wstring ()")
.def("setText", &CvGameText::setText, "void (wstring)")
Expand Down