mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-04 01:45:33 +00:00
Code Issues Releases Wiki Activity
8163 commits 38 branches 54 tags 122 MiB
Commit graph

5959 commits

Author SHA1 Message Date
Emanuel Guevel
750f1fd760 Edit ContainerStore::stacks for clarifications and correctness 
Rename arguments and fix some potential errors (add checks).
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
26e4ccb8c2 Cosmetic changes 
Rename ContainerStore::addImpl to addNewStack (it was confusing, since
ContainerStore had methods named 'addImp' and 'addImpl').
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
aefa54d72d Pass item count to ManualRef constructor 
This remove the need to call setCount in multiple places.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
0691978603 Add item count to ManualRef constructor as optional argument 2013-11-10 02:45:16 +01:00
Emanuel Guevel
f4f2586e8c Remove duplicate code for PlaceAtMe/PlaceAtPC using a template 2013-11-10 02:45:16 +01:00
Emanuel Guevel
8ff747fbef Move some deleteObject logic from OpDelete to MWWorld::deleteObject 2013-11-10 02:45:16 +01:00
Emanuel Guevel
2786530430 Edit InventoryStore::equip() to call the new unequipSlot function… 
…to unequip previously equipped item.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
52cef19982 Update weapon/magic icons when items are removed from player inventory 2013-11-10 02:45:16 +01:00
Emanuel Guevel
d05baa8c22 Add method InventoryStore::unequipSlot() 
This will permit to do run a treatment when an item is unequipped.
 2013-11-10 02:45:16 +01:00
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.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
23b8206bdc Add remove methods to MWWorld::ContainerStore 2013-11-10 02:45:16 +01:00
Marc Zinnschlag
a198751f21 Merge remote-tracking branch 'scrawl/magic' 2013-11-09 17:00:27 +01:00
Marc Zinnschlag
935d9241d8 first attempt at proper info record loading: partially incorrect and way too slow 2013-11-09 11:42:19 +01:00
scrawl
5c148a3d41 Fix effect source display 2013-11-09 11:09:44 +01:00
Marc Zinnschlag
8be3ffc2a0 Merge remote-tracking branch 'scrawl/magic' 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-11-09 10:54:51 +01:00
scrawl
3e58655a90 Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works! 2013-11-09 10:49:00 +01:00
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.

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp
 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