tpajenka
106f50c08d
Merge branch 'master' into ui
...
Conflicts:
src/Types.hs
2014-04-26 20:02:01 +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
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
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
ca831692d2
Merge remote-tracking branch 'origin/master' into Mapping
2014-04-23 14:00:17 +02:00
Jonas Betzendahl
313992efaf
Merged Types with PioneerTypes
2014-04-23 12:11:45 +02:00
a1389ba524
prepared overview-texture
2014-04-22 16:25:29 +02:00
06bd9c4214
changed camera to new model
2014-04-21 19:46:24 +02:00
d0ce4dcf6a
fixed compiler warnings.
...
most of them .. not all are my modules.
2014-04-15 17:03:54 +02:00
5ec9db8534
changed x-lens to _x-lens and cabal-info
2014-04-07 17:32:13 +02:00
26903deb19
we can haz GUI?
...
we can.
2014-04-05 23:09:57 +02:00
189f9f84fa
Textures work now.
...
Scene gets rendered and alpha-overlayed with HUD-Texture.
fixes #472 @2h
2014-04-05 15:53:49 +02:00
39341bf0f9
removed non-working renderer again.
2014-04-04 11:18:42 +02:00
ba84ede01d
HUD-Texture renders.
...
HUD-Texture renders and the whole screen is black.
Still TODO:
- Will have to sort out alpha
- Clean up
refs #472 @5h
2014-04-04 11:15:00 +02:00
9cd0eacd31
still WIP.
2014-03-24 23:26:02 +01:00
c1e074934e
WIP-Commit. DOES NOT WORK.
2014-03-24 08:21:30 +01:00
5fc86af233
Changed OpenGL-Lvl to 3.30 with Tessellation-Ext
...
- figured out how to enable extensions
refs #471 @1h
2014-03-17 17:04:30 +01:00
jbetzend
1c1bd66d30
Removed Data.Label from code and dependencies.
2014-03-05 15:09:05 +01:00
5a70a22da6
converted to lenses
2014-03-05 14:42:26 +01:00
82e9b4d826
Merge branch 'tessallation' into lens
...
Conflicts:
Pioneers.cabal
src/Main.hs
src/Types.hs
2014-02-28 14:47:04 +01:00
517f2eb0b6
removed SDL-ttf as it breaks for now
2014-02-28 14:44:58 +01:00
d5310478c0
converted Types to Labels
...
- Types is converted to Lebles (monomorphic lenses)
- Main initializes type now
- All other stuff in Main still calls old syntax.
refs #467 @3h
2014-02-23 13:32:20 +01:00
95a7a5b9f1
forgot files -.-
2014-02-05 21:06:19 +01:00
