ef549eac4d
fixed haddock for UI
2014-05-18 00:14:19 +02:00
aa6a5c060f
added some helper-functions for handling gamestate
2014-05-17 23:19:34 +02:00
481a386e0e
Merge branch 'master' into iqm
...
Conflicts:
src/Render/Types.hs
2014-05-17 12:59:35 +02:00
35364b50aa
Merge branch 'STM'
2014-05-17 12:58:23 +02:00
230e31bf63
changed TMVar to TVar
...
- compiles & runs again
2014-05-17 12:57:49 +02:00
0d65a485d5
changed constant in Map.Map
2014-05-17 11:40:23 +02:00
27d7873595
reworked Types to support STM
...
- deadlocks somewhere...
2014-05-16 22:05:27 +02:00
2944d36703
changed camera-height
2014-05-16 19:06:05 +02:00
Jonas Betzendahl
ffa45515c3
attempting to compensate once more
2014-05-16 18:59:26 +02:00
Jonas Betzendahl
c624121e23
Clamped reference points
2014-05-16 18:48:46 +02:00
Jonas Betzendahl
cd4250336b
moar reference points
2014-05-16 17:56:03 +02:00
Jonas Betzendahl
a71ce917ec
fixed floor/ceiling crap
2014-05-16 17:43:31 +02:00
Jonas Betzendahl
5b2537188f
(\_/)
...
=(^.^)=
(")_(") bunny approves this commit!
(rewrote the whole damn camera-height-function.
Should be better now.)
2014-05-16 17:26:40 +02:00
Jonas Betzendahl
15d55e1577
compensating for stripe depth
2014-05-16 15:58:07 +02:00
Jonas Betzendahl
1c1aedda30
Grass is back, bettered mountains
2014-05-16 11:39:29 +02:00
Jonas Betzendahl
f2fbf101ef
Camera function not NaNing / breaking anymore / merge tessalation
2014-05-16 11:30:15 +02:00
da3a334121
iqm still does not render, starts again.
2014-05-16 09:10:09 +02:00
a6efea80cf
Merge branch 'tessallation' into iqm
2014-05-16 08:04:48 +02:00
4285cefa31
Merge branch 'ui' into tessallation
2014-05-16 07:57:03 +02:00
tpajenka
696269c1b5
non-ASCI characters on output (e.g. in compiler messages) may break certain shells preventing compiling
2014-05-16 00:39:29 +02:00
tpajenka
271497be81
using (and corrected) refined button handler invocation
...
TODO: "old" camera handler interferes with left mouse clicks/drags
2014-05-16 00:36:33 +02:00
ee5eb95a2e
builds, but does not work.
...
pattern-match-failure.
2014-05-15 21:57:15 +02:00
tpajenka
c17852d8e1
Merge branch 'master' into ui
2014-05-15 21:47:15 +02:00
tpajenka
51c48e62db
revising preliminary inflexible button handling callback
2014-05-15 21:43:26 +02:00
e37832371c
WIP, does not compile.
2014-05-15 21:18:28 +02:00
a3f0043591
WIP, does not compile.
2014-05-15 21:16:43 +02:00
5b9378c317
Merge branch 'ui' into tessallation
2014-05-15 15:19:02 +02:00
d83c87db1d
cam now moves with height.
...
- cam still has NaN-Issues
2014-05-15 15:10:10 +02:00
b7be183c25
Merge branch 'Mapping' into tessallation
2014-05-15 13:41:19 +02:00
cc3efb9ec5
merged
2014-05-15 13:40:47 +02:00
Jonas Betzendahl
8e2d46c7ef
Fixed the hell out of that snow!
2014-05-15 12:06:18 +02:00
Jonas Betzendahl
eb3ee975e8
Restructured Node constructors. Ripples are getting worse! (╯°□°）╯︵ ┻━┻
2014-05-15 12:01:30 +02:00
Jonas Betzendahl
67428146ca
added height function
2014-05-15 10:44:54 +02:00
87946cb501
modified camara-height-limit to reflect later game better
2014-05-14 20:13:40 +02:00
db0631eb4b
forgot file
2014-05-14 20:04:06 +02:00
tpajenka
45fe3f8493
revising preliminary inflexible button handling callback
2014-05-14 13:19:00 +02:00
b5a4d03f8c
array-objects get initialized
...
- initialized array-objects
- still need to be rendered and collected to a VertexBufferObject
refs #482 @2h
2014-05-13 15:04:20 +02:00
4d31866256
Merge branch 'tessallation' into iqm
2014-05-13 14:11:25 +02:00
1bfec031e2
fixed import
2014-05-13 14:11:02 +02:00
527d620da6
Merge branch 'Mapping' into tessallation
2014-05-13 13:04:26 +02:00
f598d72e9a
changed num mountains and height
2014-05-13 13:03:28 +02:00
ddd55ef004
Merge remote-tracking branch 'origin/Mapping' into tessallation
2014-05-13 12:53:09 +02:00
13fbb9b816
minor fixture
2014-05-13 12:52:00 +02:00
dd12f7b136
seperated shaders
...
- shadowmap now uses own shader
- not used only defined
- changed a bit in tyes. needs refinement
- new indices need to be read out and used.
refs #495 @3h
2014-05-13 11:25:06 +02:00
8bd8db922e
added shadow-map
...
- added shadow-map
- compiles and smap gets initialized/generated
- generation ist stil incorrect (cam, light-dir, ...)
2014-05-13 10:40:35 +02:00
dba5c9d809
removed debug-print
2014-05-12 11:30:29 +02:00
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
