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

2814 Commits

Author SHA1 Message Date
milek7
6d592815c0 sound fixed 2017-08-18 23:51:38 +02:00
milek7
9aace0d85f fix linux crash (maybe not correct, but does not crash) 2017-08-18 15:58:08 +02:00
milek7
6b5084e855 fixes 2017-08-18 11:48:13 +02:00
milek7
ec60853614 merge, with tmj renderer 2017-08-18 00:56:05 +02:00
tmj-fstate
4ee618a3c1 build 170815. 2017-08-15 22:47:31 +02:00
tmj-fstate
5c14eb82cb Merge remote-tracking branch 'refs/remotes/youby/mover_in_c++' 2017-08-15 22:45:23 +02:00
tmj-fstate
72760ee9a8 bug fixes for speed table creation and update 2017-08-15 19:10:43 +02:00
Królik Uszasty
e31c7d8f60 AI: better braking with small difference of velocity 2017-08-15 18:32:42 +02:00
tmj-fstate
7e51d5d2e0 changed NULL use to c++11 compliant 2017-08-15 00:55:38 +02:00
tmj-fstate
7068a4ceff ai improvements and fixes for acceleration and brake handling, fix for automatic sandbox activation 2017-08-14 15:51:08 +02:00
tmj-fstate
335198384f Merge remote-tracking branch 'refs/remotes/youby/mover_in_c++' 2017-08-12 00:01:47 +02:00
tmj-fstate
30fc01c65a upgraded reflection map to dynamic environment cube map 2017-08-11 23:45:38 +02:00
Królik Uszasty
2014494c2a braking distance (fBrakeDist) calculation depends on train brakes performance, better braking - removed old conditions and phases 2017-08-11 18:38:03 +02:00
tmj-fstate
aaf4b599a5 remote sync 2017-08-10 19:11:56 +02:00
tmj-fstate
611ebed7ab build 170810. multi-texture materials, reflection map support 2017-08-10 19:04:34 +02:00
tmj-fstate
846ed21394 build 170810. multi-texture materials, reflection map support 2017-08-10 18:19:21 +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
06f00ebdeb this seems to be causing glitches
This reverts commit 3a713dd1ed.

Revert "this seems to be causing glitches"

This reverts commit ffda7fd4552dc11b6240332195e603e012d740b0.

Revert "vao changes"

This reverts commit 60e38616bd.
2017-08-07 20:58:37 +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
tmj-fstate
bc22d582de compilation warnings fixes 2017-08-06 17:14:20 +02:00
tmj-fstate
7e5b2d09cb conversion of legacy model-based terrain to camera-centric render system 2017-08-05 18:41:39 +02:00
tmj-fstate
b783cd38a9 replaced basic array in the model manager with stl containers 2017-08-05 18:37:05 +02:00
firleju
1574e0bbd1 Fixed crach when speedtable has one position 2017-08-04 20:31:54 +02:00
Królik Uszasty
9cd20971f5 Korekta progu działania, wyliczanie opóźnienia hamowania z uwzględnieniem wcześniejszego luzowania, dodanie poprawki wymaganej pozycji zaworu maszynisty (siły hamowania) w zależności od wyczerpania i przeładowania hamulców 2017-08-03 22:55:46 +02:00
tmj-fstate
238ea7547d minor refactoring, shadows colour influenced by sun/moon positions 2017-08-03 16:00:48 +02:00
milek7
3a713dd1ed minimize calls to opengl by caching uniforms (is it worth it, though?) 2017-08-03 12:28:15 +02:00
milek7
26e76abfbc works for rendering without texture (not done yet) 2017-08-03 11:49:03 +02:00
milek7
27920a9595 make static_asserts compilant with c++11 2017-08-03 00:10:12 +02:00
milek7
60e38616bd vao changes 2017-08-03 00:07:29 +02:00
milek7
726a834232 ubo for light settings 2017-08-02 23:26:40 +02:00
tmj-fstate
c8a70e5280 build 170731. cascade shadow maps stub, support for additional debug camera 2017-08-01 03:15:19 +02:00
Królik Uszasty
722733e8ac Merge remote-tracking branch 'refs/remotes/TMJ/mover_in_c++' 2017-07-31 17:32:23 +02:00
Królik Uszasty
e88b85e725 AI z hamulcem co 0,25 pozycji 2017-07-31 17:31:29 +02:00
firleju
80e216608e Merge pull request #14 from firleju/master
Konwersja z Delphi do C++. Wersja 20170725
2017-07-31 10:01:48 +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
firleju
b87ae9199c Merge remote-tracking branch 'tmj-fstate/mover_in_c++' 2017-07-31 08:00:11 +02:00
milek7
f7459f3434 linux support 2017-07-31 00:25:19 +02:00
tmj-fstate
01ef6b3887 minor c++ standard compliance fixes 2017-07-29 02:12:06 +02:00
tmj-fstate
4357919272 mvp matrices cached separately for each render pass, eliminated duplicate screen width/height variables 2017-07-29 00:28:37 +02:00
milek7
e7623fa18f fix case in cmakelists 2017-07-28 23:41:11 +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
9b4dc83a2d pantograph switch functionality swapped for the rear cab 2017-07-27 18:24:58 +02:00
tmj-fstate
bb58156513 shadow visibilty fixes, more strict degenerate triangle detection 2017-07-27 18:23:48 +02:00
tmj-fstate
000603877c build 170725. cab control sound support tweaks, excluded track nodes from casting shadows 2017-07-25 18:34:24 +02:00
tmj-fstate
2f1358422d multi texturing support for display list mode 2017-07-25 17:42:43 +02:00
tmj-fstate
d2d93616fa build 170424. basic shadow mapping implementation, multi texturing unit setup 2017-07-25 14:55:25 +02:00
firleju
9ff3f2b4c1 Merge remote-tracking branch 'tmj-fstate/mover_in_c++' into mover_in_c++ 2017-07-24 14:47:36 +02:00
firleju
997f3199e0 Sortowanie tabelki po odległości 2017-07-22 07:49:19 +02:00
tmj-fstate
ba5a3613ad build 170721. increased size of light points at long distances 2017-07-22 00:14:07 +02:00