Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • f598d72e9a
         changed num mountains and height Stefan Dresselhaus 2014-05-13 13:03:28 +02:00
  • ddd55ef004 Merge remote-tracking branch 'origin/Mapping' into tessallation Stefan Dresselhaus 2014-05-13 12:53:09 +02:00
  • 13fbb9b816
         minor fixture Stefan Dresselhaus 2014-05-13 12:52:00 +02:00
  • dd12f7b136
         seperated shaders Stefan Dresselhaus 2014-05-13 11:25:06 +02:00
  • 8bd8db922e
         added shadow-map Stefan Dresselhaus 2014-05-13 10:40:35 +02:00
  • dba5c9d809
         removed debug-print Stefan Dresselhaus 2014-05-12 11:30:29 +02:00
  • ffc0281ab4
         frame-limiter now works correctly, scaling up/down should be smoother Stefan Dresselhaus 2014-05-11 21:12:53 +02:00
  • d1adff31d5
         removed some print-foo Stefan Dresselhaus 2014-05-11 12:38:39 +02:00
  • 91e6435c9a Merge branch 'tessallation' Stefan Dresselhaus 2014-05-11 10:53:45 +02:00
  • 8dea8d1ed9
         refined shaders Stefan Dresselhaus 2014-05-11 10:52:45 +02:00
  • a492b0aa93 Merge branch 'tessallation' Stefan Dresselhaus 2014-05-10 20:23:06 +02:00
  • a57cada945
         changed SDL to qualified import Stefan Dresselhaus 2014-05-10 20:22:49 +02:00
  • ddd7013db4 Merge branch 'tessallation' Stefan Dresselhaus 2014-05-10 17:36:13 +02:00
  • e4fec7c3de forgot change, fixed compiling Stefan Dresselhaus 2014-05-10 17:33:33 +02:00
  • 5e72dbedd0 Merge branch 'tessallation' Stefan Dresselhaus 2014-05-10 17:35:35 +02:00
  • bd7870a76e
         forgot change Stefan Dresselhaus 2014-05-10 17:33:33 +02:00
  • 502e3efdf3 Merge branch 'iqm' Stefan Dresselhaus 2014-05-10 11:34:18 +02:00
  • 6dcdb2eda2 Merge branch 'ui' Stefan Dresselhaus 2014-05-10 11:19:31 +02:00
  • 5f29ce7610 mouse events use local widget coordinates tpajenka 2014-05-09 00:17:31 +02:00
  • 75edc11a1e fixed some HLint messages tpajenka 2014-05-08 23:38:47 +02:00
  • 992c8fd041 purpose dependent widget states and widget actions are now stored inside HashMaps tpajenka 2014-05-08 23:36:53 +02:00
  • 6fe3e3305a Merge branch 'Mapping' Jonas Betzendahl 2014-05-08 15:19:33 +02:00
  • adb2c5d373
         noise entfernt Stefan Dresselhaus 2014-05-07 10:28:44 +02:00
  • a91aad5daa
         better noise-function Stefan Dresselhaus 2014-05-07 10:12:18 +02:00
  • 7dd79f095c Merge branch 'iqm' into tessallation Stefan Dresselhaus 2014-05-07 09:54:34 +02:00
  • 376375008c
         tessellation-factor is now adaptive Stefan Dresselhaus 2014-05-07 09:51:35 +02:00
  • ea09cd1a97 Merge remote-tracking branch 'origin/ui' Stefan Dresselhaus 2014-05-06 11:31:12 +02:00
  • c37a49a948
         added missing hsSDL2-stuff to dependencies. Stefan Dresselhaus 2014-05-05 08:19:07 +02:00
  • f7cc34b3a0
         first try at adaptive performance Stefan Dresselhaus 2014-05-05 08:11:33 +02:00
  • e292633ce4 widget coordinates are now local (offset based on parent component) tpajenka 2014-05-03 22:40:49 +02:00
  • aba45d5ca7 Merge branch 'master' into ui tpajenka 2014-05-03 15:28:25 +02:00
  • ad0e569537 renamed modules after restructuring UI data tpajenka 2014-05-03 14:51:24 +02:00
  • ca51c23650 restructured GUI widgets' data representation from class type/instance-based to function-based advantage: single constructor for any widget type, no branching necessary tpajenka 2014-05-02 01:28:40 +02:00
  • 91fbbb7350 started to render iqm - nothing visible now. Stefan Dresselhaus 2014-05-03 15:17:33 +02:00
  • 8147aa8200 Merge branch 'master' into tessallation Stefan Dresselhaus 2014-05-03 14:34:46 +02:00
  • 0af0865b93 Merge branch 'master' into Mapping Jonas Betzendahl 2014-05-03 11:03:28 +02:00
  • 2150e8d7af
         reworked compiling. Now ships with build.sh Stefan Dresselhaus 2014-05-02 18:00:33 +02:00
  • 23eb808fa6
         changed getDeps.sh for Ubuntu 14.04 Stefan Dresselhaus 2014-05-02 16:51:27 +02:00
  • 1f6551cf08 WIP DOES NOT WORK Stefan Dresselhaus 2014-05-02 16:15:58 +02:00
  • f35f3895f5 Merge branch 'master' into ui tpajenka 2014-05-01 20:31:58 +02:00
  • 5be37f6453 moved user event handling into UI/Callbacks.hs tpajenka 2014-05-01 20:31:15 +02:00
  • a3fe5a1d8b compiler warning and HLint remarks tpajenka 2014-05-01 19:12:01 +02:00
  • 683b72a413 Refactoring & more cosmetics Jonas Betzendahl 2014-04-29 01:05:05 +02:00
  • 6c4e63f085 cosmetics Jonas Betzendahl 2014-04-29 00:18:38 +02:00
  • 853c11b4df Merge branch 'testing' into Mapping Jonas Betzendahl 2014-04-28 23:36:41 +02:00
  • 49518e3006 Merge branch 'testing' into Mapping Jonas Betzendahl 2014-04-28 23:35:14 +02:00
  • 07dac9aad1 Added first test suite for Mapping Jonas Betzendahl 2014-04-28 16:34:13 +02:00
  • 777c868de0 Fixed shadowing in aplAll Jonas Betzendahl 2014-04-28 10:37:31 +02:00
  • f5f1f760cd Added first test suite with first test (questionable .cabal though) Jonas Betzendahl 2014-04-27 23:49:15 +02:00
  • b3c25a1326 Fixed Pioneers.cabal (hopefully) Jonas Betzendahl 2014-04-27 22:29:20 +02:00
  • c4b5e69fcf added dependencies forgotten in readme Stefan Dresselhaus 2014-04-26 21:33:28 +02:00
  • 3829cde59c readme .. hopefully the last time Stefan Dresselhaus 2014-04-26 20:48:56 +02:00
  • 8db4004a8f readmeeeee Stefan Dresselhaus 2014-04-26 20:47:36 +02:00
  • 106f50c08d Merge branch 'master' into ui tpajenka 2014-04-26 20:02:01 +02:00
  • d5eb4f93a3 removed unnecessary language extension tpajenka 2014-04-26 19:58:20 +02:00
  • 2d80c92384 finished storing ui widgets into a HashMap and referencing them by UIId. Additionally, widgets functions now use the Pioneers monad. Branch is compiling again and works. tpajenka 2014-04-26 19:16:53 +02:00
  • bd582ac84b even more readme.. Stefan Dresselhaus 2014-04-26 17:44:41 +02:00
  • 93018173f6 readme Stefan Dresselhaus 2014-04-26 17:42:35 +02:00
  • 8a3597f754 moooaaar Readme Stefan Dresselhaus 2014-04-26 17:40:08 +02:00
  • 160c6e3ae8 rewrote readme, enhanced .gitignore Stefan Dresselhaus 2014-04-26 17:33:17 +02:00
  • 5898df3682 Merge branch 'iqm' into tessallation Stefan Dresselhaus 2014-04-26 17:16:47 +02:00
  • 5223c34da2 100% Haddock Stefan Dresselhaus 2014-04-26 17:12:19 +02:00
  • 2e22e77d75 memory gets allocated and written. Stefan Dresselhaus 2014-04-26 16:52:32 +02:00
  • bd701dde65 Merge branch 'tessallation' of pwning.de:/pioneers into tessallation Stefan Dresselhaus 2014-04-26 13:56:58 +02:00
  • a81418bf40 iqm does not work .. :( Stefan Dresselhaus 2014-04-26 00:15:36 +02:00
  • e6a56b8409 more iqm - not tested, but typechecks and builds. Stefan Dresselhaus 2014-04-25 23:58:20 +02:00
  • 0af848996a Merge remote-tracking branch 'origin/Mapping' into iqm Stefan Dresselhaus 2014-04-25 21:26:54 +02:00
  • 782c30a6d5 Merge branch 'iqm' into tessallation Stefan Dresselhaus 2014-04-25 21:25:16 +02:00
  • 64d542adf3 more parsing ... -.- Stefan Dresselhaus 2014-04-25 21:21:19 +02:00
  • 60fd217233 hlint all around Jonas Betzendahl 2014-04-25 15:58:25 +02:00
  • 6879201c53 worked on storing widgets in HashMap and referencing via Id incorporated Pioneers monad into ui operations !!still WIP, does not compile (TODO: UIOperations, Callbacks, Main?, Types?)!! tpajenka 2014-04-24 23:42:05 +02:00
  • dc4fc1238b Merge remote-tracking branch 'origin/Mapping' into tessallation Stefan Dresselhaus 2014-04-24 14:26:29 +02:00
  • a727131f13 Forgot Combinator module Jonas Betzendahl 2014-04-24 14:24:20 +02:00
  • 2ecf4fe5c4 Merge remote-tracking branch 'origin/Mapping' into tessallation Stefan Dresselhaus 2014-04-24 14:22:27 +02:00
  • f76da4b5f6 moved generation of GLMapState Stefan Dresselhaus 2014-04-24 14:21:25 +02:00
  • 0a7a882f8f Now generates a different unique map each time. Jonas Betzendahl 2014-04-24 12:44:58 +02:00
  • 2b435b7cb2 Added first primitive groundwork for map generation combinators. This is gonna be fun! :o) Jonas Betzendahl 2014-04-24 02:45:55 +02:00
  • ca831692d2 Merge remote-tracking branch 'origin/master' into Mapping Jonas Betzendahl 2014-04-23 14:00:17 +02:00
  • fa9bda5e7a Added apply-by functions Jonas Betzendahl 2014-04-23 13:52:43 +02:00
  • a9a97f7544 started referencing ui widgets by id via hashmap, WIP, does not compile tpajenka 2014-04-23 13:08:18 +02:00
  • 8e59e10b86 will use HashMap to reference ui widgets tpajenka 2014-04-23 12:21:32 +02:00
  • 313992efaf Merged Types with PioneerTypes Jonas Betzendahl 2014-04-23 12:11:45 +02:00
  • b7fef589a9 commit jbetzend 2014-04-23 11:23:24 +02:00
  • 48082c87d9 fixed shader for windows Stefan Dresselhaus 2014-04-22 18:06:09 +02:00
  • 7575521e4d texture on HUD is now drawn correctly Stefan Dresselhaus 2014-04-22 16:35:17 +02:00
  • a1389ba524 prepared overview-texture Stefan Dresselhaus 2014-04-22 16:25:29 +02:00
  • 1bbf900ec4 changed map a bit Stefan Dresselhaus 2014-04-22 11:27:07 +02:00
  • ae304ddc5c Blending is now much sharper and cleaner.. Stefan Dresselhaus 2014-04-22 10:51:10 +02:00
  • 5d36bb5156 Added stripify, TestMap now looking like it should (still not pretty, though), cleanup, docs Jonas Betzendahl 2014-04-22 03:00:39 +02:00
  • 8d9cc3384d forgot file Stefan Dresselhaus 2014-04-22 01:27:01 +02:00
  • 89c624012f Merge remote-tracking branch 'origin/Mapping' into tessallation Stefan Dresselhaus 2014-04-22 01:17:22 +02:00
  • 673c64946b Merge with master Jonas Betzendahl 2014-04-22 01:09:09 +02:00
  • 45e2f3578c moved draw-method into render and cleaned up imports Stefan Dresselhaus 2014-04-21 20:25:47 +02:00
  • 06bd9c4214 changed camera to new model Stefan Dresselhaus 2014-04-21 19:46:24 +02:00
  • e2da50b6d9 defined camera in abstract sense Stefan Dresselhaus 2014-04-21 19:21:13 +02:00
  • e451281e40 Jiggled code enough to reduce compiler warnings Jonas Betzendahl 2014-04-21 19:16:24 +02:00
  • 3de372f83f added fog. Stefan Dresselhaus 2014-04-21 15:55:22 +02:00
  • 85e1fe6325 Merge remote-tracking branch 'origin/Mapping' into tessallation Stefan Dresselhaus 2014-04-21 15:11:41 +02:00
  • ebae8dd593 Added Map.Maps with Neighbourfunction jbetzend 2014-04-18 16:07:51 +02:00
  • ee8c91237c Took out annotation (Haddock complained) and improved path type jbetzend 2014-04-18 16:07:26 +02:00