|
|
654fca9e67
|
fix merge
|
2016-10-06 04:06:14 +02:00 |
|
|
|
34d2c82fd9
|
fix merge
|
2016-10-06 03:52:36 +02:00 |
|
|
|
6e6a28c9ff
|
merge end stuff
|
2016-10-06 03:37:07 +02:00 |
|
|
|
03a271c731
|
a quickfix in the morning
|
2016-10-06 03:30:09 +02:00 |
|
end
|
1046fc644f
|
Merge branch 'master' of https://git.j3d1.de/KKK/KlassischeKeplerKriege
|
2016-10-06 00:17:40 +02:00 |
|
end
|
6da68e1667
|
* refactoring
|
2016-10-06 00:17:04 +02:00 |
|
Andreas Ortmann
|
dc5cc89792
|
added player ship delete event and for missiles too.
|
2016-10-05 23:53:22 +02:00 |
|
end
|
9e4bda9242
|
+ added line width of 2
|
2016-10-05 23:37:46 +02:00 |
|
Andreas Ortmann
|
8ec3f47276
|
removed debug/info statements.
|
2016-10-05 23:37:27 +02:00 |
|
|
|
70b0fee526
|
post processing light
|
2016-10-05 23:26:55 +02:00 |
|
|
|
f15213db1b
|
post processing
|
2016-10-05 20:53:37 +02:00 |
|
Andreas Ortmann
|
fc7213fe03
|
fixed texture being wrongly loaded.
|
2016-10-05 19:12:15 +02:00 |
|
|
|
63b5954631
|
png
|
2016-10-05 18:16:04 +02:00 |
|
|
|
756e98fe9f
|
Merge branch 'master' of http://git.j3d1.de/KKK/KlassischeKeplerKriege
|
2016-10-05 17:34:44 +02:00 |
|
|
|
834df4c713
|
backgrounds
|
2016-10-05 17:31:52 +02:00 |
|
end
|
1fff1fbce2
|
Revert "adding camera to 3d render. angles not yet working."
This reverts commit 602d0bb342.
|
2016-10-04 19:12:04 +02:00 |
|
end
|
8dd2f2b292
|
Revert "playing more with camera."
This reverts commit 55274ec3cf.
|
2016-10-04 19:11:59 +02:00 |
|
Andreas Ortmann
|
55274ec3cf
|
playing more with camera.
|
2016-10-04 16:25:23 +02:00 |
|
Andreas Ortmann
|
602d0bb342
|
adding camera to 3d render. angles not yet working.
|
2016-10-04 16:09:15 +02:00 |
|
Andreas Ortmann
|
14e08db4ca
|
developer console working. can reload or change the background image now with network connection.
|
2016-10-03 23:08:34 +02:00 |
|
Andreas Ortmann
|
ed32f515a3
|
adding developer console connect with 'dev bl bla bla lb' command.
|
2016-10-03 22:58:52 +02:00 |
|
Andreas Ortmann
|
4e46d65c27
|
Merge branch 'master' of https://git.j3d1.de/KKK/KlassischeKeplerKriege
|
2016-10-03 21:17:07 +02:00 |
|
Andreas Ortmann
|
a56f688204
|
loading texture from png and rendering on the screen (quad) works.
|
2016-10-03 21:14:07 +02:00 |
|
Andreas Ortmann
|
dfda49c027
|
adding texture loading.
|
2016-10-03 20:12:09 +02:00 |
|
end
|
68467772b9
|
Merge branch 'master' of https://git.j3d1.de/KKK/KlassischeKeplerKriege
|
2016-10-03 20:11:47 +02:00 |
|
end
|
9da97611e0
|
* fixed fbo classes
|
2016-10-03 20:11:10 +02:00 |
|
Andreas Ortmann
|
7eac02328d
|
added missing 128 faces planet model
|
2016-10-03 19:40:56 +02:00 |
|
Andreas Ortmann
|
5e8a04c54f
|
ignore the sound for now. event mechanism is working good with renderer.
|
2016-10-03 18:56:49 +02:00 |
|
Andreas Ortmann
|
550556e0e4
|
sound is so buggy.
|
2016-10-03 18:45:24 +02:00 |
|
Andreas Ortmann
|
becf8602d7
|
event stuff working again. a bit too much boiler plate code but functionality counts.
|
2016-10-03 13:37:49 +02:00 |
|
Andreas Ortmann
|
2d0608b205
|
explosions make light now.
|
2016-10-03 10:49:01 +02:00 |
|
Andreas Ortmann
|
fc2d4c5028
|
explosions make light now.
|
2016-10-03 10:47:02 +02:00 |
|
Andreas Ortmann
|
544282dd84
|
adding event stuff to renderer to notify of new explosions
|
2016-10-03 00:23:21 +02:00 |
|
Andreas Ortmann
|
f49d07fdc5
|
adding event meachinsm for game items that change and sound support.
|
2016-10-02 23:49:40 +02:00 |
|
Andreas Ortmann
|
9ce106c179
|
added test script to lauch rockets, nicer explosions.
|
2016-10-02 21:06:02 +02:00 |
|
Andreas Ortmann
|
4712926be2
|
nicer particles, adding code so that particles don't penetrate through planets. added not-yet compeleted intersection code.
|
2016-10-02 20:10:43 +02:00 |
|
Andreas Ortmann
|
57e6e56217
|
making code for particle batch modular.
|
2016-10-02 17:22:47 +02:00 |
|
Andreas Ortmann
|
a81b549126
|
Merge branch 'master' of https://git.j3d1.de/KKK/KlassischeKeplerKriege
|
2016-10-02 16:19:45 +02:00 |
|
end
|
c3b84633f9
|
Merge branch 'master' of https://git.j3d1.de/KKK/KlassischeKeplerKriege
|
2016-10-02 11:26:28 +02:00 |
|
end
|
415465df71
|
+ added glclasses for texture, fbo & rbo
|
2016-10-02 11:25:53 +02:00 |
|
Andreas Ortmann
|
4353609580
|
improving aspect ratio and window resize/scaling. done for game objects.
|
2016-10-02 11:00:03 +02:00 |
|
Andreas Ortmann
|
1562dbe8a7
|
adding another rocket model.
|
2016-10-02 03:10:47 +02:00 |
|
Andreas Ortmann
|
0b71aad1f7
|
planet distribution is nice now and one sun is always placed with bigger radius and space nearby.
|
2016-09-30 23:15:51 +02:00 |
|
Andreas Ortmann
|
f2bdadd49f
|
one planet is always the sun and rendering the sun dynamically now.
|
2016-09-30 22:47:28 +02:00 |
|
Andreas Ortmann
|
e1102e3231
|
more fine tuning and removed test code.
|
2016-09-30 22:30:50 +02:00 |
|
Andreas Ortmann
|
03998dc74a
|
fine tuned explosion parameters.
|
2016-09-30 22:25:37 +02:00 |
|
Andreas Ortmann
|
c950d6a54d
|
particles are even nicer now.
|
2016-09-30 22:04:14 +02:00 |
|
Andreas Ortmann
|
3a30a20043
|
maxAge of particle is now halfAge and it lives for 5*halfAge time.
|
2016-09-30 21:48:15 +02:00 |
|
Andreas Ortmann
|
a6b9078c21
|
very nice particles with heat in the center of the explosion and moving in 3d space.
|
2016-09-30 21:24:06 +02:00 |
|
Andreas Ortmann
|
067cfb6203
|
finally fixed the particle system.
|
2016-09-30 20:19:10 +02:00 |
|
