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

280 Commits

Author SHA1 Message Date
Stefan Dresselhaus
dba5c9d809 removed debug-print 2014-05-12 11:30:29 +02:00
Stefan Dresselhaus
ffc0281ab4 frame-limiter now works correctly, scaling up/down should be smoother 2014-05-11 21:12:53 +02:00
Stefan Dresselhaus
d1adff31d5 removed some print-foo 2014-05-11 12:38:39 +02:00
Stefan Dresselhaus
a492b0aa93 Merge branch 'tessallation' 2014-05-10 20:23:06 +02:00
Stefan Dresselhaus
a57cada945 changed SDL to qualified import 2014-05-10 20:22:49 +02:00
Stefan Dresselhaus
e4fec7c3de forgot change, fixed compiling 2014-05-10 17:35:56 +02:00
Stefan Dresselhaus
5e72dbedd0 Merge branch 'tessallation' 2014-05-10 17:35:42 +02:00
Stefan Dresselhaus
bd7870a76e forgot change 2014-05-10 17:33:33 +02:00
Stefan Dresselhaus
502e3efdf3 Merge branch 'iqm' 2014-05-10 11:34:18 +02:00
Stefan Dresselhaus
6dcdb2eda2 Merge branch 'ui' 2014-05-10 11:19:31 +02:00
tpajenka
5f29ce7610 mouse events use local widget coordinates 2014-05-09 00:17:31 +02:00
tpajenka
75edc11a1e fixed some HLint messages 2014-05-08 23:38:47 +02:00
tpajenka
992c8fd041 purpose dependent widget states and widget actions are now stored inside HashMaps 2014-05-08 23:36:53 +02:00
Jonas Betzendahl
6fe3e3305a Merge branch 'Mapping' 2014-05-08 15:19:33 +02:00
Stefan Dresselhaus
adb2c5d373 noise entfernt 2014-05-07 10:28:44 +02:00
Stefan Dresselhaus
a91aad5daa better noise-function 2014-05-07 10:12:18 +02:00
Stefan Dresselhaus
7dd79f095c Merge branch 'iqm' into tessallation 
Conflicts:
	src/Render/Render.hs
	src/Types.hs
 2014-05-07 09:58:43 +02:00
Stefan Dresselhaus
376375008c tessellation-factor is now adaptive 
- tessellation gets reduced in distance
- tess-factor is now adaptive
 2014-05-07 09:51:35 +02:00
Stefan Dresselhaus
f7cc34b3a0 first try at adaptive performance 2014-05-05 08:11:33 +02:00
tpajenka
e292633ce4 widget coordinates are now local (offset based on parent component) 2014-05-03 22:40:49 +02:00
tpajenka
ad0e569537 renamed modules after restructuring UI data 2014-05-03 15:22:20 +02:00
tpajenka
ca51c23650 restructured GUI widgets' data representation from class type/instance-based 
to function-based
advantage: single constructor for any widget type, no branching necessary
 2014-05-03 15:21:58 +02:00
Stefan Dresselhaus
91fbbb7350 started to render iqm - nothing visible now. 2014-05-03 15:17:51 +02:00
Stefan Dresselhaus
1f6551cf08 WIP DOES NOT WORK 2014-05-02 16:15:58 +02:00
tpajenka
5be37f6453 moved user event handling into UI/Callbacks.hs 2014-05-01 20:31:15 +02:00
tpajenka
a3fe5a1d8b compiler warning and HLint remarks 2014-05-01 19:25:04 +02:00
Jonas Betzendahl
683b72a413 Refactoring & more cosmetics 2014-04-29 01:05:05 +02:00
Jonas Betzendahl
6c4e63f085 cosmetics 2014-04-29 00:18:38 +02:00
Jonas Betzendahl
853c11b4df Merge branch 'testing' into Mapping 2014-04-28 23:36:41 +02:00
Jonas Betzendahl
49518e3006 Merge branch 'testing' into Mapping 2014-04-28 23:35:14 +02:00
Jonas Betzendahl
07dac9aad1 Added first test suite for Mapping 2014-04-28 16:34:13 +02:00
Jonas Betzendahl
777c868de0 Fixed shadowing in aplAll 2014-04-28 10:37:31 +02:00
Jonas Betzendahl
f5f1f760cd Added first test suite with first test (questionable .cabal though) 2014-04-27 23:49:15 +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
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