eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 20:19:20 +02:00
Code Issues 151 Wiki Activity
715 Commits 78 Branches 30 Tags
226ddb6291077c3c890f7978856cdba4d1241480
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
tmj-fstate 226ddb6291 build 180928. heater sound, minor precipitation tweaks, minor bug fixes
2018-09-28 19:18:24 +02:00
CMake_modules
tymczasowe przywrócenie tekstu, porządek, wywalenie starych plików, warningi, cmake, itp.
2017-02-14 19:13:48 +01:00
Console
serial port input devices communication module replacement
2018-02-06 03:03:19 +01:00
McZapkie
basic cargo attributes system, minor cargo enhancements and fixes
2018-09-19 19:12:53 +02:00
old
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
.clang-format
Konwersja na UTF-8
2017-01-23 15:31:40 +01:00
.gitattributes
Line-endings and ignored files settings
2015-04-03 22:09:58 +08:00
.gitignore
merge
2017-03-03 13:12:00 +01:00
AirCoupler.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
AirCoupler.h
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
AnimModel.cpp
virtual opengl color, overcast level based tweaks to light glare and freespot strength, precipitation based fog density adjustment, overcast level included in the light activation threshold
2018-09-24 22:01:14 +02:00
AnimModel.h
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
application.cpp
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
application.h
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
applicationmode.h
build 180804. configurable command bindings for scroll wheel, minor bug fixes
2018-08-04 12:34:51 +02:00
audio.cpp
build 180629. instanced model light mode 4, ai connect mode tweaks, minor bug fixes
2018-06-30 19:00:35 +02:00
audio.h
sound transcripts, event-started sound persistence
2018-01-02 20:30:38 +01:00
audiorenderer.cpp
disable interaction in pause mode, audio volume calculations tweak
2018-09-05 13:49:48 +02:00
audiorenderer.h
build 180805. minor bug fixes
2018-08-05 13:22:21 +02:00
Button.cpp
shuntfield sound for vehicles with diesel-electric engine, sound positioning support for cab controls, minor AI tweaks and bug fixes
2018-06-01 23:23:58 +02:00
Button.h
voltage relays, additional light cab controls, minor cab control fixes
2018-09-12 21:33:40 +02:00
Camera.cpp
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
Camera.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
Classes.h
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
CMakeLists.txt
screenshoty
2017-03-03 22:29:37 +01:00
color.h
build 180309. additional control commands, serial port output fix
2018-03-09 19:31:19 +01:00
combustionengine.cpp
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
combustionengine.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
command.cpp
additional train state data exposed to uart interface, minor bug fixes
2018-09-15 16:35:03 +02:00
command.h
voltage relays, additional light cab controls, minor cab control fixes
2018-09-12 21:33:40 +02:00
Console.cpp
scenery groups export and deserialization, associated events included in scenery node groups, AI brake charging tweak, door locking and vehicle hunting oscillation sounds
2018-08-24 21:11:35 +02:00
Console.h
serial port input devices communication module replacement
2018-02-06 03:03:19 +01:00
Curve.cpp
Usunięcie pozostałych jeszcze słów kluczowych __fastcall.
2016-04-06 06:58:29 +02:00
Curve.h
Added license notes to all source code files.
2015-04-16 11:50:14 +02:00
Driver.cpp
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
Driver.h
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
driverkeyboardinput.cpp
voltage relays, additional light cab controls, minor cab control fixes
2018-09-12 21:33:40 +02:00
driverkeyboardinput.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
drivermode.cpp
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
drivermode.h
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
drivermouseinput.cpp
voltage relays, additional light cab controls, minor cab control fixes
2018-09-12 21:33:40 +02:00
drivermouseinput.h
build 180804. configurable command bindings for scroll wheel, minor bug fixes
2018-08-04 12:34:51 +02:00
driveruilayer.cpp
maintenance: minor code cleanup
2018-09-07 19:04:51 +02:00
driveruilayer.h
disable interaction in pause mode, audio volume calculations tweak
2018-09-05 13:49:48 +02:00
driveruipanels.cpp
basic cargo attributes system, minor cargo enhancements and fixes
2018-09-19 19:12:53 +02:00
driveruipanels.h
maintenance: minor code cleanup
2018-09-07 19:04:51 +02:00
dumb3d.cpp
removed dependencies on the old parser. The code can now be compiled outside of Borland C++
2017-01-15 15:27:53 +01:00
dumb3d.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
DynObj.cpp
build 180928. heater sound, minor precipitation tweaks, minor bug fixes
2018-09-28 19:18:24 +02:00
DynObj.h
build 180928. heater sound, minor precipitation tweaks, minor bug fixes
2018-09-28 19:18:24 +02:00
editorkeyboardinput.cpp
build 180805. minor bug fixes
2018-08-05 13:22:21 +02:00
editorkeyboardinput.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
editormode.cpp
imgui user interface implementation
2018-08-30 20:41:14 +02:00
editormode.h
build 180804. configurable command bindings for scroll wheel, minor bug fixes
2018-08-04 12:34:51 +02:00
editormouseinput.cpp
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
editormouseinput.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
editoruilayer.cpp
imgui user interface implementation
2018-08-30 20:41:14 +02:00
editoruilayer.h
imgui user interface implementation
2018-08-30 20:41:14 +02:00
editoruipanels.cpp
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
editoruipanels.h
maintenance: minor code cleanup
2018-09-07 19:04:51 +02:00
eu07.ico
removed dependencies on the old parser. The code can now be compiled outside of Borland C++
2017-01-15 15:27:53 +01:00
eu07.rc
tymczasowe przywrócenie tekstu, porządek, wywalenie starych plików, warningi, cmake, itp.
2017-02-14 19:13:48 +01:00
EU07.cpp
refactoring: basic application code wrapper
2018-07-14 23:44:56 +02:00
EU07.res
tymczasowe przywrócenie tekstu, porządek, wywalenie starych plików, warningi, cmake, itp.
2017-02-14 19:13:48 +01:00
Event.cpp
minor bug fixes
2018-09-23 21:37:29 +02:00
Event.h
minor logging message tweaks
2018-09-18 20:29:23 +02:00
EvLaunch.cpp
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
EvLaunch.h
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
Float3d.cpp
serializacja e3d
2017-02-26 18:40:00 +01:00
Float3d.h
build 180131. support for nested material attribute definitions, minor bug fixes, refactoring and master branch unifications
2018-01-31 16:07:50 +01:00
frustum.cpp
minor refactoring, shadows colour influenced by sun/moon positions
2017-08-03 16:00:48 +02:00
frustum.h
maintenance: memory leak fix, default constructors, minor syntax cleanups
2018-06-16 15:59:28 +02:00
gamepadinput.cpp
virtual slider mouse input mode, minor refactoring, minor bug fixes
2018-07-11 17:45:50 +02:00
gamepadinput.h
restored support for second movement speed control key, converter sound frequency calculation fix
2018-01-07 23:09:05 +01:00
Gauge.cpp
build 180928. heater sound, minor precipitation tweaks, minor bug fixes
2018-09-28 19:18:24 +02:00
Gauge.h
additional door cab controls, light configuration ai command, line breaker state change sounds, texture scaling crash fix
2018-08-06 17:01:20 +02:00
geometry.cpp
Usunięcie pozostałych jeszcze słów kluczowych __fastcall.
2016-04-06 06:58:29 +02:00
geometry.h
glfw integration
2017-03-02 04:28:56 +01:00
Globals.cpp
build 180909. scenario time override, support for random texture sets in .mat files, minor bug fixes
2018-09-09 21:25:09 +02:00
Globals.h
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
keyboardinput.cpp
build 180805. minor bug fixes
2018-08-05 13:22:21 +02:00
keyboardinput.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
LICENSE
Create LICENSE
2015-04-03 21:58:35 +08:00
light.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
light.h
build 180127. minor bug fixes
2018-01-27 16:05:19 +01:00
lightarray.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
lightarray.h
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
Logs.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
Logs.h
build 180131. support for nested material attribute definitions, minor bug fixes, refactoring and master branch unifications
2018-01-31 16:07:50 +01:00
Machajka.cpp
Usunięcie pozostałych jeszcze słów kluczowych __fastcall.
2016-04-06 06:58:29 +02:00
Machajka.h
Added license notes to all source code files.
2015-04-16 11:50:14 +02:00
maszyna.rc
reduced memory use, re-enabled debug mode, plugged some of remaining memory leaks
2017-10-07 17:20:53 +02:00
maszyna.sln
remote version sync
2017-03-15 19:34:57 +01:00
maszyna.vcxproj.filters
virtual opengl color, overcast level based tweaks to light glare and freespot strength, precipitation based fog density adjustment, overcast level included in the light activation threshold
2018-09-24 22:01:14 +02:00
maszyna.vcxproj.user
ai improvements and fixes for acceleration and brake handling, fix for automatic sandbox activation
2017-08-14 15:51:08 +02:00
material.cpp
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
material.h
build 180909. scenario time override, support for random texture sets in .mat files, minor bug fixes
2018-09-09 21:25:09 +02:00
MdlMngr.cpp
file access cross-platform compatibility fixes
2018-03-29 03:48:21 +02:00
MdlMngr.h
additional serial port data output, 3d model load failure caching, minor refactoring and bug fixes
2018-03-11 15:48:30 +01:00
MemCell.cpp
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
MemCell.h
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
messaging.cpp
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
messaging.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
Model3d.cpp
basic cargo attributes system, minor cargo enhancements and fixes
2018-09-19 19:12:53 +02:00
Model3d.h
external cargo included in the vehicle load visualization system, cargo model offset parameter
2018-09-08 19:55:13 +02:00
moon.cpp
refactoring: basic application code wrapper
2018-07-14 23:44:56 +02:00
moon.h
no pneumatic relay sound on brake acting speed change, enabled playback of multiple bookend sounds, extra pantograph control for ai during longer stops, shadow angle calculation tweak, moon appearance tweak, minor bug fixes
2018-02-13 23:58:31 +01:00
mtable.cpp
imgui user interface implementation
2018-08-30 20:41:14 +02:00
mtable.h
imgui user interface implementation
2018-08-30 20:41:14 +02:00
Names.cpp
maintenance: removed deprecated code from memcells, tracks, events
2017-03-23 16:47:29 +01:00
Names.h
additional train state data exposed to uart interface, minor bug fixes
2018-09-15 16:35:03 +02:00
openglcolor.cpp
virtual opengl color, overcast level based tweaks to light glare and freespot strength, precipitation based fog density adjustment, overcast level included in the light activation threshold
2018-09-24 22:01:14 +02:00
openglcolor.h
build 180928. heater sound, minor precipitation tweaks, minor bug fixes
2018-09-28 19:18:24 +02:00
openglgeometrybank.cpp
build 180928. heater sound, minor precipitation tweaks, minor bug fixes
2018-09-28 19:18:24 +02:00
openglgeometrybank.h
dangling pointer crash semi-fix, minor bug fixes, minor code correctness enhancements
2018-07-16 02:40:53 +02:00
openglmatrixstack.cpp
maintenance: removed deprecated code from memcells, tracks, events
2017-03-23 16:47:29 +01:00
openglmatrixstack.h
additional serial port data output, 3d model load failure caching, minor refactoring and bug fixes
2018-03-11 15:48:30 +01:00
parser.cpp
basic isolated track section hierarchy, track vertical radius property, ai passenger stop logic tweaks, ai signal speed limit tracking logic tweaks
2018-09-11 23:17:59 +02:00
parser.h
build 180830. minor bug fixes
2018-08-30 20:41:44 +02:00
precipitation.cpp
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
precipitation.h
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
PyInt.cpp
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
PyInt.h
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
python_var_doc.md
tymczasowe przywrócenie tekstu, porządek, wywalenie starych plików, warningi, cmake, itp.
2017-02-14 19:13:48 +01:00
README.md
Create README.md
2015-04-03 21:57:45 +08:00
renderer.cpp
build 180928. heater sound, minor precipitation tweaks, minor bug fixes
2018-09-28 19:18:24 +02:00
renderer.h
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
resource.h
reduced memory use, re-enabled debug mode, plugged some of remaining memory leaks
2017-10-07 17:20:53 +02:00
ResourceManager.cpp
texture garbage collection, removed fixed binding with world camera in world render, cap on minimal volume held by reservoirs
2017-07-02 21:24:29 +02:00
ResourceManager.h
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
scenarioloadermode.cpp
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
scenarioloadermode.h
build 180804. configurable command bindings for scroll wheel, minor bug fixes
2018-08-04 12:34:51 +02:00
scenarioloaderuilayer.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
scene.cpp
minor bug fixes
2018-09-23 21:37:29 +02:00
scene.h
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
sceneeditor.cpp
scenery groups export and deserialization, associated events included in scenery node groups, AI brake charging tweak, door locking and vehicle hunting oscillation sounds
2018-08-24 21:11:35 +02:00
sceneeditor.h
build 180809. scenery node groups, AI shunt mode braking tweaks
2018-08-09 22:24:42 +02:00
scenenode.cpp
minor logging message tweaks
2018-09-18 20:29:23 +02:00
scenenode.h
build 180809. scenery node groups, AI shunt mode braking tweaks
2018-08-09 22:24:42 +02:00
scenenodegroups.cpp
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
scenenodegroups.h
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
Segment.cpp
virtual opengl color, overcast level based tweaks to light glare and freespot strength, precipitation based fog density adjustment, overcast level included in the light activation threshold
2018-09-24 22:01:14 +02:00
Segment.h
virtual opengl color, overcast level based tweaks to light glare and freespot strength, precipitation based fog density adjustment, overcast level included in the light activation threshold
2018-09-24 22:01:14 +02:00
simulation.cpp
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
simulation.h
refactoring: application mode code split
2018-08-02 20:39:19 +02:00
simulationenvironment.cpp
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
simulationenvironment.h
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
simulationstateserializer.cpp
build 180923. basic precipitation visualization system, minor bug fixes
2018-09-23 19:13:33 +02:00
simulationstateserializer.h
basic isolated track section hierarchy, track vertical radius property, ai passenger stop logic tweaks, ai signal speed limit tracking logic tweaks
2018-09-11 23:17:59 +02:00
simulationtime.cpp
refactoring: basic application code wrapper
2018-07-14 23:44:56 +02:00
simulationtime.h
refactoring: basic application code wrapper
2018-07-14 23:44:56 +02:00
sky.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
sky.h
refactoring: basic application code wrapper
2018-07-14 23:44:56 +02:00
skydome.cpp
additional train state data exposed to uart interface, minor bug fixes
2018-09-15 16:35:03 +02:00
skydome.h
fog color calculation fix
2018-02-21 23:13:06 +01:00
sn_utils.cpp
build 171030: binary serialization for region terrain
2017-10-30 23:41:22 +01:00
sn_utils.h
build 171030: binary serialization for region terrain
2017-10-30 23:41:22 +01:00
sound.cpp
build 180909. scenario time override, support for random texture sets in .mat files, minor bug fixes
2018-09-09 21:25:09 +02:00
sound.h
build 180909. scenario time override, support for random texture sets in .mat files, minor bug fixes
2018-09-09 21:25:09 +02:00
Spline.cpp
Usunięcie pozostałych jeszcze słów kluczowych __fastcall.
2016-04-06 06:58:29 +02:00
Spline.h
Usunięcie pozostałych jeszcze słów kluczowych __fastcall.
2016-04-06 06:58:29 +02:00
Spring.cpp
engine revolution based cab shake configuration support, rear cab door controls animation fix
2018-02-24 02:38:02 +01:00
Spring.h
engine revolution based cab shake configuration support, rear cab door controls animation fix
2018-02-24 02:38:02 +01:00
stars.cpp
file access cross-platform compatibility fixes
2018-03-29 03:48:21 +02:00
stars.h
refactoring: basic application code wrapper
2018-07-14 23:44:56 +02:00
station.cpp
basic cargo attributes system, minor cargo enhancements and fixes
2018-09-19 19:12:53 +02:00
station.h
refactoring: basic application code wrapper
2018-07-14 23:44:56 +02:00
stb_vorbis.c
build 180429. vorbis ogg audio data format support, minor bug fixes
2018-04-29 21:51:13 +02:00
stdafx.cpp
removed dependencies on the old parser. The code can now be compiled outside of Borland C++
2017-01-15 15:27:53 +01:00
stdafx.h
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
sun.cpp
refactoring: basic application code wrapper
2018-07-14 23:44:56 +02:00
sun.h
build 180210. light source angle calculation tweak
2018-02-10 19:54:22 +01:00
targetver.h
compatibility with winXP. .bmp loader now handles 32-bit images and more modern headers.
2017-01-30 23:21:00 +01:00
Texture.cpp
build 180928. heater sound, minor precipitation tweaks, minor bug fixes
2018-09-28 19:18:24 +02:00
Texture.h
build 180527. smoother camera rotation, semi-persistent cab camera angle between view swaps, configurable default cab camera view angle, diesel engine power calculation fix, minor refactoring and fixes for content files lookups and loading
2018-05-27 02:31:40 +02:00
TextureDDS.cpp
tymczasowe przywrócenie tekstu, porządek, wywalenie starych plików, warningi, cmake, itp.
2017-02-14 19:13:48 +01:00
TextureDDS.h
glfw integration
2017-03-02 04:28:56 +01:00
Timer.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
Timer.h
maintenance: memory leak fix, default constructors, minor syntax cleanups
2018-06-16 15:59:28 +02:00
Track.cpp
minor logging message tweaks
2018-09-18 20:29:23 +02:00
Track.h
maintenance: event code refactoring
2018-09-18 05:01:51 +02:00
Traction.cpp
minor camera refactoring, division by zero guards
2018-08-03 16:07:50 +02:00
Traction.h
refactoring: basic application code wrapper
2018-07-14 23:44:56 +02:00
TractionPower.cpp
basic scenery data export in legacy text format
2018-06-13 16:51:57 +02:00
TractionPower.h
basic scenery data export in legacy text format
2018-06-13 16:51:57 +02:00
Train.cpp
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
Train.h
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
translation.cpp
additional train state data exposed to uart interface, minor bug fixes
2018-09-15 16:35:03 +02:00
translation.h
voltage relays, additional light cab controls, minor cab control fixes
2018-09-12 21:33:40 +02:00
TrkFoll.cpp
interior lighting power source lookup enhancement, track event activation filtering, switch geometry normal fix, material parsing enhancements, AI acceleration and braking logic tweaks, AI car route scanning accuracy fix, AI braking delay fix
2018-08-17 01:17:22 +02:00
TrkFoll.h
build 180621. serial port input device continuous independent brake control, scenery item selection and info, minor bug fixes, tweaks and refactoring
2018-06-22 01:48:44 +02:00
uart.cpp
additional train state data exposed to uart interface, minor bug fixes
2018-09-15 16:35:03 +02:00
uart.h
dangling pointer crash semi-fix, minor bug fixes, minor code correctness enhancements
2018-07-16 02:40:53 +02:00
uilayer.cpp
virtual opengl color, overcast level based tweaks to light glare and freespot strength, precipitation based fog density adjustment, overcast level included in the light activation threshold
2018-09-24 22:01:14 +02:00
uilayer.h
maintenance: minor code cleanup
2018-09-07 19:04:51 +02:00
uitranscripts.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
uitranscripts.h
maintenance: memory leak fix, default constructors, minor syntax cleanups
2018-06-16 15:59:28 +02:00
utilities.cpp
build 180909. scenario time override, support for random texture sets in .mat files, minor bug fixes
2018-09-09 21:25:09 +02:00
utilities.h
python interpreter refactored to a task queue
2018-09-28 19:16:41 +02:00
version.h
build 180928. heater sound, minor precipitation tweaks, minor bug fixes
2018-09-28 19:18:24 +02:00
vertex.cpp
build 171030: binary serialization for region terrain
2017-10-30 23:41:22 +01:00
vertex.h
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
windows.cpp
refactoring: application mode code split
2018-08-02 20:39:19 +02:00

README.md

maszyna

MaSzyna Train Simulator

Reference in New Issue View Git Blame Copy Permalink
Description
Mirror of https://github.com/MaSzyna-EU07/maszyna
https://eu07.pl/
Readme MPL-2.0 109 MiB
Languages
C++ 63.5%
C 34%
HLSL 1.4%
GLSL 0.6%
CMake 0.3%
Other 0.2%