scrawl
|
a3d99767f7
|
next & prev button mouseover
|
2012-05-04 19:11:32 +02:00 |
|
scrawl
|
c125fba9d2
|
button mouse-over image change working
|
2012-05-04 18:44:46 +02:00 |
|
scrawl
|
a4d6d1baff
|
added a utility for creating texture atlas at runtime
|
2012-05-04 18:09:45 +02:00 |
|
scrawl
|
ad5753ba91
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into gui
|
2012-05-04 07:34:38 +02:00 |
|
Marc Zinnschlag
|
1149e282b8
|
Merge remote branch 'scrawl/physicsaedra2'
|
2012-05-03 14:59:36 +02:00 |
|
Marc Zinnschlag
|
e9f1c266bf
|
Merge remote branch 'scrawl/creaturedialogue'
|
2012-05-03 09:15:56 +02:00 |
|
scrawl
|
b653f047ac
|
removed a file that wasn't supposed to be there
|
2012-05-03 09:15:56 +02:00 |
|
scrawl
|
5028a83d11
|
fix stats window layout resizing
|
2012-05-03 07:03:04 +02:00 |
|
scrawl
|
dc378fc6cf
|
allow talking with creatures
|
2012-05-03 06:07:41 +02:00 |
|
scrawl
|
9fc1138a87
|
opening, closing and taking books/scrolls works
|
2012-05-03 05:26:05 +02:00 |
|
scrawl
|
0e6b82284f
|
book & scroll windows
|
2012-05-03 03:33:33 +02:00 |
|
scrawl
|
c0e12d0e56
|
class dialog fix
|
2012-05-03 01:11:49 +02:00 |
|
scrawl
|
387792bb57
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into physicsaedra2
|
2012-05-03 00:42:24 +02:00 |
|
scrawl
|
c4b63bdb2f
|
.gitmodules
|
2012-05-02 23:27:56 +02:00 |
|
Chris Robinson
|
144d52cf49
|
Add voices to the chargen class questions
|
2012-05-01 20:30:31 -07:00 |
|
scrawl
|
dd8c66b479
|
notification when screenshot was taken
|
2012-05-01 21:54:30 +02:00 |
|
scrawl
|
e4b057be30
|
translated journal notification
|
2012-05-01 21:49:00 +02:00 |
|
scrawl
|
04ead5eb42
|
make the no-clip mode move much faster
|
2012-05-01 21:22:15 +02:00 |
|
scrawl
|
6850f3945c
|
disable those physics debug prints
|
2012-05-01 21:13:41 +02:00 |
|
scrawl
|
a13f542396
|
disable snapping underwater
|
2012-05-01 21:01:18 +02:00 |
|
scrawl
|
7f15385dc5
|
unrelated cleanup
|
2012-05-01 20:58:09 +02:00 |
|
scrawl
|
6acb777c5a
|
minimum framerate fix
|
2012-05-01 20:51:32 +02:00 |
|
Chris Robinson
|
b3caf82714
|
Avoid using vector<>::data(), which requires C++11
|
2012-05-01 10:12:45 -07:00 |
|
Chris Robinson
|
8c4f78cc05
|
Merge remote branch 'zini/master' into sound
|
2012-05-01 09:41:08 -07:00 |
|
scrawl
|
86b6184f43
|
pMove in a seperate loop with fixed timestep to prevent frame-dependent movement
|
2012-04-30 23:55:22 +02:00 |
|
scrawl
|
4655ec94f0
|
Merge branch 'master' into physicsaedra2 & fix warnings
Conflicts:
apps/openmw/mwworld/scene.cpp
|
2012-04-30 18:46:51 +02:00 |
|
Marc Zinnschlag
|
53e77d4196
|
Merge remote branch 'scrawl/tooltips' into next
|
2012-04-30 10:21:21 +02:00 |
|
scrawl
|
2f0a69160c
|
small fix
|
2012-04-30 02:10:55 +02:00 |
|
scrawl
|
22f524f8d5
|
potion effects in tooltip
|
2012-04-30 01:53:22 +02:00 |
|
scrawl
|
b82c39c8be
|
renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be
reused for potion effects
|
2012-04-30 01:08:10 +02:00 |
|
scrawl
|
f733382f74
|
tooltip now contains info about item enchantment
|
2012-04-30 00:57:41 +02:00 |
|
scrawl
|
397a978145
|
DispositionEdit tweaks
|
2012-04-29 18:57:26 +02:00 |
|
scrawl
|
eca18f3e1d
|
dialogue topic and choice sorting independent of case
|
2012-04-29 18:13:03 +02:00 |
|
scrawl
|
cca39978d4
|
changed messagebox text colors
|
2012-04-29 17:46:09 +02:00 |
|
scrawl
|
50d79a8815
|
Merge branch 'next' into tooltips
|
2012-04-29 17:30:34 +02:00 |
|
scrawl
|
af3ccd85e3
|
determine shield weight (tested with some light/medium/heavy shields)
|
2012-04-28 21:23:24 +02:00 |
|
Marc Zinnschlag
|
d1d21c8a0e
|
compile fix
|
2012-04-28 21:21:40 +02:00 |
|
scrawl
|
5d4d35a02c
|
Merge branch 'master' into graphics
|
2012-04-28 20:43:53 +02:00 |
|
scrawl
|
4ce83badc9
|
flickering lights
|
2012-04-28 20:42:53 +02:00 |
|
Chris Robinson
|
2f1fee4b83
|
Merge remote branch 'zini/next' into sound
|
2012-04-24 00:35:40 -07:00 |
|
Marc Zinnschlag
|
d5e52e46ea
|
removing even more cout spam (thanks to scrawl for finding this one)
|
2012-04-24 09:19:41 +02:00 |
|
scrawl
|
1b5bfc52a1
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
|
2012-04-24 02:02:03 +02:00 |
|
scrawl
|
e443455612
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
|
2012-04-24 00:54:35 +02:00 |
|
Marc Zinnschlag
|
f4428097f9
|
removing more cout spam
|
2012-04-23 15:37:38 +02:00 |
|
Marc Zinnschlag
|
7ac9523e0c
|
Merge branch 'master' into next
|
2012-04-23 15:32:02 +02:00 |
|
Marc Zinnschlag
|
9f1199ee7e
|
removing a using directive from a header file
|
2012-04-23 15:29:15 +02:00 |
|
Marc Zinnschlag
|
35f478071e
|
Issue #255: deleted the old environment class and using the new one instead
|
2012-04-23 15:27:03 +02:00 |
|
Marc Zinnschlag
|
7102a825c2
|
Issue 255: moved global scripts into script manager (simplifying the environment class)
|
2012-04-23 11:15:47 +02:00 |
|
Marc Zinnschlag
|
2bfd90f3f9
|
Issue #255: added new environment class (not in use yet)
|
2012-04-23 10:57:16 +02:00 |
|
scrawl
|
2c89306306
|
Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2
|
2012-04-22 00:33:37 +02:00 |
|