Marc Zinnschlag
|
9172c3ec4d
|
Issue #68: stop NPCs from instantly dropping dead
|
2012-10-23 13:54:36 +02:00 |
|
Marc Zinnschlag
|
0547f11564
|
Issue #68: Remove dead actors from actor list
|
2012-10-20 10:54:51 +02:00 |
|
Marc Zinnschlag
|
f2e25b8a47
|
Issue #68: Keep dead actors out of the actor list for the current scene
|
2012-10-20 10:49:48 +02:00 |
|
Marc Zinnschlag
|
7884a927c9
|
Issue #68: added dead flag to CreatureStats
|
2012-10-19 18:56:22 +02:00 |
|
Marc Zinnschlag
|
a8f294c9ae
|
fixed types of dynamic stats script instructions
|
2012-10-19 18:01:45 +02:00 |
|
Marc Zinnschlag
|
bdca5aff87
|
Issue #68: simplified the dynamic stats interface
|
2012-10-19 13:10:06 +02:00 |
|
Marc Zinnschlag
|
3f833af46a
|
Issue #407: Fortyfy attribute effects were ignored for the last 3 attributes
|
2012-10-19 10:07:27 +02:00 |
|
Marc Zinnschlag
|
18686614db
|
Merge remote-tracking branch 'scrawl/splashscreen_dirlisting'
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
|
2012-10-18 15:46:43 +02:00 |
|
scrawl
|
e80394c0b5
|
fix training limit
|
2012-10-17 18:48:29 +02:00 |
|
scrawl
|
125315ebe7
|
remove a cout
|
2012-10-17 18:21:24 +02:00 |
|
scrawl
|
c64eb96952
|
Merge branch 'Travel_Dialogue' into training_travel
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
|
2012-10-17 18:17:53 +02:00 |
|
scrawl
|
1a2034b4dd
|
training window
|
2012-10-17 18:03:02 +02:00 |
|
scrawl
|
6be092e268
|
substr check
|
2012-10-17 12:41:24 +02:00 |
|
scrawl
|
84a4fd56c3
|
consider all files in Splash directory
|
2012-10-17 12:39:45 +02:00 |
|
scrawl
|
6acbea822b
|
splash screen directory listing
|
2012-10-16 23:59:03 +02:00 |
|
scrawl
|
7d1e659960
|
fading, greying out destinations you cant afford, warning fix
|
2012-10-16 20:25:50 +02:00 |
|
gugus
|
9583a1b8e9
|
FadeOut/In, that's for you scrawl!
|
2012-10-16 19:59:53 +02:00 |
|
gugus
|
c9afe222be
|
traveling now takes time
|
2012-10-16 19:34:29 +02:00 |
|
Marc Zinnschlag
|
e05e683da3
|
Merge remote-tracking branch 'scrawl/spellcreation'
|
2012-10-12 17:19:30 +02:00 |
|
scrawl
|
f154031e54
|
last bits of the gui
|
2012-10-11 18:26:29 +02:00 |
|
Marc Zinnschlag
|
35d099a638
|
disabling gcc extensions
|
2012-10-09 17:10:25 +02:00 |
|
gugus
|
27a3487d78
|
right prices
|
2012-10-08 15:51:36 +02:00 |
|
gugus
|
5a611b66d7
|
traveling.
|
2012-10-08 11:14:22 +02:00 |
|
gugus
|
85d9357e3a
|
Travel GUI
|
2012-10-06 17:52:46 +02:00 |
|
scrawl
|
025e820703
|
abstracted code and use it in enchanting window as well
|
2012-10-03 15:36:10 +02:00 |
|
scrawl
|
1c0dd3ccc5
|
some editing code
|
2012-10-03 15:06:54 +02:00 |
|
scrawl
|
21493c2dbd
|
added magic effect flags from Research wiki page
|
2012-10-01 23:33:07 +02:00 |
|
scrawl
|
63fd8172d8
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation
|
2012-10-01 23:09:03 +02:00 |
|
scrawl
|
fa358ab196
|
change the inventory preview to "inventoryhandtohand" animation pose
|
2012-10-01 18:04:21 +02:00 |
|
scrawl
|
ff2c2d2b96
|
Merge branch 'master' into spellcreation
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
|
2012-10-01 17:54:45 +02:00 |
|
Marc Zinnschlag
|
d1c4559abe
|
fixed GMST string handling in GUI
|
2012-10-01 10:03:49 +02:00 |
|
Marc Zinnschlag
|
35d7b5e5b0
|
Merge remote-tracking branch 'greye/record_saving'
|
2012-10-01 09:50:20 +02:00 |
|
Marc Zinnschlag
|
29633bd02f
|
Merge remote-tracking branch 'greye/master'
|
2012-10-01 09:46:20 +02:00 |
|
greye
|
f907a6a86f
|
updateListener() every frame
|
2012-10-01 11:24:44 +04:00 |
|
Chris Robinson
|
6c5c9ce46e
|
Avoid console spam when a sound can't play
|
2012-09-30 17:38:55 -07:00 |
|
Chris Robinson
|
6942fa97da
|
Specify a proper up vector for the listener
|
2012-09-30 17:23:05 -07:00 |
|
Chris Robinson
|
991f942fba
|
Merge remote-tracking branch 'zini/master' into sound
Conflicts:
apps/openmw/mwsound/soundmanagerimp.cpp
apps/openmw/mwsound/soundmanagerimp.hpp
|
2012-09-30 16:57:54 -07:00 |
|
greye
|
2fa4ac177a
|
initial resolving
|
2012-10-01 00:23:49 +04:00 |
|
greye
|
721324c1db
|
rm record inheritance, rework esmtool accordingly
|
2012-09-30 23:34:53 +04:00 |
|
Marc Zinnschlag
|
20a263738a
|
Merge remote-tracking branch 'chris/animation'
|
2012-09-29 12:39:56 +02:00 |
|
Chris Robinson
|
41f80908d9
|
Simplify getting the stop time when playing all animation groups
|
2012-09-29 01:10:49 -07:00 |
|
Marc Zinnschlag
|
2ab96d0108
|
Merge remote-tracking branch 'scrawl/next'
|
2012-09-29 10:03:52 +02:00 |
|
scrawl
|
0c6ad13364
|
WakeUpPc instruction
|
2012-09-29 09:41:34 +02:00 |
|
Chris Robinson
|
cd8515396a
|
Use a multimap to store the text keys
|
2012-09-28 23:20:15 -07:00 |
|
gugus
|
4f5c4bf89a
|
Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwgui/dialogue.hpp
apps/openmw/mwgui/mode.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
|
2012-09-28 17:09:15 +02:00 |
|
gugus
|
4d496c1188
|
correction1
|
2012-09-28 17:02:27 +02:00 |
|
scrawl
|
044ab3d2b6
|
fix error in framelistener with tcg enabled
|
2012-09-28 17:02:18 +02:00 |
|
gugus
|
1971ba66f1
|
destination name is now OK for every trave services
|
2012-09-27 13:08:38 +02:00 |
|
scrawl
|
ac0c1ea986
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
Conflicts:
apps/openmw/mwgui/dialogue.cpp
|
2012-09-27 08:47:47 +02:00 |
|
scrawl
|
9b0254a158
|
small map fix
|
2012-09-26 23:34:35 +02:00 |
|