|
|
ffc0281ab4
|
frame-limiter now works correctly, scaling up/down should be smoother
|
2014-05-11 21:12:53 +02:00 |
|
|
|
d1adff31d5
|
removed some print-foo
|
2014-05-11 12:38:39 +02:00 |
|
|
|
91e6435c9a
|
Merge branch 'tessallation'
|
2014-05-11 10:53:45 +02:00 |
|
|
|
8dea8d1ed9
|
refined shaders
- grid is now visible
- grid-points are different colored
- tesselated triangles wont get "gridded".
|
2014-05-11 10:52:45 +02:00 |
|
|
|
a492b0aa93
|
Merge branch 'tessallation'
|
2014-05-10 20:23:06 +02:00 |
|
|
|
a57cada945
|
changed SDL to qualified import
|
2014-05-10 20:22:49 +02:00 |
|
|
|
ddd7013db4
|
Merge branch 'tessallation'
|
2014-05-10 17:36:13 +02:00 |
|
|
|
e4fec7c3de
|
forgot change, fixed compiling
|
2014-05-10 17:35:56 +02:00 |
|
|
|
5e72dbedd0
|
Merge branch 'tessallation'
|
2014-05-10 17:35:42 +02:00 |
|
|
|
bd7870a76e
|
forgot change
|
2014-05-10 17:33:33 +02:00 |
|
|
|
502e3efdf3
|
Merge branch 'iqm'
|
2014-05-10 11:34:18 +02:00 |
|
|
|
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 |
|
|
|
adb2c5d373
|
noise entfernt
|
2014-05-07 10:28:44 +02:00 |
|
|
|
a91aad5daa
|
better noise-function
|
2014-05-07 10:12:18 +02:00 |
|
|
|
7dd79f095c
|
Merge branch 'iqm' into tessallation
Conflicts:
src/Render/Render.hs
src/Types.hs
|
2014-05-07 09:58:43 +02:00 |
|
|
|
376375008c
|
tessellation-factor is now adaptive
- tessellation gets reduced in distance
- tess-factor is now adaptive
|
2014-05-07 09:51:35 +02:00 |
|
|
|
ea09cd1a97
|
Merge remote-tracking branch 'origin/ui'
|
2014-05-06 11:31:12 +02:00 |
|
|
|
c37a49a948
|
added missing hsSDL2-stuff to dependencies.
|
2014-05-05 08:19:07 +02:00 |
|
|
|
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
|
aba45d5ca7
|
Merge branch 'master' into ui
|
2014-05-03 15:28:25 +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 |
|
|
|
91fbbb7350
|
started to render iqm - nothing visible now.
|
2014-05-03 15:17:51 +02:00 |
|
|
|
8147aa8200
|
Merge branch 'master' into tessallation
|
2014-05-03 14:34:46 +02:00 |
|
Jonas Betzendahl
|
0af0865b93
|
Merge branch 'master' into Mapping
|
2014-05-03 11:03:28 +02:00 |
|
|
|
2150e8d7af
|
reworked compiling. Now ships with build.sh
|
2014-05-02 18:00:33 +02:00 |
|
|
|
23eb808fa6
|
changed getDeps.sh for Ubuntu 14.04
|
2014-05-02 16:51:27 +02:00 |
|
|
|
1f6551cf08
|
WIP DOES NOT WORK
|
2014-05-02 16:15:58 +02:00 |
|
tpajenka
|
f35f3895f5
|
Merge branch 'master' into ui
|
2014-05-01 20:31: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 |
|
Jonas Betzendahl
|
b3c25a1326
|
Fixed Pioneers.cabal (hopefully)
|
2014-04-27 22:29:20 +02:00 |
|
|
|
c4b5e69fcf
|
added dependencies forgotten in readme
|
2014-04-26 21:33:28 +02:00 |
|
|
|
3829cde59c
|
readme .. hopefully the last time
|
2014-04-26 20:48:56 +02:00 |
|
|
|
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 |
|
