Commit graph

90 commits

Author SHA1 Message Date
Andreas Ortmann
ac90b1a613 Merge branch 'master' of https://git.j3d1.de/KKK/KlassischeKeplerKriege 2016-09-29 09:06:07 +02:00
end
12e0a8ac43 Merge branch 'master' of https://git.j3d1.de/KKK/KlassischeKeplerKriege 2016-09-29 09:09:19 +02:00
end
34c5334a68 sun in the middle 2016-09-29 09:08:09 +02:00
Andreas Ortmann
70b7233043 nicer explosion effects 2016-09-29 09:05:35 +02:00
Andreas Ortmann
1123be9860 adding rendered ufo 2016-09-29 08:47:32 +02:00
Andreas Ortmann
582e30670b adding nice ufo. 2016-09-29 08:42:52 +02:00
Andreas Ortmann
0f52038a8e fixed light. 2016-09-29 08:30:32 +02:00
Andreas Ortmann
44a7048c4a light working. 2016-09-29 08:28:56 +02:00
end
d7970ed797 + added light shit 2016-09-29 04:24:14 +02:00
end
a86d4e5d92 * merged 2016-09-29 02:55:04 +02:00
end
1ee349e1fb * fixes, refactoring & color attribute for planets 2016-09-29 02:50:51 +02:00
Andreas Ortmann
6b8227b0c3 ups 2016-09-29 00:52:58 +02:00
Andreas Ortmann
6168407973 yeah, particle rendering is working. 2016-09-29 00:50:14 +02:00
Andreas Ortmann
eb3c0f5cd4 added flag for autorun. 2016-09-28 21:38:13 +02:00
Andreas Ortmann
a92d3d2120 Merge branch 'master' of https://git.j3d1.de/KKK/KlassischeKeplerKriege 2016-09-28 21:26:48 +02:00
Andreas Ortmann
61a7f6f9ba added working particle engine. needs improvement. 2016-09-28 21:26:11 +02:00
cdd029f4c0 tests 2016-09-28 21:12:41 +02:00
Andreas Ortmann
a5ff1bc20d replaced vectors with lists for easier managment. 2016-09-28 17:38:32 +02:00
Andreas Ortmann
b71cb5cc52 refactored code for positions to use matrix only. 2016-09-28 16:12:25 +02:00
Andreas Ortmann
ff74da1c03 rockets rotate in their direction now. 2016-09-28 15:33:35 +02:00
Andreas Ortmann
3b5b5da02f rotations working :) 2016-09-28 15:22:16 +02:00
Andreas Ortmann
07437fac3c try to get rotation model matrix working. 2016-09-28 15:10:57 +02:00
Andreas Ortmann
35cbd01a52 adding simple dummy ship model. 2016-09-28 14:41:31 +02:00
Andreas Ortmann
4906777e9a adding simple dummy ship model. 2016-09-28 14:41:15 +02:00
Andreas Ortmann
1ad020dbd4 can render models with scale and translation and color now. 2016-09-28 14:19:05 +02:00
Andreas Ortmann
123e0aaa46 model rendering is working :) 2016-09-28 13:38:53 +02:00
Andreas Ortmann
722e9f53cd model rendering is working :) 2016-09-28 13:38:31 +02:00
Andreas Ortmann
85b8139872 got minimal vertex shader working. 2016-09-28 13:36:22 +02:00
Andreas Ortmann
92c27a1ef8 added model loading into opengl. not yet seeing output. 2016-09-28 13:16:11 +02:00
Andreas Ortmann
0105bfe430 fixed much stuff with bad usage of constructor mixed with virtual functions in gl stuff. added model loading with assimp. 2016-09-28 13:00:40 +02:00
Andreas Ortmann
aedda9d48e grouped files in subdirs. 2016-09-28 11:50:35 +02:00
Andreas Ortmann
7d8585c5d9 implemented dummy 3d class. 2016-09-28 11:42:50 +02:00
Andreas Ortmann
c8288d7a25 renamed renderer classes. fixed shooting taking rad instead of degrees as parameter. 2016-09-28 11:35:56 +02:00
end
74b4573c3a Merge branch 'end' 2016-09-28 07:58:48 +02:00
end
14dc7ff4ed * final merge fixes 2016-09-28 07:57:10 +02:00
end
d6075cbe7a * fixed ASIO_STANDALONE 2016-09-28 07:34:37 +02:00
end
648d7999c8 * fixes 2016-09-28 07:28:18 +02:00
end
56b9ef8093 Merge branch 'master' of https://git.j3d1.de/KKK/KlassischeKeplerKriege into end 2016-09-28 07:16:42 +02:00
end
8b1c94cebb * temp 2016-09-28 07:16:24 +02:00
4ff2994ff5 session.cpp 2016-09-28 07:14:25 +02:00
end
ed3990710e * refactored 2016-09-28 07:03:29 +02:00
78b9b2436c stuff to test 2016-09-28 05:52:23 +02:00
end
959202e111 * some fixes 2016-09-28 05:50:43 +02:00
8f41d89a3c fixes merge bug 2016-09-28 03:45:59 +02:00
244f98178a merge from master 2016-09-28 03:42:21 +02:00
eaff023ed3 networking parse command 2016-09-28 03:35:05 +02:00
end
d2d8039589 * switched to shader version 2016-09-28 03:33:01 +02:00
ef38da703e networking addPlayer 2016-09-28 01:48:34 +02:00
0e8e41e4fb server open and event loop 2016-09-28 00:26:36 +02:00
Andreas Ortmann
1e90a1c9c8 adding small stuff to limit traces 2016-09-28 00:13:03 +02:00