Commit Graph

66 Commits

Author SHA1 Message Date
milek7
ebd2e0e193 Merge branch 'milek-dev' into gfx-work 2019-01-27 20:41:49 +01:00
Milek7
05297ee83d Merge pull request #35 from carmel4a/switchable-debug-visualization-of-traction
Switchable debug visualization of traction
2018-12-04 23:52:31 +01:00
Kamil Lewan
b21ebd80b3 Traction wire depends on renderer settings. 2018-10-14 00:05:15 +02:00
milek7
b7a61071ba Merge branch 'milek-dev' into gfx-work 2018-10-12 18:51:12 +02:00
milek7
2a00d52525 Merge branch 'tmj-dev' into milek-dev 2018-10-12 18:50:34 +02:00
tmj-fstate
f8c2f17f82 material priority tweak, traction geometry creation fix 2018-10-12 00:05:14 +02:00
milek7
2357026146 Merge branch 'milek-dev' into gfx-work 2018-10-11 00:14:49 +02:00
milek7
52c8b40f88 Merge branch 'tmj-dev' into milek-dev 2018-10-10 21:37:52 +02:00
tmj-fstate
9cacf191c6 submodel opacity parameter, additional light blinking modes, scenario event queue filtering 2018-10-09 18:48:24 +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
ec1a625c12 minor camera refactoring, division by zero guards 2018-08-03 16:07:50 +02:00
tmj-fstate
ff6bed67a9 refactoring: application mode code split 2018-08-02 20:39:19 +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
13ba3fcd13 work 2018-07-08 21:33:26 +02:00
tmj-fstate
8491c63f3c files missing from previous commit
fixes
version
2018-06-16 19:08:30 +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
milek7
61836eb2e4 Merge branch 'tmj-dev' 2018-02-16 15:33:11 +01:00
tmj-fstate
0124032d3b maintenance: settings item refactoring, include dependencies fixes 2018-01-26 16:44:47 +01:00
milek7
1413aae881 fix build in compilers other than msvc: include shuffling 2018-01-25 15:43:41 +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
c62fca8b5a Merge branch 'tmj-dev' into lua 2017-10-31 14:01:53 +01:00
milek7
16923d20f7 tmj merge 2017-10-30 16:30:04 +01:00
tmj-fstate
9edf912405 maintenance: minor code cleanup 2017-10-30 02:34:54 +01:00
tmj-fstate
da396836e0 maintenance: removed deprecated ground code 2017-10-28 16:18:53 +02:00
tmj-fstate
4ce975a656 build 171027: bounding area calculation fixes, novice ui obstacle indicator, minor traction render enhancement, shadow calculations for tall enough platforms 2017-10-28 01:17:56 +02:00
tmj-fstate
7ad760821f build 1020: error fixes and backward compatibility improvements 2017-10-22 19:19:16 +02:00
tmj-fstate
de4e10ab39 continued refacoring: vehicles, events, memcells, tracks, traction, traction power sources; minor readability enhancements and bug fixes 2017-10-11 20:21:05 +02:00
tmj-fstate
020c71533f reduced memory use, re-enabled debug mode, plugged some of remaining memory leaks 2017-10-07 17:20:53 +02:00
tmj-fstate
f6272d37f1 partial initial refactoring: events, memcells, tracks, models, traction; NOTE: debug mode broken, investigate 2017-10-07 01:18:54 +02:00
milek7
ec60853614 merge, with tmj renderer 2017-08-18 00:56:05 +02:00
tmj-fstate
7e51d5d2e0 changed NULL use to c++11 compliant 2017-08-15 00:55:38 +02:00
milek7
f7459f3434 linux support 2017-07-31 00:25:19 +02:00
milek7
ce9a0b39c2 match include to file case 2017-07-28 23:39:22 +02:00
VB
0574b3f758 renderer changes, temporary revert shaders for traction because of lack of texless shader 2017-07-03 20:29:34 +02:00
VB
91864d8195 merge2 (incomplete) 2017-06-20 23:05:07 +02:00
VB
cb4e34eece merge (incomplete) 2017-06-20 21:08:26 +02:00
tmj-fstate
21680a5d30 completed unification of render paths 2017-06-13 18:13:49 +02:00
tmj-fstate
22746bad21 partial replacement of math classes with glm 2017-06-10 22:51:51 +02:00
tmj-fstate
de5b245f2e implemented geometry bank manager, unified traction render code 2017-06-08 15:00:16 +02:00
tmj-fstate
3068cc669e fixes for display list path camera-centric rendering, basic support for binary terrain object type, fix for assignment of 3d objects to terrain cells 2017-05-26 21:22:13 +02:00
tmj-fstate
2b6ea903bc camera-centric rendering, initial implementation 2017-05-25 15:49:15 +02:00
tmj-fstate
c38511978d build 170519. fixes for buffer overflows in segment.cpp 2017-05-19 20:07:23 +02:00
tmj-fstate
23f4892bcc basic executable versioning 2017-05-16 14:13:28 +02:00
tmj-fstate
52a76f0ba1 build 170515. added converter start parameters, partial unification for traction render paths, minor fixes for multi-unit cab instruments 2017-05-15 17:23:25 +02:00
VB
401d95fc57 merge (with bugs) 2017-04-24 19:08:08 +02:00
VB
4d19e49398 experiments with shaders 2017-03-19 10:48:22 +01:00