scrawl
3ea7d58ca8
Advance skill on successfull spell cast
2013-11-09 10:34:46 +01:00
scrawl
976344f0a3
Handle CastOnce enchantments
2013-11-09 08:07:40 +01:00
scrawl
1051611ffa
Added spell failure sound
2013-11-09 07:59:17 +01:00
scrawl
cbe96a2170
Refactor ActiveSpells to track range type. Added basic self range magic.
2013-11-09 07:51:46 +01:00
Marc Zinnschlag
3d8da2b9e0
proper sorting for newly created records and some case smashing fixes
2013-11-08 12:16:41 +01:00
Marc Zinnschlag
a06aa881cb
make sure case handling in info IDs is consistent
2013-11-08 12:03:03 +01:00
Marc Zinnschlag
982024a328
Topic range access in InfoCollection
2013-11-08 11:52:30 +01:00
Marc Zinnschlag
0745a86039
added InfoCreator
2013-11-08 11:51:59 +01:00
Bret Curtis
36efe9605f
necessary dpkg rules to get opencs building and packaged on dpkg systems
2013-11-07 23:05:45 +01:00
Jordan Ayers
3fbf918751
Chargen Review Dialog: Init fix.
...
Load the starting Health/Magicka/Fatigue from the player stats when
creating the Review Dialog, and remove the extra copy of these stats.
In some cases, the old stat values were never updated from 0/0.
2013-11-06 23:19:53 -06:00
Jordan Ayers
d48cc27a89
Chargen fix: Back sequence control.
...
Related to bug #894 .
Eliminate double windows when using 'Back' from the review screen.
Force consistent back behavior (handling was changing after
a individual change button had been used).
2013-11-06 23:19:53 -06:00
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
c545b3682a
compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique)
2013-11-05 12:57:55 +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
graffy76
6d439d032f
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
2013-11-03 21:38:10 -06:00
graffy76
ed913936f8
Eliminated game & addon keys from profile configuration
2013-11-03 21:36:41 -06:00
graffy76
dace904490
changed game/addon to content for writing to openmw.cfg from launcher
2013-11-03 16:45:18 -06:00
Marc Zinnschlag
3ac58b387b
fixed wording of an error message
2013-11-03 22:08:38 +01:00
graffy76
1d4b5a2425
Fix broken launcher content file display / selection scheme
...
Disable selection of content files with missing dependencies (grayed
out)
2013-11-03 14:02:41 -06:00
graffy76
12c06a5615
Fixed broken dependency check
2013-11-03 06:21:28 -06:00
Marc Zinnschlag
4724df7e9b
added topic/journal column to info tables
2013-11-03 10:48:50 +01:00
graffy76
973803eb2f
Fixed pathing issues in launcher
2013-11-03 00:02:46 -05: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
graffy76
8d12e2b99d
fixed merge conflicts
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/launcher/settings/gamesettings.hpp
components/contentselector/model/contentmodel.cpp
2013-11-02 09:31:23 -05:00
graffy76
cddece4f9e
Another stab at fixing the pathing problem...
2013-11-01 21:47:26 -05:00
scrawl
e6960d915a
Add simple Ogre widget
2013-11-02 02:51:38 +01:00
Marc Zinnschlag
15b7d3263c
subclass ESM::DialInfo to keep track of parent topic
2013-11-01 17:43:45 +01:00
graffy76
0cb591e4f6
Fixed path problem with adjuster widget and local data path.
2013-10-31 18:12:13 -05:00
Marc Zinnschlag
ea0e8be0d3
disallow sorting (via column headers) in info tables
2013-10-31 13:40:14 +01:00
Marc Zinnschlag
90aa8f9db6
fixed dialogue record loading with multiple content files
2013-10-31 13:11:15 +01:00
Marc Zinnschlag
767cb54e7c
added missing columns to journal info table
2013-10-31 12:54:55 +01:00
Marc Zinnschlag
69f28ee4be
split info records between journal and topic info tables
2013-10-31 12:16:45 +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
Marc Zinnschlag
ba88c94d58
first attempt at an info record collection
2013-10-29 13:18:22 +01:00
Marc Zinnschlag
45f5a66bcc
use result of getAppendIndex instead of always appending at the end
2013-10-29 09:27:23 +01:00
Marc Zinnschlag
f5fbe7361f
Merge remote-tracking branch 'lgro/saving' into saving
2013-10-28 08:35:51 +01:00
graffy76
b51bef0d98
fixed missing adjuster widget in file dialog open view
2013-10-27 20:21:19 -05:00
Lukasz Gromanowski
d51c9b64dd
Issue #913 : Merge --master and --plugin switches
...
Launcher part of master/plugin switches merge.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 20:03:12 +01:00
Lukasz Gromanowski
489475a32f
Corrected compilation error (g++ 4.8.2) triggered by not found declaration
...
in argument-dependent lookup at the point of instantiation.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 19:57:05 +01:00
Marc Zinnschlag
c2bbbef637
Merge remote-tracking branch 'rainChu/drowning-gauge'
2013-10-27 16:10:11 +01:00
Marc Zinnschlag
9a80e11182
reimplemented add and appendBlankRecord via insertRecord
2013-10-27 14:13:10 +01:00
Marc Zinnschlag
525d6fadec
added Collection insert function for arbitrary position and reimplemented appendRecord in via this function
2013-10-27 14:00:25 +01:00
Alex "rainChu" Haddad
23eaf90846
Breath meter flashes when drowning
2013-10-27 04:05:01 -04:00
graffy76
ea7a8eb2a4
last commit
2013-10-26 23:04:39 -05:00
graffy76
5e123d3f52
Hide adjusterwidget for open files view
2013-10-26 22:57:22 -05:00
graffy76
9b483c3ae3
Fix for file path issues
2013-10-26 22:55:44 -05:00
graffy76
ba365ff49e
Fixed merge conflicts with saving branch
2013-10-25 19:23:03 -05:00
scrawl
8c9a5de26f
Fix an irritating error message
2013-10-25 23:47:53 +02:00
graffy76
9ce4a04a2d
merge from saving
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
2013-10-25 14:44:22 -05:00
graffy76
1a23cccce3
Implemented Launcher namespace
2013-10-25 11:17:26 -05:00
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
2013-10-25 08:11:24 -05:00
graffy76
2ca7f24731
Fixed filedialog new / edit content path issue
2013-10-24 17:33:28 -05:00
graffy76
b48f066f33
Reimplemented content selector for filedialog and datafilespage classes
2013-10-23 17:39:17 -05:00
graffy76
ba3589bc76
Revert "Implemented ContentSelector as a singleton "charm" modifier for"
...
This reverts commit 24b167b755
2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6
Reimplemented constentselector view class
2013-10-22 21:52:35 -05:00
Marc Zinnschlag
67bc0a0c70
additional modification to the IDValidator (restricting relaxed mode slightly more)
2013-10-22 11:32:10 +02:00
Marc Zinnschlag
dc473221e7
added ID-argument to CollectionBase::getAppendIndex (required for info record collection)
2013-10-22 11:21:12 +02:00
Marc Zinnschlag
aa61948801
relaxed rules for new IDs when ID is also a user visible text
2013-10-22 11:08:37 +02:00
Marc Zinnschlag
3146af34d6
some fixes for the merged filter branch
2013-10-21 19:28:57 +02:00
Marc Zinnschlag
fdba029566
Merge remote-tracking branch 'sirherrbatka/filters' into saving
2013-10-21 18:59:12 +02:00
Marek Kochanowicz
70602c2c36
Removed changes in the unimplemented copy ctor.
2013-10-21 18:24:16 +02:00
Marek Kochanowicz
5e1bdd605b
Corrected formatting in document.hpp
2013-10-21 18:15:26 +02:00
Marc Zinnschlag
88e09159c4
splitting off characters menu from mechanics menu (was getting too big)
2013-10-21 18:04:40 +02:00
Marc Zinnschlag
743c6ea5b1
save dialogue records
2013-10-21 16:47:32 +02: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
Marek Kochanowicz
b23df42817
Removed old comment. Changed to set resources path correctly.
2013-10-21 16:06:16 +02:00
Marc Zinnschlag
3b85d97087
handle deleted dialogue records
2013-10-21 15:38:13 +02:00
Marc Zinnschlag
dc12648a3e
add fixed dialogue records when creating a new omwgame file
2013-10-21 14:26:54 +02:00
Marc Zinnschlag
c0e5501431
disallow the deletion of non-topic, non-journal dialogue records
2013-10-21 13:58:47 +02:00
Marc Zinnschlag
0be157efea
set dialogue type for newly created dialogue records
2013-10-21 13:39:13 +02:00
Marc Zinnschlag
75c5316ad7
added dialogue type column to topics table
2013-10-20 17:26:09 +02:00
Marc Zinnschlag
adf3a41a83
added topic and journal tables
2013-10-20 17:15:32 +02:00
Marc Zinnschlag
ebf7732912
some cleanup
2013-10-20 15:48:39 +02:00
Marek Kochanowicz
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
2013-10-20 10:56:27 +02:00
Marek Kochanowicz
184456892b
Added check to load custom filters set when present.
2013-10-19 18:43:47 +02:00
Marek Kochanowicz
4e26a61db3
Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path.
2013-10-18 22:11:14 +02:00
Marek Kochanowicz
a7002e8a09
Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.
2013-10-17 18:21:41 +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
Marek Kochanowicz
3000386443
failed attempt on switch adding.
2013-10-16 13:07:26 +02: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
db7ea30483
allow float values in cell for value tests
2013-10-14 11:15:36 +02:00
Marc Zinnschlag
679754b305
corrected an error message
2013-10-14 11:06:59 +02:00
Marc Zinnschlag
9b0766b678
minor fix in ValueNode::toString
2013-10-14 10:58:11 +02:00
Marc Zinnschlag
4905f1c8ab
make testing empty cells against an empty string yield true
2013-10-13 21:54:36 +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
b8ae195a46
Merge branch 'scene'
2013-10-13 15:42:27 +02:00
Marc Zinnschlag
4624bed899
changed handling of scene toolbar button icons
2013-10-13 15:41:48 +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
Marc Zinnschlag
608d154ad7
Merge remote-tracking branch 'rainChu/master'
2013-10-12 20:31:33 +02:00
Alex "rainChu" Haddad
cfc3093320
Reverted conditional compiling
2013-10-12 10:46:44 -04:00
Marc Zinnschlag
b5d620a8dc
fixed string filter on enum column when column is empty
2013-10-12 16:35:59 +02:00
Marc Zinnschlag
a29b8667ef
fixed string filter on boolean columns when testing against the value false
2013-10-12 16:29:36 +02:00
Marc Zinnschlag
a77044cda4
fixed column numbering
2013-10-12 16:15:47 +02:00
Marc Zinnschlag
2606feec3a
Merge remote-tracking branch 'lgro/cfg_without_data_path'
2013-10-12 13:52:38 +02:00
Marc Zinnschlag
3c580fbc59
Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'
2013-10-12 13:40:29 +02:00
Marc Zinnschlag
458c752425
Merge remote-tracking branch 'mckibbenta/tgm'
2013-10-12 13:38:10 +02:00
Marc Zinnschlag
87cd5d4267
Merge remote-tracking branch 'potatoesmaster/DisableLevitation'
2013-10-12 13:31:06 +02:00
Marc Zinnschlag
9c4d88cd76
Merge remote-tracking branch 'potatoesmaster/acrobatics'
2013-10-12 13:20:12 +02:00
Marc Zinnschlag
c8dc6a70b7
Merge remote-tracking branch 'greye/master'
2013-10-12 13:14:47 +02:00
Marc Zinnschlag
c8695db66f
Merge remote-tracking branch 'wheybags/unshield_fixes'
2013-10-12 13:03:38 +02:00
Lukasz Gromanowski
5ce1f50fab
Cleanup in MWGui::WindowManager constructor initialzation list.
...
Corrected order of initialization list, and added missing
member field initializations - without this openmw crashes when
installer is interrupted and there are no valid data path
in openmw.cfg, as reported by BrotherBrick in:
https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-10 23:06:37 +02:00
Jordan Ayers
6e4978643c
Magic Effect descriptions: support feet / level modes.
...
Show proper suffixes for all magnitudes.
Drop extra 'times' symbol in 'timesInt format (not consistent
with other magnitude displays).
2013-10-09 00:08:11 -05:00
Jordan Ayers
6ab7002908
MagicEffect: Put magnitude type into ESM::MagicEffect helper.
2013-10-07 22:28:55 -05:00
Jordan Ayers
065f435225
Format fix: remove extra spaces from ranged TimesINT formatting.
2013-10-07 20:02:20 -05:00
graffy76
17950210fa
Merge branch 'master' into esxSelector
2013-10-07 06:52:20 -05:00
Marc Zinnschlag
74cee66273
consolidated magic numbers for button size
2013-10-07 11:24:53 +02:00
Marc Zinnschlag
4d6c3cdf09
removed more garbage
2013-10-07 08:55:04 +02:00
graffy76
4c72a9ffdf
Fixed non-loading files
2013-10-06 22:10:38 -05:00
graffy76
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
2013-10-06 21:13:47 -05:00
Jordan Ayers
6303e56ce4
Magic Effect Display cleanup: Don't put spaces in percentages.
2013-10-06 20:35:59 -05:00
Jordan Ayers
707f45aa8e
Magic Effect Display improvement.
...
Related to Bug #794 .
Always show one decimal point precision for Fortify Max. Magicka effect.
2013-10-06 20:26:39 -05:00
Jordan Ayers
6983a55a16
Magic effect display improvement.
...
Related to Bug #794 .
Show the "x INT" notation for Fortify Max. Magicka.
Show "%" notation for weakness / resistance effects.
2013-10-06 19:32:40 -05:00
Emanuel Guevel
2abe5c1c9a
Acrobatics: do not apply fall damages when slowfalling spell effect is active
...
If spell effect ends up in mid-air, calculate fall height from then.
2013-10-02 23:34:25 +02:00
Emanuel Guevel
4265dddc40
Add MWWorld::isSlowFalling(Ptr)
2013-10-02 23:34:25 +02:00
Emanuel Guevel
6e09a5fb4a
Acrobatics: reinit fall height at current height rather than zero
...
To prevent problems.
2013-10-02 23:34:25 +02:00
Emanuel Guevel
2b992ef3b5
Acrobatics: use calculated fatigueTerm
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4c151e59a2
Acrobatics: do not touch modified stats
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4860514865
Acrobatics: cosmetic changes
2013-10-02 23:34:24 +02:00
mckibbenta
857deb3723
Merge branch 'master' into tgm
2013-10-02 13:54:03 -04:00
mckibbenta
073f64c8bb
stop weapon condition degredation (for the player) with tgm on
2013-10-02 13:46:33 -04:00
Emanuel Guevel
496f786c2a
Implement Disable/EnableLevitation script functions
...
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
2013-10-02 15:33:20 +02:00
Alex "rainChu" Haddad
f1b4c2e400
Fixed first person offset to use world transform
...
It slipped my mind that some necks might not be perfectly vertical.
2013-10-02 07:03:39 -04:00
Alex "rainChu" Haddad
ed0c31b485
Refactored, moved logic out of NpcAnimation
...
The logic is now handled by RenderingManager, and Camera sets its
animation's first person offset height. Due to how NpcAnimation seems to
be updated, it has to be the one to actually set its own nodes, in the
case of the hands. Otherwise, the hands would not move without a messier
hack.
2013-10-02 05:16:52 -04:00
graffy76
a5a0f61533
Fixed missing profiles combobox
2013-10-01 22:36:49 -05:00
graffy76
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
2013-10-01 21:29:45 -05:00
Emanuel Guevel
b8c60dabb3
Reintroduce Acrobatics changes made by Glorf
...
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
2013-10-01 23:35:34 +02:00
