MickSlash
/
goldberg_emulator
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: MickSlash:97a1ff5186f6069b57086ab0e6e9512f69fa2bbf
Branches Tags
MickSlash:master
MickSlash:test_ci
MickSlash:inventory_pr
MickSlash:0.2.5
MickSlash:v0.2.4
MickSlash:v0.2.3
MickSlash:v0.2.2
..
compare: MickSlash:7e1409596a7984b805002dacc3d2147f2827d6aa
Branches Tags
MickSlash:master
MickSlash:test_ci
MickSlash:inventory_pr
MickSlash:0.2.5
MickSlash:v0.2.4
MickSlash:v0.2.3
MickSlash:v0.2.2

No commits in common. "97a1ff5186f6069b57086ab0e6e9512f69fa2bbf" and "7e1409596a7984b805002dacc3d2147f2827d6aa" have entirely different histories.
97a1ff5186 ... 7e1409596a

2 changed files with 2 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -16,7 +16,7 @@ protobuf_static_steamos:
- echo $BASE_PREFIX_PATH - echo $BASE_PREFIX_PATH
- mkdir deps - mkdir deps
- cd deps - cd deps
- git clone --branch 21.x https://github.com/protocolbuffers/protobuf.git - git clone https://github.com/protocolbuffers/protobuf.git
- cd protobuf - cd protobuf
- sh autogen.sh - sh autogen.sh
- ./configure "CC=gcc-4.9 -m32" "CXX=g++-4.9 -m32" CPPFLAGS="-fPIC -Ofast" CXXFLAGS="-fPIC -Ofast" --prefix=$BASE_PREFIX_PATH/protobuf/prefix_x86/ --disable-shared --enable-static - ./configure "CC=gcc-4.9 -m32" "CXX=g++-4.9 -m32" CPPFLAGS="-fPIC -Ofast" CXXFLAGS="-fPIC -Ofast" --prefix=$BASE_PREFIX_PATH/protobuf/prefix_x86/ --disable-shared --enable-static

5
scripts/stats_schema_achievement_gen/achievements_gen.py Executable file → Normal file
View File

@ -64,10 +64,7 @@ def generate_stats_achievements(schema, config_directory):
for s in stats_out: for s in stats_out:
default_num = 0 default_num = 0
if (s['type'] == 'int'): if (s['type'] == 'int'):
try: default_num = int(s['default'])
default_num = int(s['default'])
except ValueError:
default_num = int(float(s['default']))
else: else:
default_num = float(s['default']) default_num = float(s['default'])
output_stats += "{}={}={}\n".format(s['name'], s['type'], default_num) output_stats += "{}={}={}\n".format(s['name'], s['type'], default_num)