eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 07:39:19 +02:00
Code Issues 121 Wiki Activity
850 Commits 33 Branches 11 Tags
473681a12ea27ae0592a70f4b873e31db7acfe04
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
milek7 473681a12e Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
CMake_modules
Merge remote-tracking branch 'Milek7/lua' into mover_in_c++
2017-09-25 15:33:18 +02:00
Console
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
McZapkie
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
ref
cleaning build system and ref
2017-09-29 21:37:48 +02:00
shaders
works for rendering without texture (not done yet)
2017-08-03 11:49:03 +02:00
.clang-format
clang-format changes
2017-10-28 19:21:37 +02:00
.gitattributes
Line-endings and ignored files settings
2015-04-03 22:09:58 +08:00
.gitignore
configure appveyor
2017-11-02 21:43:25 +01:00
AirCoupler.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
AirCoupler.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
AnimModel.cpp
backslash/slash fixes, again
2018-03-26 21:22:20 +02:00
AnimModel.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
appveyor.yml
version info changes
2018-03-22 17:29:43 +01:00
audio.cpp
file access cross-platform compatibility fixes
2018-03-29 03:48:21 +02:00
audio.h
tmj merge
2018-01-15 14:08:43 +01:00
audiorenderer.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
audiorenderer.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Button.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Button.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Camera.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Camera.h
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
Classes.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
CMakeLists.txt
Merge branch 'tmj-dev'
2018-02-24 16:05:35 +01:00
color.h
build 180309. additional control commands, serial port output fix
2018-03-09 19:31:19 +01:00
command.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-27 21:23:17 +02:00
command.h
Merge branch 'tmj-dev' into milek-dev
2018-03-27 21:23:17 +02:00
Console.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Console.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Curve.cpp
Usunięcie pozostałych jeszcze słów kluczowych __fastcall.
2016-04-06 06:58:29 +02:00
Curve.h
match include to file case
2017-07-28 23:39:22 +02:00
Driver.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-27 21:23:17 +02:00
Driver.h
merge and fixes
2018-03-16 19:13:22 +01: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
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
DynObj.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
DynObj.h
Merge branch 'tmj-dev' into milek-dev
2018-03-27 21:23:17 +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
cmake
2017-09-26 19:46:26 +02:00
EU07.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
Event.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
Event.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
EvLaunch.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
EvLaunch.h
maintenance: minor code touch ups
2017-11-01 02:54:31 +01:00
flip-s3tc.h
option to load dds with upper-left origin (currently disabled by default)
2018-02-16 23:30:09 +01:00
Float3d.cpp
match include to file case
2017-07-28 23:39:22 +02: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
tmj merge
2017-10-30 16:30:04 +01:00
gamepadinput.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01: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
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Gauge.h
serial port input device configuration, additional control commands and minor control logic tweaks
2018-02-10 19:53:21 +01:00
geometry.cpp
match include to file case
2017-07-28 23:39:22 +02:00
geometry.h
tymczasowe przywrócenie tekstu, porządek, wywalenie starych plików, warningi, cmake, itp.
2017-02-14 19:13:48 +01:00
Globals.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
Globals.h
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
keyboardinput.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-27 21:23:17 +02:00
keyboardinput.h
maintenance: minor code cleanup
2018-01-09 11:59:37 +01: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
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
lightarray.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Logs.cpp
lua write error
2018-03-21 20:06:26 +01:00
Logs.h
lua write error
2018-03-21 20:06:26 +01:00
lua_ffi.h
lua write error
2018-03-21 20:06:26 +01:00
lua.cpp
lua write error
2018-03-21 20:06:26 +01:00
lua.h
basic lua support
2017-09-02 12:12:58 +02: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
material.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
material.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
MdlMngr.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
MdlMngr.h
Merge branch 'tmj-dev'
2018-03-11 21:32:12 +01:00
MemCell.cpp
Merge branch 'mover_in_c++' of https://github.com/tmj-fstate/maszyna into tmj-fstate-mover_in_c++
2017-11-03 20:31:20 +01:00
MemCell.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
messaging.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
messaging.h
tmj merge
2017-10-30 16:30:04 +01:00
Model3d.cpp
backslash/slash fixes, again
2018-03-26 21:22:20 +02:00
Model3d.h
change iFlags to unsigned (shifting signed values is UB)
2018-02-24 16:27:07 +01:00
moon.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
moon.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
motiontelemetry.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
motiontelemetry.h
fix build in compilers other than msvc: include shuffling
2018-01-25 15:43:41 +01:00
mouseinput.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-27 21:23:17 +02:00
mouseinput.h
additional motor ventilator parameters exposed in .fiz file, motor ventilator spin rate tweaks, mouse support for radiostop commands, restricted speed mode for driver ai, passed signals scanning fix, mouse and keyboard command input rate unification, basic material textures priority system
2018-01-24 23:03:19 +01:00
mtable.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
mtable.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Names.cpp
maintenance: removed deprecated code from memcells, tracks, events
2017-03-23 16:47:29 +01:00
Names.h
Merge branch 'tmj-dev' into dev
2017-12-25 18:27:10 +01:00
openglgeometrybank.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
openglgeometrybank.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
openglmatrixstack.cpp
maintenance: removed deprecated code from memcells, tracks, events
2017-03-23 16:47:29 +01:00
openglmatrixstack.h
android preparations, day 1
2018-03-27 20:59:12 +02:00
parser.cpp
backslash/slash fixes, again
2018-03-26 21:22:20 +02:00
parser.h
additional sound type for local brake, support for combined sounds
2017-12-14 14:31:34 +01:00
PyInt.cpp
file access cross-platform compatibility fixes
2018-03-29 03:48:21 +02:00
PyInt.h
master branch unification: cross-platform python interpreter
2018-03-01 16:07:52 +01: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
configure appveyor
2017-11-02 21:43:25 +01:00
renderer.cpp
Merge branch 'tmj-dev'
2018-03-09 19:53:05 +01:00
renderer.h
Merge branch 'tmj-dev'
2018-03-09 19:53:05 +01:00
resource.h
Merge remote-tracking branch 'Milek7/lua' into mover_in_c++
2017-11-02 18:20:42 +01: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
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
scene.cpp
Merge branch 'tmj-dev'
2018-03-11 21:32:12 +01:00
scene.h
pre-merge syncs
2018-02-03 17:37:46 +01:00
scenenode.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
scenenode.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Segment.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
Segment.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
shader.cpp
tmj merge (broken)
2018-01-24 22:59:15 +01:00
shader.h
minimize calls to opengl by caching uniforms (is it worth it, though?)
2017-08-03 12:28:15 +02:00
simulation.cpp
backslash/slash fixes, again
2018-03-26 21:22:20 +02:00
simulation.h
include fixes
2018-03-11 21:19:29 +01:00
sky.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
sky.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
skydome.cpp
Merge branch 'tmj-dev'
2018-02-24 16:05:35 +01: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
backslash/slash fixes, again
2018-03-26 21:22:20 +02:00
sound.h
Merge branch 'tmj-dev'
2018-02-24 16:05:35 +01:00
Spline.cpp
linux support
2017-07-31 00:25:19 +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
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
stars.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
station.cpp
Merge branch 'tmj-dev'
2018-03-06 19:09:52 +01:00
station.h
Merge branch 'tmj-dev'
2018-03-06 19:09:52 +01: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
android preparations, day 1
2018-03-27 20:59:12 +02:00
sun.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
sun.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +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
file access cross-platform compatibility fixes
2018-03-29 03:48:21 +02:00
Texture.h
android preparations, day 1
2018-03-27 20:59:12 +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
tymczasowe przywrócenie tekstu, porządek, wywalenie starych plików, warningi, cmake, itp.
2017-02-14 19:13:48 +01:00
Timer.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Timer.h
maintenance: minor code cleanup
2017-11-30 16:32:59 +01:00
Track.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Track.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Traction.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Traction.h
Merge branch 'tmj-dev' into dev
2017-12-25 18:27:10 +01:00
TractionPower.cpp
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
TractionPower.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
Train.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
Train.h
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
translation.cpp
build 170712. increased amount of generic cab items, varying command repeat rate for mouse control
2017-07-12 18:09:51 +02:00
translation.h
basic fuel pump, brake reservoirs air leaks, support for combined axle clatter sounds, dedicated loud buffer clash and coupler stretch sounds
2018-03-27 00:49:17 +02:00
TrkFoll.cpp
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
TrkFoll.h
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
uart.cpp
Merge branch 'tmj-dev'
2018-03-11 21:32:12 +01:00
uart.h
serial port input device configuration, additional control commands and minor control logic tweaks
2018-02-10 19:53:21 +01:00
uilayer.cpp
Merge branch 'tmj-dev'
2018-02-24 16:05:35 +01:00
uilayer.h
on-screen log
2018-02-16 18:22:10 +01:00
uitranscripts.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
uitranscripts.h
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
utilities.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
utilities.h
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
version.h
compressor governor lock tweaks, fuel pump cab indicator, optional offset for scenario clock
2018-03-29 23:19:14 +02:00
vertex.cpp
Merge branch 'tmj-dev' into lua
2017-10-31 14:01:53 +01:00
vertex.h
maintenance: settings item refactoring, include dependencies fixes
2018-01-26 16:44:47 +01:00
windows.cpp
Merge branch 'tmj-dev'
2018-02-16 15:33:11 +01:00
winheaders.h
tmj merge
2017-10-30 16:30:04 +01:00
World.cpp
Merge branch 'tmj-dev' into milek-dev
2018-03-30 00:32:53 +02:00
World.h
Merge branch 'tmj-dev'
2018-02-24 16:05:35 +01:00

README.md

maszyna

Build status

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 55 MiB
Languages
C++ 66.9%
C 29.5%
HLSL 2.3%
GLSL 0.9%
CMake 0.4%