16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 02:09:19 +02:00
Commit Graph

63 Commits

Author SHA1 Message Date
milek7
d16d96f2b2 GLES support 2018-10-16 20:32:45 +02:00
milek7
cd8ffd5024 Merge branch 'milek-dev' into gfx-work 2018-10-13 00:03:02 +02:00
milek7
047988219b build fixes, bump version, don't duplicate screen render requests 2018-10-12 23:19:38 +02:00
milek7
fae9718b71 Merge branch 'milek-dev' into gfx-work 2018-10-12 17:34:40 +02:00
milek7
b0dc3e5269 imgui update, fix gl2 imgui 2018-10-12 17:33:34 +02:00
milek7
b77bbd93e2 add encoding flag for stupid vs 2018-10-11 22:37:35 +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
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
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
milek7
9955bb0426 Apply CMake policy CMP0072 only when available
CMP0072 policy introduced in commit e5d60cb requires CMake >= 3.11
2018-08-06 01:29:43 +02:00
milek7
e603d2fefe map 2018-08-02 20:41:39 +02:00
milek7
da429650ab configurable renderer 2018-07-25 12:21:47 +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
milek7
4c855d5980 work 2018-07-15 23:46:53 +02:00
milek7
4566375faa work 2018-07-14 17:00:54 +02:00
milek7
29167ed459 win work 2018-07-11 19:44:36 +02:00
milek7
7299fc866e tmp 2018-07-11 14:38:34 +02:00
milek7
94712f5c77 TMP 2018-07-11 00:30:33 +02:00
milek7
a13fc4e500 imgui 2018-07-10 23:21:50 +02:00
milek7
13ba3fcd13 work 2018-07-08 21:33:26 +02:00
milek7
1c26096c5c ubo (ugly for now) 2018-06-26 01:05:46 +02:00
milek7
d8b3ddba8c use cotire instead of precompiledheader 2018-06-25 13:31:08 +02:00
milek7
694aac6065 vao 2018-06-25 11:43:03 +02:00
milek7
0c5f990528 further pruning of legacy render code, now runs on opengl 3.3 core
profile
2018-06-24 20:23:58 +02:00
milek7
e5d60cbb39 cmake policy: prefer GLVND 2018-06-12 19:08:25 +02:00
milek7
a2881dfa9c Merge branch 'tmj-dev' 2018-02-24 16:05:35 +01:00
milek7
61836eb2e4 Merge branch 'tmj-dev' 2018-02-16 15:33:11 +01:00
milek7
943eabf8a1 motion telemetry preparations 2018-01-15 13:44:27 +01:00
milek7
a215a0f8b3 Merge branch 'tmj-dev' into dev 2017-12-25 18:27:10 +01:00
milek7
a810cbd640 configure appveyor 2017-11-02 21:43:25 +01:00
firleju
3d15c84739 Merge remote-tracking branch 'Milek7/lua' into mover_in_c++ 2017-11-02 18:20:42 +01:00
milek7
6d9e718a95 fixes 2017-10-31 20:25:17 +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
firleju
cd80c2ded6 Merge remote-tracking branch 'Milek7/lua' into mover_in_c++
Merge remote-tracking branch 'Milek7/lua' into mover_in_c++
2017-10-06 16:27:53 +02:00
milek7
93a9290025 sound files cleanup 2017-09-30 11:50:27 +02:00
firleju
49c5854d10 cmake 2017-09-26 19:46:26 +02:00
firleju
a523afe7cd Merge remote-tracking branch 'Milek7/lua' into mover_in_c++ 2017-09-25 15:33:18 +02:00
firleju
ae4223123a Clean up CMake build system
Clean up CMake build system
2017-09-25 06:34:28 +02:00
milek7
f2a57dda63 uart experiments
windows build fix

log uart write error

uart changes

uart changes

uart changes

uart changes

uart changes

uart works

uart changes

verbose uart log

uart changes

uart changes

uart logging

uart logging

uart changes

changes

uart changes
2017-09-24 17:12:24 +02:00
milek7
e5ad6be865 cabin sound positioning 2017-09-16 20:37:18 +02:00
milek7
5644206e42 basic lua support 2017-09-02 12:12:58 +02:00
milek7
92442b8bf7 largeaddressaware for windows 2017-08-20 19:55:38 +02:00
milek7
ec60853614 merge, with tmj renderer 2017-08-18 00:56:05 +02:00
milek7
08acc60a8b sound works
sound works 2

sound works 3

sound works

sound works

sound works

sound works

sound works

sound fixes

fix
2017-08-08 21:44:16 +02:00
milek7
f7459f3434 linux support 2017-07-31 00:25:19 +02:00