40 Commits

Author	SHA1	Message	Date
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	e4789db1d5	maintenance: minor code cleanup	2018-09-07 19:04:51 +02:00
tmj-fstate	bb0e1eb3bf	disable interaction in pause mode, audio volume calculations tweak	2018-09-05 13:49:48 +02:00
tmj-fstate	6d16d52356	basic text localization system	2018-09-02 16:09:05 +02:00
tmj-fstate	0c062e9041	imgui user interface implementation	2018-08-30 20:41:14 +02:00
milek7	af0e193bde	fixes	2018-08-03 16:28:01 +02:00
tmj-fstate	ec1a625c12	minor camera refactoring, division by zero guards	2018-08-03 16:07:50 +02:00
milek7	e603d2fefe	map	2018-08-02 20:41:39 +02:00
tmj-fstate	ff6bed67a9	refactoring: application mode code split	2018-08-02 20:39:19 +02:00
milek7	20787d1ba4	ui changes	2018-07-19 20:53:26 +02:00
milek7	78b23b80aa	Merge branch 'milek-dev' into gfx-work	2018-07-18 13:51:11 +02:00
milek7	08cf801c4e	Merge branch 'tmj-dev' into milek-dev	2018-07-17 16:47:25 +02:00
tmj-fstate	12d70fe320	virtual slider mouse input mode, minor refactoring, minor bug fixes	2018-07-11 17:45:50 +02:00
milek7	a13fc4e500	imgui	2018-07-10 23:21:50 +02:00
milek7	dc584c140e	Merge branch 'tmj-dev' into milek-dev	2018-06-30 18:45:58 +02:00
tmj-fstate	14448d70d1	maintenance: memory leak fix, default constructors, minor syntax cleanups	2018-06-16 15:59:28 +02:00
milek7	a914065dd0	Merge branch 'tmj-dev' into milek-dev	2018-04-06 22:33:08 +02:00
tmj-fstate	87f078925c	build 180404. optional scenario clock sync with current local time, keyboard input for the ui layer	2018-04-06 01:12:15 +02:00
milek7	6b24a39944	on-screen log	2018-02-16 18:22:10 +01:00
milek7	61836eb2e4	Merge branch 'tmj-dev'	2018-02-16 15:33:11 +01:00
tmj-fstate	23761dc665	build 180131. support for nested material attribute definitions, minor bug fixes, refactoring and master branch unifications	2018-01-31 16:07:50 +01:00
firleju	43efd1fa3f	Merge Milek7 sound and lua	2017-09-13 09:51:35 +02:00
firleju	7925f8702b	Merge remote-tracking branch 'tmj-fstate/mover_in_c++' into mover_in_c++	2017-09-03 17:54:51 +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
firleju	064259a2e5	Merge remote-tracking branch 'tmj-fstate/mover_in_c++' into mover_in_c++	2017-08-07 05:59:33 +02:00
firleju	a8cdea66c0	Merge remote-tracking branch 'tmj-fstate/mover_in_c++' into mover_in_c++	2017-07-31 09:06:17 +02:00
milek7	ce9a0b39c2	match include to file case	2017-07-28 23:39:22 +02:00
tmj-fstate	3a26ccb2fd	reverted pantograph control changes, removed some of the type conversion warnings	2017-07-28 20:28:08 +02:00
tmj-fstate	bb58156513	shadow visibilty fixes, more strict degenerate triangle detection	2017-07-27 18:23:48 +02:00
tmj-fstate	d2d93616fa	build 170424. basic shadow mapping implementation, multi texturing unit setup	2017-07-25 14:55:25 +02:00
firleju	3cf4347e72	Merge remote-tracking branch 'tmj-fstate/mover_in_c++' into mover_in_c++	2017-07-20 21:33:05 +02:00
tmj-fstate	16718d53bb	refactored mouse input processor, tweaks to mouse input support, fix for diesel engine compressor, added progress bar label	2017-07-10 19:36:23 +02:00
tmj-fstate	9a008ecff5	build 170708. cursor-based item picking, mouse support for cab controls, rudimentary render modes support in renderer	2017-07-09 16:45:40 +02:00
firleju	591258c704	Merge remote-tracking branch 'tmj-fstate/mover_in_c++' into mover_in_c++	2017-06-19 09:25:24 +02:00
tmj-fstate	de5b245f2e	implemented geometry bank manager, unified traction render code	2017-06-08 15:00:16 +02:00
tmj-fstate	3203ad1f6c	build 170507. vs2015 compliance	2017-05-07 15:30:28 +02:00
firleju	f7ece6529f	Dodane pliki do projektu. Konwersja uilayer na UTF	2017-03-29 06:18:56 +02:00
tmj-fstate	e0bde30ee4	basic ui panels	2017-03-13 15:35:34 +01:00