112 Commits

Author	SHA1	Message	Date
milek7	1626864bfe	cleanup	2019-08-09 00:45:38 +02:00
milek7	0ed35ed254	Merge branch 'gfx-work' into sim	2019-08-08 15:56:06 +02:00
milek7	37fea6db7a	Merge branch 'milek-dev' into gfx-work	2019-08-08 15:35:25 +02:00
milek7	1fa6313373	Merge branch 'master' of https://github.com/tmj-fstate/maszyna into milek-dev	2019-08-08 00:37:04 +02:00
milek7	d039207b03	snapshot	2019-07-02 01:00:42 +02:00
milek7	aae73106f4	Merge branch 'gfx-work' into sim	2019-04-15 13:10:40 +02:00
milek7	c0b11a4517	Merge branch 'sim_VideoStream' of https://github.com/MichalPeterek/maszyna into sim	2019-04-09 00:02:05 +02:00
milek7	fe0a4bdf1d	cameraview dummy	2019-04-09 00:01:36 +02:00
milek7	4931d6d6f8	add stb_image	2019-04-08 23:39:46 +02:00
michalpeterek	97950ce5b2	Add videostream dev code	2019-04-08 23:21:29 +02:00
milek7	b40505715b	Merge branch 'milek-dev' into gfx-work	2019-04-05 22:37:45 +02:00
milek7	c90b679f2d	enable uart for default windows and linux build	2019-04-05 22:31:53 +02:00
milek7	d364c242aa	Merge branch 'milek-dev' into gfx-work	2019-04-05 22:30:50 +02:00
milek7	0861ad9633	build system tweaks	2019-04-05 21:08:26 +02:00
milek7	99ab5ec8c8	Merge branch 'milek-dev' into gfx-work	2019-04-05 19:43:22 +02:00
milek7	7ea8653988	Merge branch 'tmj-dev' into milek-dev	2019-04-05 19:39:25 +02:00
milek7	3c28416912	Merge branch 'milek-dev' into gfx-work	2019-04-05 19:36:50 +02:00
milek7	c17e737abb	uart compile fix	2019-04-05 13:58:24 +02:00
milek7	803bf23715	perf window	2019-03-27 23:13:51 +01:00
milek7	24316f3d27	restore old PNG finding, for older CMake	2019-03-25 22:06:08 +01:00
milek7	6d4d7248e2	restore old PNG finding, for older CMake	2019-03-25 22:05:34 +01:00
milek	075d88e8d7	fix stdafx cotire	2019-03-25 20:56:22 +00:00
milek	810ea151e2	fix compiling on MacOS	2019-03-25 20:23:32 +00:00
milek	c09160d8f5	uart now optional, macos openal fix	2019-03-25 20:20:10 +00:00
milek	33a4bb2b14	fix compiling on MacOS	2019-03-25 20:17:27 +00:00
milek	01ac5535f1	uart now optional, macos openal fix	2019-03-25 19:53:44 +00:00
milek7	aa8d66e5da	recording	2019-03-25 01:12:19 +01:00
milek7	16570f8d23	move vehicle param window to vehicle list, add radiostop button	2019-03-16 20:51:51 +01:00
milek7	e3c88b9834	network-aware obstacles, other changes	2019-03-16 17:13:46 +01:00
milek7	3556a2d0e6	vehicle params window, aware system rewrite, sifa	2019-03-16 02:17:41 +01:00
milek7	ef82aa8589	splittable python windows	2019-03-13 01:03:38 +01:00
milek7	3693c1660e	renderer changes, time and environment window	2019-03-09 21:14:01 +01:00
milek7	1f0d8c4dc8	semaphores controllable on minimap	2019-03-06 00:58:12 +01:00
milek7	1bb700c1ec	Merge branch 'milek-dev' into gfx-work	2019-02-26 22:07:04 +01:00
milek7	939aa73384	switch state visualisation, semaphore tracking for map purposes	2019-02-22 22:21:23 +01:00
milek7	87acb6bc15	remove glut	2019-02-19 01:27:57 +01:00
milek7	52ff1ecb98	display train names on map	2019-02-18 00:07:09 +01:00
milek7	ec34720ad6	work	2019-01-29 23:19:32 +01:00
milek7	cf6cbe9a8e	work	2019-01-29 19:02:16 +01:00
milek7	672e3e022a	work	2019-01-28 23:19:41 +01:00
milek7	90f18ea651	work	2019-01-27 20:38:03 +01:00
milek7	1ef74838ee	work	2019-01-20 15:32:03 +01:00
milek7	f63bd04bfe	work	2019-01-18 00:26:48 +01:00
milek7	b1cb4ad1ea	work	2019-01-02 22:31:46 +01:00
milek7	f525a77e23	work	2018-12-03 23:12:33 +01:00
milek7	fbcd933d56	rendering python to individual windows	2018-10-25 18:07:43 +02:00
milek7	0c460e9e0d	use pbo for picking buffers, restore picking for scenery nodes	2018-10-23 17:04:04 +02:00
milek7	cdd79e605c	add gl::fence	2018-10-21 00:38:39 +02:00
milek7	7c9c19908a	create generic gl::buffer, rebase gl::ubo onto it	2018-10-21 00:16:02 +02:00
milek7	d16d96f2b2	GLES support	2018-10-16 20:32:45 +02:00