Jordan Ayers
e94da61ff0
Chargen cleanup.
...
Move common gui state pop out of if checks.
Move health update before gui state push (used as input for some windows).
2013-11-06 23:19:53 -06:00
Marc Zinnschlag
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
2013-11-06 10:21:41 +01:00
Marc Zinnschlag
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
2013-11-06 10:21:25 +01:00
scrawl
9e2b1942fc
Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.
2013-11-05 22:50:53 +01:00
scrawl
bf5529819d
Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.
2013-11-05 19:50:24 +01:00
Marc Zinnschlag
2d4a6c0edf
cleaned up ID handling in INFO record (including a ESMTool bug fix)
2013-11-05 12:56:20 +01:00
Marc Zinnschlag
9d7695ea88
added missing columns to topic info table
2013-11-05 11:41:48 +01:00
Marc Zinnschlag
245d7b0ae4
Merge remote-tracking branch 'scrawl/windowclosefix'
2013-11-05 08:19:53 +01:00
Marc Zinnschlag
f4e6f31658
Merge remote-tracking branch 'scrawl/openmw-27'
2013-11-05 08:19:29 +01:00
scrawl
c3d9bc31bb
Fix exiting OpenMW via the window close button (regression)
2013-11-05 03:02:28 +01:00
scrawl
3a827d9c12
Deleted Obliviontt.zip
2013-11-05 00:32:06 +01:00
Alexander "Ace" Olofsson
468e8e3635
Missing iostream include
2013-11-04 10:36:22 +01:00
Marc Zinnschlag
dec1483fa4
Merge branch 'saving' into openmw-27
2013-11-04 08:57:32 +01:00
Lukasz Gromanowski
afce10cf37
Fixes #597 : Assertion `dialogue->mId == id' failed in esmstore.cpp
...
It seems that assertion was unnecessary, after removing it, dialogs
related to moon-and-star in "Path of the Incarnate" quest were
correctly loaded (dumped DialInfo records were correct).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-11-02 16:39:05 +01:00
gus
683b8d77dd
build fix (thanks travis)
2013-10-31 11:02:26 +01:00
gus
d587f3c946
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/docs/vmformat.txt
2013-10-31 09:51:17 +01:00
gus
02ded18fc5
Linux backslash fix
2013-10-31 09:43:12 +01:00
gus
2a927f65d3
perfomances optimisations (pathfinding is computed less often, max 4 times per sec)
2013-10-30 20:52:23 +01:00
gus
650a112e2e
better timer
2013-10-30 20:42:50 +01:00
scrawl
636d399c7f
Refactored Ogre initialisation into a component
2013-10-30 14:04:33 +01:00
scrawl
4f35fd8184
Removed a workaround from Renderer, some cleanup
2013-10-30 13:05:28 +01:00
gus
a6e7c6c104
disable AI combat for creatures
2013-10-28 23:04:46 +01:00
gus
5b20cce849
CMake fix
2013-10-28 18:36:09 +01:00
gus
0e86209224
linux fix :p
2013-10-28 18:33:10 +01:00
gus
b7a9243173
fighting should stop when the target is dead
2013-10-28 18:22:36 +01:00
gus
12d8b4e0f8
bugfix
2013-10-28 18:13:07 +01:00
gus
2d84f7d33d
NPC run
2013-10-28 18:10:00 +01:00
gus
d7584f9df7
getLineOfSight, no script instruction yet
2013-10-28 18:01:40 +01:00
gus
2515a1239e
improved combat conditions
2013-10-27 14:22:51 +01:00
gus
968968502e
NPC always face you when fighting
2013-10-27 14:03:58 +01:00
gus
a0edb55f60
only NPC with fight over 80 will attack you now
2013-10-27 13:50:29 +01:00
gus
882b136b35
bugfix of bugfix ^^
2013-10-27 13:21:16 +01:00
Alex "rainChu" Haddad
23eaf90846
Breath meter flashes when drowning
2013-10-27 04:05:01 -04:00
Marc Zinnschlag
c995533e07
Merge branch 'dialogue' into saving
...
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
2013-10-21 16:45:43 +02:00
scrawl
3a3f2a37c8
Add cut, copy & paste of text
2013-10-17 12:47:49 +02:00
Marc Zinnschlag
8c139783b7
silenced a warning
2013-10-16 21:33:11 +02:00
Marc Zinnschlag
19bd0f90b9
Merge remote-tracking branch 'rainChu/torches'
2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad
65818155d8
Fixed punctuation consistency
2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad
e11da5c0a3
Added a constructor to Light CustomData
2013-10-16 15:13:36 -04:00
Alex "rainChu" Haddad
2643214ca6
Lights extinguish underwater
2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad
30ee3c5cf6
Equipped torches and lights run out of fuel
2013-10-15 21:50:14 -04:00
Emanuel Guevel
ba4b8a37e2
Remember pressed message box button longer
...
Remember which button was pressed until a new interactive message box is
displayed or until the pressed button number is read.
Before that, it was not possible to get the pressed button after the
message box was hidden/destroyed.
2013-10-14 12:55:06 +02:00
Marc Zinnschlag
ce8694c84e
Merge remote-tracking branch 'scrawl/master'
2013-10-13 18:55:49 +02:00
scrawl
683ad40e21
No need for this ifdef since there is a default argument.
2013-10-13 18:28:22 +02:00
scrawl
fa264935ff
We can apply vsync at runtime now that the Ogre bug is fixed.
2013-10-13 17:56:26 +02:00
scrawl
f504ab42fe
Turn off vsync while in the loading screen
2013-10-13 17:52:14 +02:00
Marc Zinnschlag
fc5afe430b
Merge remote-tracking branch 'potatoesmaster/fatigue-restoration'
2013-10-13 14:40:48 +02:00
Emanuel Guevel
dcfff79460
Regenerate fatigue over time
2013-10-13 00:40:27 +02:00
Marc Zinnschlag
708cde2688
Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection'
2013-10-12 23:18:19 +02:00
Jordan Ayers
141382b8c0
COC Command: Exterior cell selection fix.
...
Return the northernmost cell of the easternmost matching column for Ext. cells.
2013-10-12 14:48:37 -05:00
