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
11 years ago
cddece4f9e
Another stab at fixing the pathing problem...
11 years ago
e6960d915a
Add simple Ogre widget
11 years ago
15b7d3263c
subclass ESM::DialInfo to keep track of parent topic
11 years ago
0cb591e4f6
Fixed path problem with adjuster widget and local data path.
11 years ago
ea0e8be0d3
disallow sorting (via column headers) in info tables
11 years ago
90aa8f9db6
fixed dialogue record loading with multiple content files
11 years ago
767cb54e7c
added missing columns to journal info table
11 years ago
69f28ee4be
split info records between journal and topic info tables
11 years ago
683b8d77dd
build fix (thanks travis)
11 years ago
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
11 years ago
02ded18fc5
Linux backslash fix
11 years ago
2a927f65d3
perfomances optimisations (pathfinding is computed less often, max 4 times per sec)
11 years ago
650a112e2e
better timer
11 years ago
636d399c7f
Refactored Ogre initialisation into a component
11 years ago
4f35fd8184
Removed a workaround from Renderer, some cleanup
11 years ago
ba88c94d58
first attempt at an info record collection
11 years ago
45f5a66bcc
use result of getAppendIndex instead of always appending at the end
11 years ago
a6e7c6c104
disable AI combat for creatures
11 years ago
5b20cce849
CMake fix
11 years ago
0e86209224
linux fix :p
11 years ago
b7a9243173
fighting should stop when the target is dead
11 years ago
12d8b4e0f8
bugfix
11 years ago
2d84f7d33d
NPC run
11 years ago
d7584f9df7
getLineOfSight, no script instruction yet
11 years ago
f5fbe7361f
Merge remote-tracking branch 'lgro/saving' into saving
11 years ago
b51bef0d98
fixed missing adjuster widget in file dialog open view
11 years ago
d51c9b64dd
Issue #913 : Merge --master and --plugin switches
...
Launcher part of master/plugin switches merge.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
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>
11 years ago
c2bbbef637
Merge remote-tracking branch 'rainChu/drowning-gauge'
11 years ago
2515a1239e
improved combat conditions
11 years ago
9a80e11182
reimplemented add and appendBlankRecord via insertRecord
11 years ago
968968502e
NPC always face you when fighting
11 years ago
525d6fadec
added Collection insert function for arbitrary position and reimplemented appendRecord in via this function
11 years ago
a0edb55f60
only NPC with fight over 80 will attack you now
11 years ago
882b136b35
bugfix of bugfix ^^
11 years ago
23eaf90846
Breath meter flashes when drowning
11 years ago
ea7a8eb2a4
last commit
11 years ago
5e123d3f52
Hide adjusterwidget for open files view
11 years ago
9b483c3ae3
Fix for file path issues
11 years ago
ba365ff49e
Fixed merge conflicts with saving branch
11 years ago
8c9a5de26f
Fix an irritating error message
11 years ago
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
11 years ago
1a23cccce3
Implemented Launcher namespace
11 years ago
16d87ea1d1
Merge branch 'master' into esxSelector
11 years ago
2ca7f24731
Fixed filedialog new / edit content path issue
11 years ago
b48f066f33
Reimplemented content selector for filedialog and datafilespage classes
11 years ago
ba3589bc76
Revert "Implemented ContentSelector as a singleton "charm" modifier for"
...
This reverts commit 24b167b755
11 years ago
f9591ddda6
Reimplemented constentselector view class
11 years ago
67bc0a0c70
additional modification to the IDValidator (restricting relaxed mode slightly more)
11 years ago
dc473221e7
added ID-argument to CollectionBase::getAppendIndex (required for info record collection)
11 years ago
aa61948801
relaxed rules for new IDs when ID is also a user visible text
11 years ago
3146af34d6
some fixes for the merged filter branch
11 years ago
fdba029566
Merge remote-tracking branch 'sirherrbatka/filters' into saving
11 years ago
70602c2c36
Removed changes in the unimplemented copy ctor.
11 years ago
5e1bdd605b
Corrected formatting in document.hpp
11 years ago
88e09159c4
splitting off characters menu from mechanics menu (was getting too big)
11 years ago
743c6ea5b1
save dialogue records
11 years ago
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
11 years ago
b23df42817
Removed old comment. Changed to set resources path correctly.
11 years ago
3b85d97087
handle deleted dialogue records
11 years ago
dc12648a3e
add fixed dialogue records when creating a new omwgame file
11 years ago
c0e5501431
disallow the deletion of non-topic, non-journal dialogue records
11 years ago
0be157efea
set dialogue type for newly created dialogue records
11 years ago
75c5316ad7
added dialogue type column to topics table
11 years ago
adf3a41a83
added topic and journal tables
11 years ago
ebf7732912
some cleanup
11 years ago
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
11 years ago
184456892b
Added check to load custom filters set when present.
11 years ago
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.
11 years ago
a7002e8a09
Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.
11 years ago
3a3f2a37c8
Add cut, copy & paste of text
11 years ago
8c139783b7
silenced a warning
11 years ago
19bd0f90b9
Merge remote-tracking branch 'rainChu/torches'
11 years ago
65818155d8
Fixed punctuation consistency
11 years ago
e11da5c0a3
Added a constructor to Light CustomData
11 years ago
3000386443
failed attempt on switch adding.
11 years ago
2643214ca6
Lights extinguish underwater
11 years ago
30ee3c5cf6
Equipped torches and lights run out of fuel
11 years ago
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.
11 years ago
db7ea30483
allow float values in cell for value tests
11 years ago
679754b305
corrected an error message
11 years ago
9b0766b678
minor fix in ValueNode::toString
11 years ago
4905f1c8ab
make testing empty cells against an empty string yield true
11 years ago
ce8694c84e
Merge remote-tracking branch 'scrawl/master'
11 years ago
683ad40e21
No need for this ifdef since there is a default argument.
11 years ago
fa264935ff
We can apply vsync at runtime now that the Ogre bug is fixed.
11 years ago
f504ab42fe
Turn off vsync while in the loading screen
11 years ago
b8ae195a46
Merge branch 'scene'
11 years ago
4624bed899
changed handling of scene toolbar button icons
11 years ago
fc5afe430b
Merge remote-tracking branch 'potatoesmaster/fatigue-restoration'
11 years ago
dcfff79460
Regenerate fatigue over time
11 years ago
708cde2688
Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection'
11 years ago
141382b8c0
COC Command: Exterior cell selection fix.
...
Return the northernmost cell of the easternmost matching column for Ext. cells.
11 years ago
608d154ad7
Merge remote-tracking branch 'rainChu/master'
11 years ago
cfc3093320
Reverted conditional compiling
11 years ago
b5d620a8dc
fixed string filter on enum column when column is empty
11 years ago
a29b8667ef
fixed string filter on boolean columns when testing against the value false
11 years ago
a77044cda4
fixed column numbering
11 years ago
2606feec3a
Merge remote-tracking branch 'lgro/cfg_without_data_path'
11 years ago
3c580fbc59
Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'
11 years ago
458c752425
Merge remote-tracking branch 'mckibbenta/tgm'
11 years ago
87cd5d4267
Merge remote-tracking branch 'potatoesmaster/DisableLevitation'
11 years ago
9c4d88cd76
Merge remote-tracking branch 'potatoesmaster/acrobatics'
11 years ago
c8dc6a70b7
Merge remote-tracking branch 'greye/master'
11 years ago
c8695db66f
Merge remote-tracking branch 'wheybags/unshield_fixes'
11 years ago
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>
11 years ago
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).
11 years ago
6ab7002908
MagicEffect: Put magnitude type into ESM::MagicEffect helper.
11 years ago
065f435225
Format fix: remove extra spaces from ranged TimesINT formatting.
11 years ago
94069e3a7e
bugfix
11 years ago
17950210fa
Merge branch 'master' into esxSelector
11 years ago
74cee66273
consolidated magic numbers for button size
11 years ago
1ac3d99c78
pathfinding now works in AICombat.
11 years ago
4d6c3cdf09
removed more garbage
11 years ago
4c72a9ffdf
Fixed non-loading files
11 years ago
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
11 years ago
6303e56ce4
Magic Effect Display cleanup: Don't put spaces in percentages.
11 years ago
707f45aa8e
Magic Effect Display improvement.
...
Related to Bug #794 .
Always show one decimal point precision for Fortify Max. Magicka effect.
11 years ago
6983a55a16
Magic effect display improvement.
...
Related to Bug #794 .
Show the "x INT" notation for Fortify Max. Magicka.
Show "%" notation for weakness / resistance effects.
11 years ago
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.
11 years ago
4265dddc40
Add MWWorld::isSlowFalling(Ptr)
11 years ago
6e09a5fb4a
Acrobatics: reinit fall height at current height rather than zero
...
To prevent problems.
11 years ago
2b992ef3b5
Acrobatics: use calculated fatigueTerm
11 years ago
4c151e59a2
Acrobatics: do not touch modified stats
11 years ago
4860514865
Acrobatics: cosmetic changes
11 years ago
857deb3723
Merge branch 'master' into tgm
11 years ago
073f64c8bb
stop weapon condition degredation (for the player) with tgm on
11 years ago
496f786c2a
Implement Disable/EnableLevitation script functions
...
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
11 years ago
f1b4c2e400
Fixed first person offset to use world transform
...
It slipped my mind that some necks might not be perfectly vertical.
11 years ago
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.
11 years ago
a5a0f61533
Fixed missing profiles combobox
11 years ago
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
11 years ago
b8c60dabb3
Reintroduce Acrobatics changes made by Glorf
...
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
11 years ago
0ddb5097fc
Revert "Bug #840 , First Person Sneaking Camera Height"
...
This reverts commit 296abfd48f
11 years ago
296abfd48f
Bug #840 , First Person Sneaking Camera Height
...
Also, added comments to existing code in the area.
11 years ago
4496244b14
Tabs to spaces
...
My own code uses only tabs - I forgot to change the setting on my IDE,
sorry!
11 years ago
eae02ea00d
Cleaned up my hackish code for WinMain
11 years ago
00a776a1a8
Fixed compilation failure on my machine
...
Fixed shared records not being populated before the player record is
moved.
11 years ago
4cdb57e388
workaround segfault on --new-game switch
11 years ago
bffbfff41c
My own fix to make it hackily compile
11 years ago
24b167b755
Implemented ContentSelector as a singleton "charm" modifier for
...
FileDialog...
11 years ago
dd0a416249
cleaned up bloodmoon_fix_ini
11 years ago
fd169c2399
fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder
11 years ago
ef617d408b
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches in launcher.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
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>
11 years ago
83a375b55d
AI now continue to hit you.
...
TODO: change the way time is handled
11 years ago
7be1f1afc2
implemented SceneToolMode as a horizontal panel with radiobutton-type buttons
11 years ago
2537384c50
bug fix
11 years ago
0c5f07a65a
added SceneToolMode class
11 years ago
84cadc10f4
added scene toolbar buttons (still not doing anything)
11 years ago
9ea092927f
added basic scene subview (no functionality yet)
11 years ago
6143ec33e0
giving Documents direct access to ConfigurationManager
11 years ago
e7c48cbe58
load project files
11 years ago
62148b3247
moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase
11 years ago
baae548106
added project scope filter saving
11 years ago
6ac4dedfbe
added missing column enum
11 years ago
31346dde58
fixed uninitialise scope value for filters
11 years ago
6f2c418a5c
(slightly) improved error reporting during save operations
11 years ago
23095ec3ec
added missing scope column to filter table
11 years ago
5779f799ab
create project file when saving content file
11 years ago
1363e86828
made verifier ignore deleted records
11 years ago
9353f4d14f
WIP AI combat
11 years ago
96fd1c35bf
preserve author/descriptin meta data
11 years ago
830530bd06
set record count in TES3 header
11 years ago
e4fdebc85b
added saving for referenceable records
11 years ago
c42e74dadf
make 4 byte record type accessable from record struct
11 years ago
3b40192e90
Merge branch 'master' into esxSelector
11 years ago
ae5e8b95ff
Solving Issue912
11 years ago
0f1c4cb00e
cleanup
11 years ago
91d7291c0c
Switched to using proper enums as opposed to ints.
11 years ago
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.
11 years ago
0c518fb047
Replaced tabs with spaces.
11 years ago
c423479f20
Fixed bug #887
11 years ago
6d9ff39390
set dependencies when saving (requires further refinements)
11 years ago
74d683b530
fixed save path for newly created addons
11 years ago
63e0cf5154
fixed missing initialisation of adjuster widget in file dialogue
11 years ago
d4b2a6b9f1
Merge remote-tracking branch 'graffy76/esxSelector' into saving
11 years ago
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
11 years ago
a6ea670255
use IdTypeDelegate in report table
11 years ago
1c4a4b4f26
generalised RefIdTypeDelegate into IdTypeDelegate
11 years ago
f2875e234c
added missing position columns to reference table
11 years ago
70ac14b8ba
Merge branch 'master' into esxSelector
11 years ago
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
11 years ago
94bb97e766
replacing tabs with spaces
11 years ago
96b181bb54
Merge remote-tracking branch 'xethik/master'
11 years ago
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.
11 years ago
58bb0b8773
Bug #907
...
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
11 years ago
7b7dfa122d
Merge branch 'master' into esxSelector
11 years ago
99fe6e68c7
Merge remote-tracking branch 'mckibbenta/tgm'
11 years ago
8d4f4e395f
update syntax highlighting when ID list changes
11 years ago
ba5e2a0330
changed ID listing to include deleted records by default
11 years ago
9c751ae370
separate highlight colour for IDs
11 years ago
3d2281fe80
added signals and functions to Data for handling ID list changes
11 years ago
78f7f80fc3
configured script highlighting with extensions
11 years ago
0eb06ada39
Implemneting drag and drop
11 years ago
d5ef843f56
Fix a missing model update
11 years ago
acfd78c62a
implemented saving for all supported record types except cells, referencables and references
11 years ago
03054c8160
forgot to write record ID
11 years ago
bf0fba68af
added save stage for globals
11 years ago
graffy76
scrawl
Marc Zinnschlag
gus
Lukasz Gromanowski
Alex "rainChu" Haddad
Marek Kochanowicz
Emanuel Guevel
Jordan Ayers
mckibbenta
greye
Tom Mason
Berulacks
Xethik