eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 01:59:19 +02:00
Code Issues 121 Wiki Activity
1,617 Commits 33 Branches 11 Tags
aa9bee57da34ccfed0d6437795dedf3d777400c4
Commit Graph

1617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
milek7
aa9bee57da further WIP on launcher 2019-08-24 01:28:55 +02:00
milek7
ad58c617d4 fixes to pause popup logic 2019-08-21 21:52:47 +02:00
milek7
d961cb17a2 use binary ifstream in cParser 2019-08-21 20:23:07 +02:00
milek7
c4d2c04363 use 0.999 for opacity comprasion 2019-08-21 19:17:01 +02:00
milek7
2bcdb36df1 further work on launcher 2019-08-21 17:18:39 +02:00
milek7
878b8621f0 work 2019-08-15 15:08:17 +02:00
milek7
7f0dfa708e remove multidrawarrays optimization 2019-08-14 00:48:44 +02:00
milek7
4583cfcf1f Merge branch 'gfx-work' into sim 2019-08-14 00:47:55 +02:00
milek7
5abd822511 Merge branch 'milek-dev' into gfx-work 2019-08-14 00:47:25 +02:00
milek7
7185904e38 disable continuous brake for jointctrls 2019-08-14 00:45:50 +02:00
milek7
bd850655a9 scenery parser work 2019-08-10 22:52:23 +02:00
milek7
df03816cc5 Merge branch 'milek-dev' into sim 2019-08-10 17:45:58 +02:00
milek7
ac7a15d667 particles: do not use reserve/capacity, use separate var 2019-08-10 17:45:44 +02:00
milek7
4489aa31ee more work at parsing trainsets in launcher 2019-08-10 15:16:38 +02:00
milek7
da6343166a scn parsing with directive and trainset matching 2019-08-10 12:00:37 +02:00
milek7
84d2065a8a bump macos xcode version 2019-08-09 21:13:03 +02:00
milek7
1f58f8f062 bump version 2019-08-09 21:00:04 +02:00
milek7
bfff2d506d depthmask mode fixes, fix particle triangle winding order 2019-08-09 19:02:29 +02:00
milek7
163c1155c2 bump azure macos to 10.14 2019-08-09 01:00:17 +02:00
milek7
1626864bfe cleanup 2019-08-09 00:45:38 +02:00
milek7
540b21113e really unbind vao 2019-08-08 16:02:51 +02:00
milek7
0ed35ed254 Merge branch 'gfx-work' into sim 2019-08-08 15:56:06 +02:00
milek7
b2e3ee79c3 Merge branch 'milek-dev' into gfx-work 2019-08-08 15:52:00 +02:00
milek7
c45081b2eb Merge branch 'master' of https://github.com/tmj-fstate/maszyna into milek-dev 2019-08-08 15:49:34 +02:00
milek7
613bdb91d9 make vao mode selectable at runtime (enabled by default, disabled by multiviewports) 2019-08-08 15:48:55 +02:00
milek7
37fea6db7a Merge branch 'milek-dev' into gfx-work 2019-08-08 15:35:25 +02:00
tmj-fstate
c951b1b955 scenery model smoke source binding, smoke dispersion tweaks, wind simulation tweak 2019-08-08 00:48:11 +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
6c88a52bbc work 2019-08-07 21:47:15 +02:00
Królik Uszasty
69130d54a0 Additional Zeros don't work for MHZ_EN57 2019-08-06 14:09:22 +02:00
tmj-fstate
d317dc2296 cab change logic tweak, event launcher execution fix 2019-08-06 14:08:22 +02:00
tmj-fstate
fbd2ff85fa basic particle system implementation 2019-08-06 14:06:46 +02:00
milek7
8e7eba50c1 Merge branch 'gfx-work' into sim 2019-07-31 22:38:38 +02:00
Milek7
a955244f9f Merge pull request #7 from antonisauren/gfx-work 
Parallax occlusion shader
 2019-07-31 22:38:12 +02:00
milek7
d95986745c add missing replace_slashes in node triangles deserializer, vehicle picker changes, explicit filesystem::path to string conversion 2019-07-31 21:43:58 +02:00
milek7
ee65ca77e3 add missing files 2019-07-31 17:22:13 +02:00
tmj-fstate
95aab4b629 shp activation fix 2019-07-21 17:15:34 +02:00
tmj-fstate
3feca56c08 build 190712. heating generator state cab controls, engine state ui readout fix, minor ai logic tweaks 2019-07-16 10:32:57 +02:00
milek7
f10e15f408 Merge branch 'gfx-work' into sim 2019-07-13 01:47:36 +02:00
milek7
8e4de4be56 Merge branch 'milek-dev' into gfx-work 2019-07-13 01:30:49 +02:00
milek7
ef70b6ff00 separate azure artifacts platforms 2019-07-13 00:40:30 +02:00
milek7
1c3b37407d Merge branch 'milek-dev' 2019-07-13 00:37:42 +02:00
milek7
8a93a9e2fb update readme 2019-07-13 00:37:39 +02:00
milek7
30af4a3817 Merge branch 'tmj-dev' into milek-dev 2019-07-13 00:33:58 +02:00
milek7
8f7e06c25c snapshot 2019-07-09 22:09:37 +02:00
milek7
a0c44fbaa3 snapshot 2019-07-02 15:33:49 +02:00
tmj-fstate
06b7f009cc build 190701. basic radio call event launch support 2019-07-02 01:44:54 +02:00
milek7
d039207b03 snapshot 2019-07-02 01:00:42 +02:00
milek7
684ff24087 update imgui 2019-07-01 00:09:04 +02:00
Królik Uszasty
0f0c30dbff Changed diesel percentage threshold for AI 2019-06-29 15:19:53 +02:00