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
Alex "rainChu" Haddad
0ddb5097fc
Revert "Bug #840 , First Person Sneaking Camera Height"
...
This reverts commit 296abfd48f
2013-10-01 11:44:45 -04:00
Alex "rainChu" Haddad
296abfd48f
Bug #840 , First Person Sneaking Camera Height
...
Also, added comments to existing code in the area.
2013-10-01 10:48:34 -04:00
Alex "rainChu" Haddad
4496244b14
Tabs to spaces
...
My own code uses only tabs - I forgot to change the setting on my IDE,
sorry!
2013-10-01 05:36:13 -04:00
Alex "rainChu" Haddad
eae02ea00d
Cleaned up my hackish code for WinMain
2013-09-30 03:33:31 -04:00
Alex "rainChu" Haddad
00a776a1a8
Fixed compilation failure on my machine
...
Fixed shared records not being populated before the player record is
moved.
2013-09-30 02:54:20 -04:00
greye
4cdb57e388
workaround segfault on --new-game switch
2013-09-30 10:30:40 +04:00
Alex "rainChu" Haddad
bffbfff41c
My own fix to make it hackily compile
2013-09-30 00:32:06 -04:00
graffy76
24b167b755
Implemented ContentSelector as a singleton "charm" modifier for
...
FileDialog...
2013-09-29 12:19:07 -05:00
Tom Mason
dd0a416249
cleaned up bloodmoon_fix_ini
2013-09-29 16:59:52 +01:00
Tom Mason
fd169c2399
fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder
2013-09-29 15:49:47 +01:00
Lukasz Gromanowski
ef617d408b
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches in launcher.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-09-29 09:14:40 +02:00
Lukasz Gromanowski
9c2145eda1
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches into content in openmw
and mwiniimporter.
Extension in content files is now required.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-09-29 09:11:57 +02:00
Marc Zinnschlag
7be1f1afc2
implemented SceneToolMode as a horizontal panel with radiobutton-type buttons
2013-09-28 13:10:42 +02:00
Marc Zinnschlag
0c5f07a65a
added SceneToolMode class
2013-09-28 11:27:24 +02:00
Marc Zinnschlag
84cadc10f4
added scene toolbar buttons (still not doing anything)
2013-09-28 11:06:56 +02:00
Marc Zinnschlag
9ea092927f
added basic scene subview (no functionality yet)
2013-09-28 09:25:54 +02:00
Marc Zinnschlag
6143ec33e0
giving Documents direct access to ConfigurationManager
2013-09-27 15:24:58 +02:00
Marc Zinnschlag
e7c48cbe58
load project files
2013-09-27 15:04:30 +02:00
Marc Zinnschlag
62148b3247
moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase
2013-09-27 15:04:09 +02:00
Marc Zinnschlag
baae548106
added project scope filter saving
2013-09-27 13:56:40 +02:00
Marc Zinnschlag
6ac4dedfbe
added missing column enum
2013-09-27 13:56:23 +02:00
Marc Zinnschlag
31346dde58
fixed uninitialise scope value for filters
2013-09-27 13:55:28 +02:00
Marc Zinnschlag
6f2c418a5c
(slightly) improved error reporting during save operations
2013-09-27 13:54:51 +02:00
Marc Zinnschlag
23095ec3ec
added missing scope column to filter table
2013-09-27 13:54:21 +02:00
Marc Zinnschlag
5779f799ab
create project file when saving content file
2013-09-27 11:36:06 +02:00
Marc Zinnschlag
1363e86828
made verifier ignore deleted records
2013-09-27 10:08:09 +02:00
Marc Zinnschlag
96fd1c35bf
preserve author/descriptin meta data
2013-09-24 17:17:01 +02:00
Marc Zinnschlag
830530bd06
set record count in TES3 header
2013-09-24 17:08:24 +02:00
Marc Zinnschlag
e4fdebc85b
added saving for referenceable records
2013-09-24 13:53:19 +02:00
Marc Zinnschlag
c42e74dadf
make 4 byte record type accessable from record struct
2013-09-24 13:17:28 +02:00
graffy76
3b40192e90
Merge branch 'master' into esxSelector
2013-09-23 22:03:42 -05:00
Marek Kochanowicz
ae5e8b95ff
Solving Issue912
2013-09-23 20:12:04 +02:00
Marc Zinnschlag
0f1c4cb00e
cleanup
2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c
Switched to using proper enums as opposed to ints.
2013-09-23 08:31:36 -04:00
graffy76
d7cff6361e
Fixed filter issue (all addons for a gamefile are enabled for checking).
...
Note: Other dependencies are not yet automatically selected when an
addon is checked.
2013-09-23 06:51:49 -05:00
Berulacks
0c518fb047
Replaced tabs with spaces.
2013-09-23 07:36:50 -04:00
Berulacks
c423479f20
Fixed bug #887
2013-09-23 07:31:14 -04:00
Marc Zinnschlag
6d9ff39390
set dependencies when saving (requires further refinements)
2013-09-23 12:16:56 +02:00
Marc Zinnschlag
74d683b530
fixed save path for newly created addons
2013-09-23 11:58:11 +02:00
Marc Zinnschlag
63e0cf5154
fixed missing initialisation of adjuster widget in file dialogue
2013-09-23 11:26:29 +02:00
Marc Zinnschlag
d4b2a6b9f1
Merge remote-tracking branch 'graffy76/esxSelector' into saving
2013-09-23 10:09:43 +02:00
graffy76
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
2013-09-22 23:52:53 -05:00
Marc Zinnschlag
a6ea670255
use IdTypeDelegate in report table
2013-09-22 13:54:01 +02:00
Marc Zinnschlag
1c4a4b4f26
generalised RefIdTypeDelegate into IdTypeDelegate
2013-09-22 13:39:44 +02:00
Marc Zinnschlag
f2875e234c
added missing position columns to reference table
2013-09-22 10:43:09 +02:00
graffy76
70ac14b8ba
Merge branch 'master' into esxSelector
2013-09-21 23:07:53 -05:00
graffy76
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
2013-09-21 23:06:29 -05:00
Marc Zinnschlag
94bb97e766
replacing tabs with spaces
2013-09-21 08:40:00 +02:00
Marc Zinnschlag
96b181bb54
Merge remote-tracking branch 'xethik/master'
2013-09-21 08:07:00 +02:00
Xethik
094e4d93b7
Generally speaking, you should never compare iterators from two different compilers
...
http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers
It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10.
It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.
2013-09-20 21:38:10 -04:00
Xethik
58bb0b8773
Bug #907
...
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
2013-09-20 21:26:12 -04:00
graffy76
7b7dfa122d
Merge branch 'master' into esxSelector
2013-09-19 16:24:28 -05:00
Marc Zinnschlag
99fe6e68c7
Merge remote-tracking branch 'mckibbenta/tgm'
2013-09-19 15:14:35 +02:00
Marc Zinnschlag
8d4f4e395f
update syntax highlighting when ID list changes
2013-09-19 14:26:09 +02:00
Marc Zinnschlag
ba5e2a0330
changed ID listing to include deleted records by default
2013-09-19 13:42:19 +02:00
Marc Zinnschlag
9c751ae370
separate highlight colour for IDs
2013-09-19 12:30:42 +02:00
