Commit Graph

6118 Commits (0f7f3391f7528ec01882d433ac369f8195eb3e64)

Author SHA1 Message Date
scrawl 07251f0fa4 Don't apply spells to dead actors 11 years ago
scrawl b8f5cd6cb7 Forgot to apply the same fix to companion window 11 years ago
Sebastian Wick 4a816b6c17 fix context menu 11 years ago
scrawl eb46de54e4 Merge branch 'master' of https://github.com/zinnschlag/openmw 11 years ago
scrawl 7eb1dcb682 Fix trade windows crashing after a new game 11 years ago
scrawl e32c73725c Merge branch 'crashcatcher' 11 years ago
scrawl f990ba09f0 gdb detection doesn't seem to work for the forked process 11 years ago
Marc Zinnschlag a19242b4ec fixed expression in if statement 11 years ago
vorenon b2d2a3dd17 Closing message boxes with numpad enter 11 years ago
Marc Zinnschlag 985ce7c552 Merge remote-tracking branch 'scrawl/crashcatcher' 11 years ago
scrawl 20d806b40c Change is_debugger_attached to a different hack 11 years ago
scrawl 883140babf Add missing include for signals to make travis happy 11 years ago
scrawl b9899696e3 Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace. 11 years ago
scrawl aa84ce3f0d Copy paste mistake (oops) 11 years ago
scrawl 7474e87edc Implement RestoreHealth/Magicka/Fatigue 11 years ago
scrawl bb43ec9b35 Implement damage tick effects 11 years ago
scrawl b1a29eb27e Implement Resist & Weakness effects 11 years ago
scrawl d49b6f19ff Don't advance acrobatics skill for NPCs 11 years ago
scrawl aa4b2d9504 Fix uninitialized mSkill/mAttribute for spellmaker spells 11 years ago
scrawl c73217627e Move code for listing effect sources to the spell management classes 11 years ago
scrawl d619d0fa25 Don't grab the cursor while the console is opened 11 years ago
scrawl 065f14579f Fix a container window regression (oops) 11 years ago
scrawl f7befa3e54 Remove a no longer required method 11 years ago
scrawl 00af6b5617 Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World. 11 years ago
scrawl 427de69b79 Allow stacking enchanted items when charge is full 11 years ago
scrawl 49125fa26e Fix restacking unequipped items 11 years ago
scrawl da85f3e575 Use the formula from the wiki for spell success. 11 years ago
scrawl 4083c55848 Make sure NpcAnimation base exists before runAnimation. Not sure yet why this is needed. 11 years ago
scrawl 5458207325 Reduce fatigue when casting. Has no effect in the vanilla game due to the GMSTs being 0. 11 years ago
scrawl 9c5847e2f4 Fix VFX not getting removed when an actor dies 11 years ago
scrawl e26cc31e3b Disable projectiles for now 11 years ago
scrawl 992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 11 years ago
scrawl 956d8adb99 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
Conflicts:
	apps/openmw/mwgui/inventoryitemmodel.cpp
11 years ago
scrawl 0b5f5351b5 Fix continuous FX getting removed instantly 11 years ago
Marc Zinnschlag 1c020b74c8 hid ID column in info tables (not relevant for the user) 11 years ago
Marc Zinnschlag 9f0dac00ec silenced a warning 11 years ago
Marc Zinnschlag 2af7f60488 flag reordered records as modified 11 years ago
Marc Zinnschlag a44fad4c59 disabled revert for info tables (no easy way to make this work) 11 years ago
Marc Zinnschlag d49b8e7443 Merge branch 'dialogue' 11 years ago
Marc Zinnschlag 780ea3a41f added support for record reordering to model (only implemented in info collection) 11 years ago
scrawl da5c59c8af addEffect should check effectId, not model. 11 years ago
scrawl ff7e4174f9 Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item. 11 years ago
scrawl a6e2f43b75 Stop continuous VFX when the effect is no longer active. 11 years ago
Marc Zinnschlag 68598f9b63 fixed handling of user directory defaultfilters file; some cleanup 11 years ago
scrawl 9b0e82a37f Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends) 11 years ago
Marc Zinnschlag a8274e5c86 Merge remote-tracking branch 'potatoesmaster/inventory-fix' 11 years ago
Marek Kochanowicz 821d0c5c2d Corrected filter template loading. 11 years ago
scrawl 0627e23d3c Fix wrong skill level for spell success formula. 11 years ago
Emanuel Guevel baf13483c0 Update actor model only when in the current cell 11 years ago
scrawl 60bec03987 Rename variables called 'slots' to work around wrong code parsing in QT Creator. 11 years ago
scrawl 027f4152e4 Missing flagAsModified() 11 years ago
scrawl 3c6a391507 Rename arguments again 11 years ago
scrawl 700d06764c Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack. 11 years ago
scrawl 0dab7031c0 Make sure effects are destroyed with the animation 11 years ago
scrawl eccb8f38ba Apply "cast when strikes" enchantments when hitting with a weapon 11 years ago
scrawl 5f209b120b Use the new ContainerStore::remove method. 11 years ago
scrawl ffdb91bb21 Add particles for Cast + Hit. Not looking quite right yet. 11 years ago
Marc Zinnschlag 2fff7fc843 save info records 11 years ago
scrawl 6f3d737498 Missing const, thanks to jeaye 11 years ago
scrawl 1773c70455 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic 11 years ago
Marc Zinnschlag ef8360f346 silenced a warning 11 years ago
Marc Zinnschlag cfbf444628 Merge remote-tracking branch 'potatoesmaster/inventory-remove' 11 years ago
Nikolay Kasyanov 05e19b37e3 Removed obsolete comment 11 years ago
Nikolay Kasyanov dafe80874a Added empty line 11 years ago
Nikolay Kasyanov 96714fc2c1 OpenCS: proper working dir & library path on OS X 11 years ago
Nikolay Kasyanov fa13818360 OS X: OpenCS packaging 11 years ago
Nikolay Kasyanov dfa900e4e3 OS X: Fixed “macro redefined” warning 11 years ago
Nikolay Kasyanov 0494fa543f OpenCS: set current directory to bundle location on OS X, like in OpenMW binary 11 years ago
Nikolay Kasyanov df5b52b45b OpenCS.app icon & bundle properties 11 years ago
Nikolay Kasyanov 04edd25add OpenCS as a separate app bundle 11 years ago
scrawl 6cd373c5c6 Only allow using powers once every 24 h. Apply on touch effects. 11 years ago
scrawl 71828351e6 Code cleanup: use enum instead of integer 11 years ago
Marc Zinnschlag 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
Marc Zinnschlag 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
Marc Zinnschlag ec6018928c some fixes to info record sorting (doesn't address the main problem) 11 years ago
Marc Zinnschlag b7bb7d6902 Merge remote-tracking branch 'scrawl/master'
Conflicts:
	apps/opencs/editor.cpp
11 years ago
Emanuel Guevel 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
Emanuel Guevel d2dcf0b203 Add a warning comment to RefData::setCount() 11 years ago
Emanuel Guevel 467bd91651 Update actor model on inventory change 11 years ago
Emanuel Guevel 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
Emanuel Guevel 4fcf427e1f InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged
The unequipped item is also re-stacked if needed.
11 years ago
Emanuel Guevel 37e91a278e Add InventoryStore::unequipItem() 11 years ago
Emanuel Guevel 12dbbde1e3 InvStore::unequipSlot: return an iterator to the unequipped item 11 years ago
Emanuel Guevel 59c963b6cc Auto-equip items when a clothe or an armor is removed from inventory
This fix auto-equip on corpses.
11 years ago
Emanuel Guevel 750f1fd760 Edit ContainerStore::stacks for clarifications and correctness
Rename arguments and fix some potential errors (add checks).
11 years ago
Emanuel Guevel 26e4ccb8c2 Cosmetic changes
Rename ContainerStore::addImpl to addNewStack (it was confusing, since
ContainerStore had methods named 'addImp' and 'addImpl').
11 years ago
Emanuel Guevel aefa54d72d Pass item count to ManualRef constructor
This remove the need to call setCount in multiple places.
11 years ago
Emanuel Guevel 0691978603 Add item count to ManualRef constructor as optional argument 11 years ago
Emanuel Guevel f4f2586e8c Remove duplicate code for PlaceAtMe/PlaceAtPC using a template 11 years ago
Emanuel Guevel 8ff747fbef Move some deleteObject logic from OpDelete to MWWorld::deleteObject 11 years ago
Emanuel Guevel 2786530430 Edit InventoryStore::equip() to call the new unequipSlot function…
…to unequip previously equipped item.
11 years ago
Emanuel Guevel 52cef19982 Update weapon/magic icons when items are removed from player inventory 11 years ago
Emanuel Guevel d05baa8c22 Add method InventoryStore::unequipSlot()
This will permit to do run a treatment when an item is unequipped.
11 years ago
Emanuel Guevel 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
Emanuel Guevel 23b8206bdc Add remove methods to MWWorld::ContainerStore 11 years ago
Marc Zinnschlag a198751f21 Merge remote-tracking branch 'scrawl/magic' 11 years ago
Marc Zinnschlag 935d9241d8 first attempt at proper info record loading: partially incorrect and way too slow 11 years ago
scrawl 5c148a3d41 Fix effect source display 11 years ago
Marc Zinnschlag 8be3ffc2a0 Merge remote-tracking branch 'scrawl/magic'
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
11 years ago
scrawl 3e58655a90 Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works! 11 years ago
scrawl 3ea7d58ca8 Advance skill on successfull spell cast 11 years ago
scrawl 976344f0a3 Handle CastOnce enchantments 11 years ago
scrawl 1051611ffa Added spell failure sound 11 years ago
scrawl cbe96a2170 Refactor ActiveSpells to track range type. Added basic self range magic. 11 years ago
Marc Zinnschlag 3d8da2b9e0 proper sorting for newly created records and some case smashing fixes 11 years ago
Marc Zinnschlag a06aa881cb make sure case handling in info IDs is consistent 11 years ago
Marc Zinnschlag 982024a328 Topic range access in InfoCollection 11 years ago
Marc Zinnschlag 0745a86039 added InfoCreator 11 years ago
Bret Curtis 5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
Bret Curtis 36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
Marc Zinnschlag fb417f9880 Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27 11 years ago
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.
11 years ago
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).
11 years ago
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).
11 years ago
Marc Zinnschlag d85360e7fd Merge remote-tracking branch 'scrawl/ui' 11 years ago
Marc Zinnschlag 418ccf705d Merge branch 'openmw-27'
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
11 years ago
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. 11 years ago
scrawl bf5529819d Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog. 11 years ago
Marc Zinnschlag c545b3682a compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique) 11 years ago
Marc Zinnschlag 2d4a6c0edf cleaned up ID handling in INFO record (including a ESMTool bug fix) 11 years ago
Marc Zinnschlag 9d7695ea88 added missing columns to topic info table 11 years ago
Marc Zinnschlag 245d7b0ae4 Merge remote-tracking branch 'scrawl/windowclosefix' 11 years ago
Marc Zinnschlag f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 11 years ago
scrawl c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 11 years ago
scrawl 3a827d9c12 Deleted Obliviontt.zip 11 years ago
Alexander "Ace" Olofsson 468e8e3635 Missing iostream include 11 years ago
Marc Zinnschlag dec1483fa4 Merge branch 'saving' into openmw-27 11 years ago
graffy76 6d439d032f Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector 11 years ago
graffy76 ed913936f8 Eliminated game & addon keys from profile configuration 11 years ago
graffy76 dace904490 changed game/addon to content for writing to openmw.cfg from launcher 11 years ago
Marc Zinnschlag 3ac58b387b fixed wording of an error message 11 years ago
graffy76 1d4b5a2425 Fix broken launcher content file display / selection scheme
Disable selection of content files with missing dependencies (grayed
out)
11 years ago
graffy76 12c06a5615 Fixed broken dependency check 11 years ago
Marc Zinnschlag 4724df7e9b added topic/journal column to info tables 11 years ago
graffy76 973803eb2f Fixed pathing issues in launcher 11 years ago
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>
11 years ago
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
11 years ago
graffy76 cddece4f9e Another stab at fixing the pathing problem... 11 years ago
scrawl e6960d915a Add simple Ogre widget 11 years ago
Marc Zinnschlag 15b7d3263c subclass ESM::DialInfo to keep track of parent topic 11 years ago
graffy76 0cb591e4f6 Fixed path problem with adjuster widget and local data path. 11 years ago
Marc Zinnschlag ea0e8be0d3 disallow sorting (via column headers) in info tables 11 years ago
Marc Zinnschlag 90aa8f9db6 fixed dialogue record loading with multiple content files 11 years ago
Marc Zinnschlag 767cb54e7c added missing columns to journal info table 11 years ago
Marc Zinnschlag 69f28ee4be split info records between journal and topic info tables 11 years ago
gus 683b8d77dd build fix (thanks travis) 11 years ago
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
11 years ago
gus 02ded18fc5 Linux backslash fix 11 years ago
gus 2a927f65d3 perfomances optimisations (pathfinding is computed less often, max 4 times per sec) 11 years ago
gus 650a112e2e better timer 11 years ago