17
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 03:59:19 +02:00
Commit Graph

198 Commits

Author SHA1 Message Date
012ffc7470 Merge branch 'feat/modern-editor' of https://github.com/MaSzyna-EU07/maszyna into feat/modern-editor 2026-10-04 21:58:19 +02:00
maj00r
b0c363b586 feat: structure gauge along the line of the selected path in the OpenGL view 2026-10-04 01:27:41 +02:00
3ce9102da0 feat(roads): level crossings, spawn and removal points for road vehicles, deleting points of a road 2026-10-04 00:31:44 +02:00
maj00r
8778353b22 feat(editor): infrastructure bound to the paths follows their changes 2026-10-04 00:14:03 +02:00
maj00r
7371b18910 feat(editor): vertical profile editor, grade lines kept in the scenery 2026-10-04 00:14:03 +02:00
e4083d507f feat(roads): editor menu and window for building roads, lanes shown as trajectories 2026-10-03 18:21:10 +02:00
2f417fddcc feat(roads): road node with generated lanes, surface and markings 2026-10-03 17:35:08 +02:00
maj00r
8f2a34b3cf feat(editor): route design with curves and transitions 2026-10-03 02:41:34 +02:00
maj00r
b93c5dde60 feat(editor): edit tracks loaded from the scenery 2026-10-03 02:41:34 +02:00
3199f3796e feat(editor): layers window, scenery save and include descriptions 2026-10-02 22:40:52 +02:00
73f2f68aa0 feat(editor): edit session (-edit) and scenery layers 2026-10-02 21:29:18 +02:00
8da445bcb5 feat(editor): geoportal orthophoto layer streamed around the camera 2026-10-01 20:09:34 +02:00
1497d081ff feat(editor): user-defined model sets, random insert from set, tabbed editor panel 2026-10-01 18:41:35 +02:00
jakubg1
ba19db8715 Revert "Remove training card window"
This reverts commit 363b50c9c2.
2026-09-02 12:32:35 +02:00
jakubg1
363b50c9c2 Remove training card window
This was a leftover from attempts at modifying MaSzyna for professional simulators.
Interaction with this window could cause a crash.
2026-08-23 22:37:33 +02:00
Sebastian Krzyszkowiak
84b3de6088 cmake: Allow to disable date & git hash suffix in executable name 2026-06-29 23:32:38 +02:00
b0bb2c9c42 Fix autodetect python directory 2026-06-27 15:15:11 +02:00
16c94f8e19 Merge remote-tracking branch 'origin/feature/python314' into Editor-Python3.14 2026-06-18 18:22:38 +02:00
75461eaf86 World Streaming Part 1 2026-06-18 18:18:02 +02:00
449609d817 Snap to ground || New terrain system || Terrain sculping || Mesh simplification 2026-06-17 08:56:42 +02:00
5a39ed5193 ImGuizmo System OpenGL 2026-06-17 01:19:59 +02:00
3bed2212d7 Editor settings for New/Legacy camera controll 2026-06-16 23:53:01 +02:00
f07c8fdcd2 Enable /map identifier in cmakelists.txt 2026-05-26 22:08:18 +02:00
maj00r
996cc68822 Fix Windows post-build zlib path (Python DLLs folder)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-11 18:25:01 +02:00
maj00r
4258af45dd cmake_path removed 2026-05-11 18:21:12 +02:00
maj00r
3786ecd98f Python 3.14 build and CI updates
Squashes the last five commits: migrate to Python 3.14 (CMake, AppVeyor, Azure, README), vcpkg/setup-ci fixes, CMake adjustments, remove bundled ref/python 2.7, and related scripting/static file updates.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-11 18:21:12 +02:00
02cffbe4ad Enable AVX2 support 2026-05-06 20:02:00 +02:00
docentYT
d5d1825e38 Remove dumb3d 2026-04-27 23:03:47 +02:00
copilot-swe-agent[bot]
7e49aa8740 Rewrite #includes to use explicit subdirectory paths
Co-authored-by: Hirek193 <23196899+Hirek193@users.noreply.github.com>
2026-03-14 19:16:48 +00:00
copilot-swe-agent[bot]
0531086bb9 Reorganize source files into logical subdirectories
Co-authored-by: Hirek193 <23196899+Hirek193@users.noreply.github.com>
2026-03-14 19:01:57 +00:00
11e79f52ae Conversion to cpp 20 2026-01-18 21:21:15 +01:00
c6c042aa52 Fix screenshot manager on OpenGL renderers 2025-09-17 17:34:53 +02:00
f43d4b5201 Add trivia randomisation 2025-09-16 00:25:00 +02:00
Ryba04
33ad7b718f Merge branch 'master' into master 2025-09-13 19:46:26 +02:00
jakubg1
5e2175302b Loading screen overhaul POC
The loading screen has been significantly changed:
- The background image is now properly picked randomly instead of taking the `textures/logo.bmp` file, prepended by an external program such as Rainsted/Starter.
- The progress bar has been moved from a floating window to a thin green line at the bottom of the loading screen.
- The log window is now hidden by default. It can be turned on by setting `loadinglog` to `true` in `eu07.ini`.
- There is an animated wheel icon on the loading screen, and a trivia text is displayed.

New translation key:
- `"Did you know"`

TODO:
- Load trivia from a separate file.
2025-09-10 01:53:22 +02:00
3810fff0dc Revert "Add TGUI library"
This reverts commit c6564351e8.
2025-09-09 16:46:12 +02:00
c6564351e8 Add TGUI library 2025-09-08 18:32:38 +02:00
ac2c5ab4cf Add auto dmp file genration 2025-06-02 22:41:39 +02:00
70b68a155b Fix rc porecompilation 2025-05-05 20:20:29 +02:00
cc82af3375 Add versioning info to binary 2025-05-05 19:58:17 +02:00
09920609ff Add generating PDBs and MAPs for executables 2025-04-17 10:56:42 +02:00
a39d972126 Some renaming 2025-04-15 01:32:56 +02:00
12d6a1578d Add vcpkg as submodule and ref it in cmake 2025-04-15 00:23:36 +02:00
WLs50
1feb4c4bd0 fix merging issue regarding discord-rpc 2025-04-05 14:49:42 +02:00
WLs50
0280b40ca5 Merge remote-tracking branch 'manul-public/master' into manul-staging 2025-04-05 14:24:53 +02:00
WLs50
ffe5ece058 wrap discord rpc as optional feature 2025-03-17 07:19:07 +01:00
WLs50
d793866937 Merge branch 'manul-staging' of https://github.com/wls50/maszyna-internal into manul-staging 2025-03-16 22:14:42 +01:00
WLs50
8f98292cbe implement moon 2025-03-16 22:12:37 +01:00
27f4920869 Add discord-rpc library 2025-03-16 16:22:54 +01:00
WLs50
07583a9f07 fix order of parameters after cmake -E copy -t 2025-03-16 14:51:38 +01:00