Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
197 Commits 3 Branches 0 Tags
8147aa8200e1a822b27518c6e4eda644442e1e42
Commit Graph

197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Dresselhaus
8147aa8200 Merge branch 'master' into tessallation 2014-05-03 14:34:46 +02:00
Stefan Dresselhaus
2150e8d7af reworked compiling. Now ships with build.sh 2014-05-02 18:00:33 +02:00
Stefan Dresselhaus
23eb808fa6 changed getDeps.sh for Ubuntu 14.04 2014-05-02 16:51:27 +02:00
Stefan Dresselhaus
1f6551cf08 WIP DOES NOT WORK 2014-05-02 16:15:58 +02:00
Jonas Betzendahl
b3c25a1326 Fixed Pioneers.cabal (hopefully) 2014-04-27 22:29:20 +02:00
Stefan Dresselhaus
c4b5e69fcf added dependencies forgotten in readme 2014-04-26 21:33:28 +02:00
Stefan Dresselhaus
3829cde59c readme .. hopefully the last time 2014-04-26 20:48:56 +02:00
Stefan Dresselhaus
8db4004a8f readmeeeee 2014-04-26 20:47:36 +02:00
tpajenka
106f50c08d Merge branch 'master' into ui 
Conflicts:
	src/Types.hs
 2014-04-26 20:02:01 +02:00
tpajenka
d5eb4f93a3 removed unnecessary language extension 2014-04-26 19:58:20 +02:00
tpajenka
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.
 2014-04-26 19:16:53 +02:00
Stefan Dresselhaus
bd582ac84b even more readme.. 2014-04-26 17:44:41 +02:00
Stefan Dresselhaus
93018173f6 readme 2014-04-26 17:42:35 +02:00
Stefan Dresselhaus
8a3597f754 moooaaar Readme 2014-04-26 17:40:08 +02:00
Stefan Dresselhaus
160c6e3ae8 rewrote readme, enhanced .gitignore 2014-04-26 17:33:17 +02:00
Stefan Dresselhaus
5898df3682 Merge branch 'iqm' into tessallation 2014-04-26 17:16:47 +02:00
Stefan Dresselhaus
5223c34da2 100% Haddock 2014-04-26 17:12:19 +02:00
Stefan Dresselhaus
2e22e77d75 memory gets allocated and written. 
No garantuee for correctness....
 2014-04-26 16:52:32 +02:00
Stefan Dresselhaus
bd701dde65 Merge branch 'tessallation' of pwning.de:/pioneers into tessallation 2014-04-26 13:56:58 +02:00
Stefan Dresselhaus
a81418bf40 iqm does not work .. :( 2014-04-26 00:15:36 +02:00
Stefan Dresselhaus
e6a56b8409 more iqm - not tested, but typechecks and builds. 2014-04-25 23:58:20 +02:00
Stefan Dresselhaus
0af848996a Merge remote-tracking branch 'origin/Mapping' into iqm 2014-04-25 21:26:54 +02:00
Stefan Dresselhaus
782c30a6d5 Merge branch 'iqm' into tessallation 
Conflicts:
	Pioneers.cabal
	src/Map/StaticMaps.hs
 2014-04-25 21:25:16 +02:00
Stefan Dresselhaus
64d542adf3 more parsing ... -.- 2014-04-25 21:21:19 +02:00
Jonas Betzendahl
60fd217233 hlint all around 2014-04-25 15:58:25 +02:00
tpajenka
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?)!!
 2014-04-24 23:42:05 +02:00
Stefan Dresselhaus
dc4fc1238b Merge remote-tracking branch 'origin/Mapping' into tessallation 2014-04-24 14:26:29 +02:00
Jonas Betzendahl
a727131f13 Forgot Combinator module 2014-04-24 14:24:20 +02:00
Stefan Dresselhaus
2ecf4fe5c4 Merge remote-tracking branch 'origin/Mapping' into tessallation 2014-04-24 14:22:27 +02:00
Stefan Dresselhaus
f76da4b5f6 moved generation of GLMapState 
GLMapState now get generated inside the renderer and takes the
map-data as argument

GLMapState got extended by (up to now) uninitialized and unused textures.
 2014-04-24 14:21:25 +02:00
Jonas Betzendahl
0a7a882f8f Now generates a different unique map each time. 2014-04-24 12:44:58 +02:00
Jonas Betzendahl
2b435b7cb2 Added first primitive groundwork for map generation combinators. This is gonna be fun! :o) 2014-04-24 02:45:55 +02:00
Jonas Betzendahl
ca831692d2 Merge remote-tracking branch 'origin/master' into Mapping 2014-04-23 14:00:17 +02:00
Jonas Betzendahl
fa9bda5e7a Added apply-by functions 2014-04-23 13:52:43 +02:00
tpajenka
a9a97f7544 started referencing ui widgets by id via hashmap, WIP, does not compile 2014-04-23 13:08:18 +02:00
tpajenka
8e59e10b86 will use HashMap to reference ui widgets 2014-04-23 12:21:32 +02:00
Jonas Betzendahl
313992efaf Merged Types with PioneerTypes 2014-04-23 12:11:45 +02:00
jbetzend
b7fef589a9 commit 2014-04-23 11:23:24 +02:00
Stefan Dresselhaus
48082c87d9 fixed shader for windows 2014-04-22 18:06:09 +02:00
Stefan Dresselhaus
7575521e4d texture on HUD is now drawn correctly 2014-04-22 16:35:17 +02:00
Stefan Dresselhaus
a1389ba524 prepared overview-texture 2014-04-22 16:25:29 +02:00
Stefan Dresselhaus
1bbf900ec4 changed map a bit 2014-04-22 11:27:07 +02:00
Stefan Dresselhaus
ae304ddc5c Blending is now much sharper and cleaner.. 2014-04-22 10:51:10 +02:00
Jonas Betzendahl
5d36bb5156 Added stripify, TestMap now looking like it should (still not pretty, though), cleanup, docs 2014-04-22 03:00:39 +02:00
Stefan Dresselhaus
8d9cc3384d forgot file 2014-04-22 01:27:01 +02:00
Stefan Dresselhaus
89c624012f Merge remote-tracking branch 'origin/Mapping' into tessallation 
Conflicts:
	src/Map/Graphics.hs
 2014-04-22 01:17:22 +02:00
Jonas Betzendahl
673c64946b Merge with master 2014-04-22 01:09:09 +02:00
Stefan Dresselhaus
45e2f3578c moved draw-method into render and cleaned up imports 2014-04-21 20:25:47 +02:00
Stefan Dresselhaus
06bd9c4214 changed camera to new model 2014-04-21 19:46:24 +02:00
Stefan Dresselhaus
e2da50b6d9 defined camera in abstract sense 2014-04-21 19:21:13 +02:00