6f3d737498
Missing const, thanks to jeaye
11 years ago
1773c70455
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
11 years ago
ef8360f346
silenced a warning
11 years ago
cfbf444628
Merge remote-tracking branch 'potatoesmaster/inventory-remove'
11 years ago
05e19b37e3
Removed obsolete comment
11 years ago
dafe80874a
Added empty line
11 years ago
96714fc2c1
OpenCS: proper working dir & library path on OS X
11 years ago
fa13818360
OS X: OpenCS packaging
11 years ago
dfa900e4e3
OS X: Fixed “macro redefined” warning
11 years ago
0494fa543f
OpenCS: set current directory to bundle location on OS X, like in OpenMW binary
11 years ago
df5b52b45b
OpenCS.app icon & bundle properties
11 years ago
04edd25add
OpenCS as a separate app bundle
11 years ago
6cd373c5c6
Only allow using powers once every 24 h. Apply on touch effects.
11 years ago
71828351e6
Code cleanup: use enum instead of integer
11 years ago
8c4303399f
Merge branch 'master' into dialogue
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loadinfo.hpp
11 years ago
583f1ae9c2
fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection
11 years ago
ec6018928c
some fixes to info record sorting (doesn't address the main problem)
11 years ago
b7bb7d6902
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/opencs/editor.cpp
11 years ago
bbfd7f4c9d
Disable equipped item re-stacking when the item is removed from inventory
...
The item was not removed if it was re-stacked.
11 years ago
d2dcf0b203
Add a warning comment to RefData::setCount()
11 years ago
467bd91651
Update actor model on inventory change
11 years ago
f428921b93
Always update the source container view on drag&drop
...
This fix the indicator not being displayed for items auto-equipped
after an other item is removed.
11 years ago
4fcf427e1f
InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged
...
The unequipped item is also re-stacked if needed.
11 years ago
37e91a278e
Add InventoryStore::unequipItem()
11 years ago
12dbbde1e3
InvStore::unequipSlot: return an iterator to the unequipped item
11 years ago
59c963b6cc
Auto-equip items when a clothe or an armor is removed from inventory
...
This fix auto-equip on corpses.
11 years ago
750f1fd760
Edit ContainerStore::stacks for clarifications and correctness
...
Rename arguments and fix some potential errors (add checks).
11 years ago
26e4ccb8c2
Cosmetic changes
...
Rename ContainerStore::addImpl to addNewStack (it was confusing, since
ContainerStore had methods named 'addImp' and 'addImpl').
11 years ago
aefa54d72d
Pass item count to ManualRef constructor
...
This remove the need to call setCount in multiple places.
11 years ago
0691978603
Add item count to ManualRef constructor as optional argument
11 years ago
f4f2586e8c
Remove duplicate code for PlaceAtMe/PlaceAtPC using a template
11 years ago
8ff747fbef
Move some deleteObject logic from OpDelete to MWWorld::deleteObject
11 years ago
2786530430
Edit InventoryStore::equip() to call the new unequipSlot function…
...
…to unequip previously equipped item.
11 years ago
52cef19982
Update weapon/magic icons when items are removed from player inventory
11 years ago
d05baa8c22
Add method InventoryStore::unequipSlot()
...
This will permit to do run a treatment when an item is unequipped.
11 years ago
10abb9d297
Call ContainerStore::remove() to remove items from inventory
...
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).
Enchanting an item now unequips it.
11 years ago
23b8206bdc
Add remove methods to MWWorld::ContainerStore
11 years ago
a198751f21
Merge remote-tracking branch 'scrawl/magic'
11 years ago
935d9241d8
first attempt at proper info record loading: partially incorrect and way too slow
11 years ago
5c148a3d41
Fix effect source display
11 years ago
8be3ffc2a0
Merge remote-tracking branch 'scrawl/magic'
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
11 years ago
3e58655a90
Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!
11 years ago
3ea7d58ca8
Advance skill on successfull spell cast
11 years ago
976344f0a3
Handle CastOnce enchantments
11 years ago
1051611ffa
Added spell failure sound
11 years ago
cbe96a2170
Refactor ActiveSpells to track range type. Added basic self range magic.
11 years ago
3d8da2b9e0
proper sorting for newly created records and some case smashing fixes
11 years ago
a06aa881cb
make sure case handling in info IDs is consistent
11 years ago
982024a328
Topic range access in InfoCollection
11 years ago
0745a86039
added InfoCreator
11 years ago
5a071b0f81
necessary dpkg rules to get opencs building and packaged on dpkg systems
11 years ago
36efe9605f
necessary dpkg rules to get opencs building and packaged on dpkg systems
11 years ago
fb417f9880
Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27
11 years ago
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.
11 years ago
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).
11 years ago
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).
11 years ago
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
11 years ago
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
11 years ago
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.
11 years ago
bf5529819d
Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.
11 years ago
c545b3682a
compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique)
11 years ago
2d4a6c0edf
cleaned up ID handling in INFO record (including a ESMTool bug fix)
11 years ago
9d7695ea88
added missing columns to topic info table
11 years ago
245d7b0ae4
Merge remote-tracking branch 'scrawl/windowclosefix'
11 years ago
f4e6f31658
Merge remote-tracking branch 'scrawl/openmw-27'
11 years ago
c3d9bc31bb
Fix exiting OpenMW via the window close button (regression)
11 years ago
3a827d9c12
Deleted Obliviontt.zip
11 years ago
468e8e3635
Missing iostream include
11 years ago
dec1483fa4
Merge branch 'saving' into openmw-27
11 years ago
6d439d032f
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
11 years ago
ed913936f8
Eliminated game & addon keys from profile configuration
11 years ago
dace904490
changed game/addon to content for writing to openmw.cfg from launcher
11 years ago
3ac58b387b
fixed wording of an error message
11 years ago
1d4b5a2425
Fix broken launcher content file display / selection scheme
...
Disable selection of content files with missing dependencies (grayed
out)
11 years ago
12c06a5615
Fixed broken dependency check
11 years ago
4724df7e9b
added topic/journal column to info tables
11 years ago
973803eb2f
Fixed pathing issues in launcher
11 years ago
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>
11 years ago
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
scrawl
Marc Zinnschlag
Nikolay Kasyanov
Emanuel Guevel
Bret Curtis
Jordan Ayers
Alexander "Ace" Olofsson
graffy76
Lukasz Gromanowski
gus
Alex "rainChu" Haddad
Marek Kochanowicz