58 Commits

Author SHA1 Message Date
Jano211
51e1a3ab22 SBT Include 2025-10-20 19:58:50 +02:00
WLs50
a5f6397eca merge manul 2025-03-09 15:36:11 +01:00
milek7
29f8f91ad8 Merge remote-tracking branch 'tmj/master' into sim 2020-10-18 23:35:14 +02:00
milek7
1dc1bd5fcb pre-merge renames 2020-09-30 18:27:43 +02:00
tmj-fstate
330bd3c455 post-merge fixes 2020-02-20 20:28:32 +01:00
tmj-fstate
7a0c89f508 milek7/sim branch network code import 2020-02-16 03:03:17 +01:00
tmj-fstate
0fd23a53d9 milek7/sim branch opengl 3.3 renderer import 2019-10-26 15:17:09 +02:00
tmj-fstate
59df08dbee maintenance: opengl and generic gfx class source files split 2019-10-14 21:59:01 +02:00
milek7
f6ce47f212 map ai command send feature, debug window event queue feature, fix timeoverride, ai restores light settings after clearing setsignal 2019-10-12 00:55:07 +02:00
milek7
aa9bee57da further WIP on launcher 2019-08-24 01:28:55 +02:00
milek7
2bcdb36df1 further work on launcher 2019-08-21 17:18:39 +02:00
milek7
33adffb614 map visualization features 2019-04-02 01:21:49 +02:00
milek7
8b642205eb alerter fixes, removing obstacles, python config changes 2019-03-16 12:43:34 +01:00
milek7
608af111a2 Merge branch 'gfx-work' into sim 2019-03-16 02:28:42 +01:00
milek7
1c1f2f625e Merge branch 'milek-dev' into gfx-work 2019-03-16 02:28:36 +01:00
milek7
4bc90cdd19 Merge branch 'tmj-dev' into milek-dev 2019-03-16 01:37:38 +01:00
milek7
7ca562211a improve nearest track-point search 2019-03-15 01:18:23 +01:00
milek7
1f0d8c4dc8 semaphores controllable on minimap 2019-03-06 00:58:12 +01:00
tmj-fstate
9cb268042b scenario ui panel 2019-03-05 19:45:15 +01:00
milek7
064b360a53 map work 2019-02-25 00:41:11 +01:00
milek7
939aa73384 switch state visualisation, semaphore tracking for map purposes 2019-02-22 22:21:23 +01:00
milek7
89cf20a251 map improvements 2019-02-18 17:46:31 +01:00
milek7
5a0bb610db network improvements 2019-02-05 00:07:34 +01:00
tmj-fstate
7933ade080 maintenance: removed deprecated files, linux friendly include names 2018-10-12 19:53:33 +02:00
milek7
09970d73b1 Merge branch 'milek-dev' into gfx-work 2018-10-10 19:33:08 +02:00
milek7
14b27a6e98 Merge branch 'tmj-dev' into milek-dev 2018-10-01 21:00:27 +02:00
tmj-fstate
e1b20a025a build 180923. basic precipitation visualization system, minor bug fixes 2018-09-23 19:13:33 +02:00
milek7
7c6501bb07 Merge branch 'master' into gfx-work 2018-09-20 19:14:28 +02:00
milek7
d9687a4e1f Merge branch 'tmj-dev' into milek-dev 2018-09-16 22:48:53 +02:00
tmj-fstate
cf7b9652e0 build 180804. configurable command bindings for scroll wheel, minor bug fixes 2018-08-04 12:34:51 +02:00
milek7
e603d2fefe map 2018-08-02 20:41:39 +02:00
milek7
08cf801c4e Merge branch 'tmj-dev' into milek-dev 2018-07-17 16:47:25 +02:00
tmj-fstate
ed1e0d8a10 refactoring: basic application code wrapper 2018-07-14 23:44:56 +02:00
tmj-fstate
12d70fe320 virtual slider mouse input mode, minor refactoring, minor bug fixes 2018-07-11 17:45:50 +02:00
tmj-fstate
219e8badc5 position and rotation adjustment value snap mode in scenery editor, position adjustment for memory cells in scenery editor 2018-07-10 01:09:20 +02:00
tmj-fstate
ff1a85fe5d build 180708. model instance position and rotation adjustment in scenery editor, support for event launcher activation with mouse click, minor refactoring 2018-07-08 23:18:27 +02:00
milek7
dc584c140e Merge branch 'tmj-dev' into milek-dev 2018-06-30 18:45:58 +02:00
tmj-fstate
30e31cdfd0 build 180626. ai power use logic tweaks, basic selected node attributes display in scenery editor, memory cell visualization in scenery editor debug mode, minor bug fixes 2018-06-27 03:22:50 +02:00
tmj-fstate
14448d70d1 maintenance: memory leak fix, default constructors, minor syntax cleanups 2018-06-16 15:59:28 +02:00
milek7
db58ec131a Merge branch 'tmj-dev' into milek-dev 2018-06-15 18:58:03 +02:00
tmj-fstate
457de678c3 basic scenery data export in legacy text format 2018-06-13 16:51:57 +02:00
tmj-fstate
e8bb25454e pre-merge syncs 2018-02-03 17:37:46 +01:00
tmj-fstate
fdb99eedc6 sound transcripts, event-started sound persistence 2018-01-02 20:30:38 +01:00
milek7
a215a0f8b3 Merge branch 'tmj-dev' into dev 2017-12-25 18:27:10 +01:00
tmj-fstate
5226fca281 unified simulation sound sources, gfx namespace for gfx code and structures 2017-11-12 18:16:50 +01:00
milek7
a3031f105e 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
tmj-fstate
a700d36ea7 maintenance: minor code touch ups 2017-11-01 02:54:31 +01:00
milek7
c62fca8b5a Merge branch 'tmj-dev' into lua 2017-10-31 14:01:53 +01:00
tmj-fstate
071a156527 build 171030: binary serialization for region terrain 2017-10-30 23:41:22 +01:00
milek7
16923d20f7 tmj merge 2017-10-30 16:30:04 +01:00