krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
14288 commits 35 branches 0 tags 65 MiB
Commit graph

10817 commits

Author SHA1 Message Date
Stanislav Bas
dbe61115b2 Fix the mistyping header guard in the idcompletiondelegate.hpp 2015-05-31 18:22:43 +03:00
Stanislav Bas
e636101725 Add missing new lines at the ends of files 2015-05-31 18:18:49 +03:00
Stanislav Bas
9e405b69fa Create the custom completer popup to avoid the problem with the wrong height of the default popup 2015-05-31 16:43:28 +03:00
Marc Zinnschlag
9f0ccdc37a Merge remote-tracking branch 'scrawl/master' 2015-05-31 11:05:43 +02:00
scrawl
60f55997fd Rotate first person meshes, sneak camera offset in first person 2015-05-31 02:26:58 +02:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
Stanislav Bas
994c6833bc Add missing columns for the ID completion 2015-05-30 23:54:16 +03:00
Stanislav Bas
e943d17b29 Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes 2015-05-30 22:01:21 +03:00
Stanislav Bas
602f33bd91 Add ColumnId role to the IdTree data methods 2015-05-30 21:30:25 +03:00
Stanislav Bas
5e8718d8b2 Add the ID completion delegate factory to the delegate factory collection 2015-05-30 18:37:13 +03:00
scrawl
7f2dd21c66 Fix for StartScript regression (Fixes #2590) 2015-05-30 17:20:49 +02:00
Stanislav Bas
33e36ee922 Add the ID completion delegate 2015-05-30 15:51:33 +03:00
Stanislav Bas
19cc6b83e5 Integrate the Id completion manager into the Document class 2015-05-30 15:40:23 +03:00
Stanislav Bas
87a1f9f9aa Add ID completion manager 2015-05-30 15:31:44 +03:00
cc9cii
c4aa3d3ee3 Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained. 2015-05-30 21:12:47 +10:00
Marc Zinnschlag
88d5aed62d removed code that interfered with the default window size on Linux (Fixes #2568) 2015-05-30 12:05:35 +02:00
Marc Zinnschlag
d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 2015-05-30 11:39:53 +02:00
cc9cii
01eba7b721 Extra check for thread affinity. 2015-05-30 19:17:42 +10:00
cc9cii
76196d815d Update user preference setting value via an event message queue. 2015-05-30 18:58:33 +10:00
Marc Zinnschlag
17747a2dd9 Merge remote-tracking branch 'cc9cii/highlight-colours' 2015-05-30 10:23:27 +02:00
scrawl
988a9cad58 getHitContact Head exception fix 2015-05-30 01:41:38 +02:00
scrawl
cc3bfe2bb2 Restore collision tracker 2015-05-30 01:32:00 +02:00
scrawl
b2fe21dd3b Minor cleanup 2015-05-30 01:11:00 +02:00
scrawl
fd50be0fb8 Restore various gameplay 2015-05-30 01:00:24 +02:00
cc9cii
0aaac59cc3 Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588. 2015-05-30 08:37:58 +10:00
scrawl
5c7ecb9c1d string::compare exception fix 2015-05-29 23:38:31 +02:00
scrawl
af2f26d04d Particle fixes 2015-05-29 20:45:27 +02:00
cc9cii
9cbda0ffad Allow users to select syntax highlighting colours. Should resolve Feature #2507. 2015-05-29 22:20:43 +10:00
cc9cii
393cee406f Use signals for user preference setting updates. 2015-05-29 19:28:25 +10:00
cc9cii
ce421b230b Move scrollbar to newly opened subview. Should resolve Bug #2576. 2015-05-29 14:07:41 +10:00
scrawl
7e715decd3 Color fix 2015-05-29 02:26:58 +02:00
scrawl
6d3528af70 Port global map exploration 2015-05-29 01:49:52 +02:00
cc9cii
734e52d1c8 Move the user preference check to the preparation step before the running of the operation. 2015-05-29 06:40:40 +10:00
cc9cii
9ad69d9085 Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585. 2015-05-29 05:44:35 +10:00
cc9cii
6821cb4133 Use the tree model rather than a nested proxy for the dialogue only listing (i.e. non table) items. Should resolve Bug #2586. 
- QDataWidgetMapper requires the rootindex to be set, which was not possible with the nested proxy model.
 2015-05-29 05:40:20 +10:00
scrawl
7a1408cfed Restore display of global map overlay, no exploration yet 2015-05-28 18:49:24 +02:00
scrawl
72d0a69132 Fix global map markers not being cleared on a new game 2015-05-28 18:44:34 +02:00
scrawl
9ee63dc3f4 Change stats viewer key to f3 2015-05-28 16:28:48 +02:00
scrawl
5f7a82e0da Fog of war fix 2015-05-28 16:20:29 +02:00
scrawl
f4ee805e3b Object animation fix 2015-05-28 15:44:58 +02:00
scrawl
c811ac6afe Port fog of war 
Not optimized yet, need to work on fog texture's DataVariance.
 2015-05-28 03:50:49 +02:00
scrawl
5628a2b823 Camera zoom fix 2015-05-28 03:47:53 +02:00
scrawl
8b3054aa8b Fix for player collision cleanup issue 2015-05-28 02:45:38 +02:00
scrawl
6555ee8d80 Minor include cleanup 2015-05-28 02:37:35 +02:00
scrawl
025a1a7866 Restore savegame screenshot display 2015-05-28 02:34:38 +02:00
cc9cii
00c165d3a5 Add user preference option to check unused or redundant pathgrid points. Also resolve namespace clash issue in osx. 2015-05-28 08:44:17 +10:00
scrawl
1f00174c02 Use a btCollisionWorld instead of btDiscreteDynamicsWorld 
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
 2015-05-27 23:09:38 +02:00
scrawl
fe439e53ff Bullet include cleanup 2015-05-27 22:32:11 +02:00
Marc Zinnschlag
b6878c2e0c improved error handling in LocalScripts::add 2015-05-27 19:45:26 +02:00
Marc Zinnschlag
baaf801521 Merge remote-tracking branch 'cc9cii/loadcell-fix' 2015-05-27 19:31:25 +02:00
cc9cii
674a124bc6 Don't use local type as a template parameter. 2015-05-27 22:27:32 +10:00
cc9cii
3a31468af0 Pathgrid record verifier. Feature #2000. 2015-05-27 22:12:11 +10:00
cc9cii
6966555377 Object verifier check to see if the script used by that object actually exists. Should resolve Bug #2582. 2015-05-27 15:55:00 +10:00
cc9cii
b7044ac119 Fix crash loading some addon files. Should resolve Bug #2583. 
- This may be a bug within QSortFilterProxyModel
- It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers.
 2015-05-27 10:27:57 +10:00
scrawl
2f97649540 Fix for cleanup issue when exiting after a failed savegame load (Fixes #2580) 2015-05-27 00:30:39 +02:00
scrawl
723beb1cac Move IncrementalCompileOperation to SceneManager 2015-05-26 20:20:18 +02:00
scrawl
099f93f00d Sky fixes 2015-05-26 18:22:21 +02:00
scrawl
c4951d1e73 Map rotation fix 2015-05-26 18:10:31 +02:00
scrawl
3dcb167066 Map rendering 2015-05-26 16:40:44 +02:00
Marc Zinnschlag
99dbd82a44 Merge remote-tracking branch 'cc9cii/fix-dialogue-subview-crash' 2015-05-26 14:37:50 +02:00
Marc Zinnschlag
ae1a606876 Merge remote-tracking branch 'cc9cii/selective-refresh' 2015-05-26 14:32:03 +02:00
cc9cii
f06ddd47c4 Return the correct range for a given topic. Should resolve Bug #2569. 2015-05-26 17:38:22 +10:00
cc9cii
aafcaf32c5 Qualify the scope of Flag_Dialogue. (another one) 2015-05-26 16:12:54 +10:00
cc9cii
2f29c2c077 Qualify the scope of Flag_Dialogue. 2015-05-26 13:58:58 +10:00
cc9cii
ec808843c3 Do not rebuild the dialogue subview unless required. Should resolve Bug #2581. 
The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview.  Changes in this commit include:

- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list
 2015-05-26 13:35:10 +10:00
cc9cii
95f740ec40 Give CSVWorld::EditWidget::mMainWidget a chance to clean up its children. Should resolve Bug #2578. 2015-05-25 22:28:41 +10:00
Marc Zinnschlag
5f41ef4809 Merge remote-tracking branch 'cc9cii/master' 2015-05-25 11:10:17 +02:00
cc9cii
3c82e6d034 Retrieve the correct index for the type of record being un-deleted. 2015-05-25 16:36:42 +10:00
cc9cii
e6d2821b78 Refresh table filters when the model is updated. Should resolve Bug #2579. 2015-05-25 09:15:07 +10:00
Marc Zinnschlag
6402b82823 Merge remote-tracking branch 'cc9cii/master' 2015-05-24 21:15:36 +02:00
Marc Zinnschlag
07ce7b95cf Merge remote-tracking branch 'cc9cii/npc-additional-data' 2015-05-24 21:15:26 +02:00
cc9cii
22420c3a83 Close DialogueSubView if the corresponding record is deleted. Should resolve Bug #2575. 
- ToDo: Doesn't seem to shrink the widget width properly (when horizontal scrollbar is active)
 2015-05-24 23:19:06 +10:00
cc9cii
c721e340d8 Merge branch 'master' into npc-additional-data 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-05-24 19:24:27 +10:00
cc9cii
21af1913e1 Ensure ColumnId names are unique. 2015-05-24 19:18:54 +10:00
scrawl
76dd3e4034 Fix lip animation regression 2015-05-24 04:40:09 +02:00
scrawl
1fd9fba7a3 Fix debug drawer crash 2015-05-24 04:28:34 +02:00
scrawl
95465a1489 Player raycast fix 2015-05-24 04:01:36 +02:00
scrawl
d84990be85 Restore getCollisions 2015-05-24 03:59:22 +02:00
scrawl
8b322fcd06 Implement getFacedObject using osgUtil::IntersectionVisitor 2015-05-24 03:36:34 +02:00
scrawl
c2131e7c31 Make near clip distance configurable 2015-05-24 02:34:20 +02:00
scrawl
9a0db5d55a Restore cell changes 2015-05-24 01:32:00 +02:00
scrawl
152d690a7a Minor cleanup 2015-05-23 23:10:53 +02:00
scrawl
da24e298ee Fix -Wreorder warnings 2015-05-23 22:44:00 +02:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
Marc Zinnschlag
53b4c15d85 Merge remote-tracking branch 'smbas/master' 2015-05-23 16:02:09 +02:00
Marc Zinnschlag
913caf96bd Merge branch 'openmw-36' 2015-05-23 09:46:54 +02:00
Marc Zinnschlag
b58b7a89ed Merge remote-tracking branch 'rohit-n/reorder2' 2015-05-23 09:19:03 +02:00
scrawl
f2809ab63b Delete nifosgtest again 2015-05-23 06:53:26 +02:00
scrawl
0de6839890 Minor cleanup 2015-05-23 06:07:11 +02:00
scrawl
0b042b75cc Restore actor visibility mask 2015-05-23 05:42:37 +02:00
scrawl
04e827ecf6 Don't try to play an empty video 2015-05-23 05:42:21 +02:00
scrawl
cd81ec92db Minor cleanup 2015-05-23 05:41:53 +02:00
scrawl
8092f37ce5 New game crash fix 2015-05-23 05:40:24 +02:00
Stanislav Bas
a5183aefbe Add record state tracking to the ModifyCommand (Fix #2555) 2015-05-22 23:53:25 +03:00
scrawl
d1b6289cad Don't teleport followers when using teleportation spells 2015-05-22 19:57:02 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
85345e663a Restore getHitContact 2015-05-22 04:36:33 +02:00
scrawl
627fee07bc Minor cleanup 2015-05-22 04:36:33 +02:00
scrawl
cac7c1e535 Restore various physics features 2015-05-22 04:36:33 +02:00
scrawl
d6da5c8007 Fix for crosshair not showing 2015-05-22 04:36:33 +02:00
scrawl
5ea61af6ac Fix for applying view distance 2015-05-22 04:36:33 +02:00
scrawl
2235d2978b Restore animation text key handling 2015-05-22 04:36:33 +02:00
scrawl
9b8e2e9db3 Port MWRender::Camera 2015-05-22 00:29:27 +02:00
Stanislav Bas
d27b92e9f1 Avoid gaps between local indexes in RefIdData after removal of records (Fix #2545) 2015-05-22 00:57:47 +03:00
scrawl
0fb97bd2e7 Readded baseonly parameter to Animation::setObjectRoot 
Fixes the first person view.
 2015-05-21 23:24:22 +02:00
cc9cii
aecd9a275e Remove debugging comments. 2015-05-22 06:09:55 +10:00
scrawl
6031db7882 Character sliding fix 2015-05-21 21:04:48 +02:00
cc9cii
2fc964ca73 Grey out disabled entries rather than hiding them. 2015-05-21 13:11:07 +10:00
cc9cii
1d0b8587a1 Use HasWater bit flag rather than mWaterInt bool. 2015-05-20 21:14:17 +10:00
scrawl
cfe57199d7 Minor cleanup 2015-05-20 04:09:21 +02:00
scrawl
c4452afd89 Inventory item picking 2015-05-20 04:09:21 +02:00
scrawl
72c1f37527 Port CharacterPreview 2015-05-20 02:18:20 +02:00
scrawl
820f4a2688 Fix light direction 2015-05-20 02:07:18 +02:00
Stanislav Bas
163c12d3eb Merge remote-tracking branch 'upstream/master' 2015-05-19 21:39:48 +03:00
Stanislav Bas
196be7283d Reset an activated reference after activation's exectution (Fix #1738) 2015-05-19 21:39:17 +03:00
cc9cii
b27a879352 Add the remaining Cell data for editing with dialogue subview. Should resolve Bug #2551. 
- NOTE: the interior water flag and water level logic needs reviewing
- does not automatically disable region names for interiors without mQuasiEx flag
- Colour values can't be entered as RGB
- Region names are not drop down menus
 2015-05-19 22:01:40 +10:00
cc9cii
aeec1be8b3 Fix occasional crash with DialogueSubView, e.g. when deleting a row of a subtable. 2015-05-19 19:19:52 +10:00
Marc Zinnschlag
f0a6513d7e Merge remote-tracking branch 'scrawl/master' 2015-05-19 09:27:29 +02:00
cc9cii
0ecfd9119f Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546. 2015-05-19 06:56:38 +10:00
Marc Zinnschlag
5176e3d84b Merge remote-tracking branch 'cc9cii/mainwindow-scrollbar' 2015-05-18 16:46:03 +02:00
cc9cii
7494340b66 Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547. 2015-05-18 22:08:36 +10:00
cc9cii
cfcfb17320 Updates to optional horizontal scrollbar. 
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
 2015-05-18 07:12:02 +10:00
scrawl
8bcfac1ea3 Fix adjustPosition not always working correctly (Fixes #2563) 
moveObject was returning an incorrect Ptr for cell movements.
 2015-05-17 18:16:42 +02:00
Marc Zinnschlag
7b207a7954 added shortcut for closing subviews (Fixes #2558) 2015-05-17 14:31:53 +02:00
Marc Zinnschlag
93c3bb3716 fixed subview-closing related crash (Fixes #2564) 2015-05-17 14:27:17 +02:00
cc9cii
e9ca022162 Add an optional horizontal scrollbar to the main view window. Should resolve Feature #2549. 
- TableSubviews and DialogueSubviews now provide size hints
- Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution.
- Three options:
  Grow Only: No change to current, except the use of size hints
  Scrollbar Only: Simple addition of a scrollbar, the view window does not grow
  Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further.
 2015-05-17 20:45:13 +10:00
Marc Zinnschlag
34f106749a removed a redundant typedef 2015-05-17 10:38:15 +02:00
scrawl
75ace9f8b5 Global map base layer 2015-05-16 14:48:20 +02:00
scrawl
1b41f6c4c5 Sleep interruption fix 2015-05-16 12:29:26 +02:00
scrawl
ddc8896dc6 Merge remote-tracking branch 'upstream/openmw-36' into HEAD 2015-05-16 12:26:05 +02:00
Nikolay Kasyanov
7d321e0fb7 Fix #2557 
Don’t show main dialog right away if wizard is selected.
 2015-05-16 13:18:04 +03:00
Marc Zinnschlag
60a835c16d stop script editor from eating undo/redo shortcuts (Fixes #2506) 2015-05-16 10:18:11 +02:00
scrawl
bec9abd319 Remove name extension for internal MyGUI textures 
Since they're no longer loaded from disk, the extension makes no sense.
 2015-05-15 23:21:29 +02:00
scrawl
737c2114dc Change viewer stats keybinding to F9 2015-05-15 19:43:48 +02:00
scrawl
b7fa645530 Don't destroy a NULL window 2015-05-15 19:34:18 +02:00
Marc Zinnschlag
27000fb36b don't reject single precision float values in value filters (Fixes #2533) 2015-05-15 14:09:35 +02:00
cc9cii
28617c8beb Update table size status for removed rows. 2015-05-15 12:33:31 +10:00
cc9cii
f92d801faf Jump to the added/cloned record (or undeleted record in case of undo). Should resolve Feature #2541. Controlled by radio buttons on user preferences settings. 2015-05-15 12:32:29 +10:00
scrawl
49df07ea7f Implement UI scaling factor 2015-05-15 00:41:21 +02:00
scrawl
842ff4d874 Catch exception for not found videos 2015-05-15 00:23:31 +02:00
scrawl
24bb2e152c Apply texture filter setting changes 2015-05-14 21:42:04 +02:00
scrawl
5442bf23a6 Apply video mode & gamma setting changes 2015-05-14 20:31:16 +02:00
scrawl
3e86dd7df0 Apply runtime changes to field of view & view distance 2015-05-14 18:46:28 +02:00
scrawl
b7258c8d23 Readded Objects::updatePtr 2015-05-14 17:34:55 +02:00
scrawl
bc237ee1fe Actor placement fix 2015-05-14 17:14:49 +02:00
scrawl
4ad0b83aa5 Eliminate string lookups in AnimationTime 2015-05-14 16:33:41 +02:00
Marc Zinnschlag
c9d519f36c focus search input field when opening search subview (Fixes #2534) 2015-05-14 14:48:29 +02:00
scrawl
e3b1707bbd Pause simulationTime when the GUI is up 2015-05-14 02:26:19 +02:00
scrawl
a18663c8b3 Improve MyGUI texture updates 2015-05-14 01:26:10 +02:00
scrawl
9ea416b852 Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
scrawl
39fb46601a Readded input & event handling 2015-05-13 16:50:47 +02:00
scrawl
298b3ed2ef Create the GraphicsWindowSDL2 directly 2015-05-13 15:08:47 +02:00
scrawl
0498e6e5f0 Readded window icon 2015-05-13 15:03:21 +02:00
scrawl
36e0cfbc9d Cleanup 2015-05-13 03:36:20 +02:00
scrawl
375b736e74 Use SDL to create the window 
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.

Thanks to KittyCat for the GraphicsWindowSDL2 code.
 2015-05-13 02:53:09 +02:00
cc9cii
538e550b2b Fix for Bug #2543. Spells magic effect id typo. 2015-05-13 10:30:44 +10:00
scrawl
7a3bc69df7 Readded sound listener 2015-05-12 19:02:56 +02:00
scrawl
ccab8cc9a1 Register Player in the PhysicsSystem 2015-05-12 17:40:42 +02:00
scrawl
56ff280230 Mention the RefId in "error during rendering: " errors 2015-05-12 16:50:43 +02:00
scrawl
4036978718 Empty model exception fix 2015-05-12 16:50:31 +02:00
scrawl
e8ec4387d6 Creature collision fix 2015-05-12 16:50:11 +02:00
scrawl
2bc95df265 Actor collision object placement fix 2015-05-12 16:49:28 +02:00
scrawl
65f0195c71 Readded animated collision shape support 2015-05-12 16:26:11 +02:00
scrawl
19988d5e45 Remove RefData::getHandle 2015-05-12 04:04:54 +02:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
5abeab21ed Various integer/floating point roll adjustments based on wiki 2015-05-11 16:55:09 +02:00
scrawl
58a2ad663c Fix regression of sleep interruption chance 2015-05-11 16:38:16 +02:00
scrawl
97c35da441 Change exterior water level to z=-1 (Fixes #1405) 2015-05-11 16:38:16 +02:00
scrawl
c819180aa1 Minor cleanup 2015-05-11 16:38:16 +02:00
scrawl
9d86e5b028 GetSpellEffects returns true for active abilities (Fixes #2530) 2015-05-11 16:38:16 +02:00
scrawl
ac88326909 Exit out of choice when no responses are found (Fixes #2525) 2015-05-11 16:38:16 +02:00
scrawl
3b8b217888 Fix no punishment for stealing when taking an item with the inventory opened 2015-05-11 16:38:16 +02:00
scrawl
eef8f71797 Add a comment 2015-05-11 16:38:16 +02:00
scrawl
b312f50b1f Fix regression with detect spells detecting deleted objects (Fixes #2518) 2015-05-11 16:38:15 +02:00
scrawl
033719ccd7 Correct the icon used for custom map markers 2015-05-11 16:38:15 +02:00
scrawl
ca53457a1c Correct the map icons used for detect spells (Fixes #2519) 2015-05-11 16:38:15 +02:00
cc9cii
2b84598e85 Remove duplicated but reversed map. 2015-05-10 20:52:29 +10:00
cc9cii
ab21c0551c Provide a default encoding when changing to "Function". 2015-05-10 13:34:45 +10:00
scrawl
54c1f19c18 Readded height fields 2015-05-10 02:08:25 +02:00
scrawl
c31b416ba1 Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
scrawl
fe15f31f3e Remove strings.h wrapper 2015-05-10 00:36:04 +02:00
scrawl
c843cfc8e2 Physics stub in preparation for rewrite 2015-05-10 00:28:51 +02:00
cc9cii
587efcfe9d Use better initial value type. Fix exception while saving values. 2015-05-10 07:49:18 +10:00
cc9cii
5fb269336f Don't use initializer list 2015-05-10 07:02:08 +10:00
cc9cii
d6ecc64168 Aggregate types can't be static - osx compiler appears to be more strict. 2015-05-10 06:17:57 +10:00
cc9cii
69317095be For compiling with osx - try using a different syntax for initializing the static maps. 2015-05-10 05:55:50 +10:00
cc9cii
0c461f4424 Add TopicInfos special conditions table. 2015-05-09 21:21:16 +10:00
scrawl
48ffeab191 Remove old BulletShapeManager 2015-05-09 01:06:55 +02:00
scrawl
52a4456cf7 LoadingScreen update 2015-05-09 00:02:38 +02:00
scrawl
c8eb77c557 Move StatsHandler construction to allow profiling of loading screen 2015-05-08 16:22:42 +02:00
scrawl
5db0639983 IncrementalCompileOperation tweak 2015-05-08 16:20:40 +02:00
scrawl
cf0fc43004 GUI shutdown fix 2015-05-08 15:10:17 +02:00
scrawl
483dc9de45 Stop viewer threading before changing MyGUI textures 2015-05-07 23:17:47 +02:00
scrawl
00f4f78717 Give a name to video streams for logging purposes 2015-05-07 23:08:52 +02:00
scrawl
77f733362c Add stats graphs for Script, Mechanics and Physics timings 2015-05-07 21:57:02 +02:00
scrawl
100d6e5fff Render MyGUI in background thread, i.e. refactor to get rid of DYNAMIC DataVariance 2015-05-05 02:38:59 +02:00
Marc Zinnschlag
1c334a01ce one more referenceable that escaped the change into object 2015-05-04 19:04:06 +02:00
scrawl
e191f0e044 Rename MWRender::Debugging to MWRender::Pathgrid 2015-05-04 17:41:30 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 2015-05-04 02:41:50 +02:00
scrawl
f0789352c6 Silence error message 2015-05-04 00:34:30 +02:00
scrawl
5a759f8b0d GUI cleanup fix 2015-05-03 18:35:29 +02:00
scrawl
9de575ad42 Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen 
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
 2015-05-03 18:16:54 +02:00
scrawl
37e3118d21 FontLoader cleanup fix 2015-05-03 17:52:50 +02:00
scrawl
283b252142 Stub InputManager 2015-05-03 17:24:35 +02:00
scrawl
31ead3a9f4 Increase loading screen FPS 
Now that it's rendered in a background thread, we can have a smooth loading bar at virtually no performance cost.
 2015-05-03 17:04:21 +02:00
scrawl
351fd842fd Port loading screen 2015-05-03 16:58:05 +02:00
Marc Zinnschlag
048d7be87c Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516) 2015-05-03 16:35:10 +02:00
Marc Zinnschlag
83a7eea2a9 Merge remote-tracking branch 'scrawl/master' 2015-05-03 09:54:32 +02:00
scrawl
92cbc13964 Remove BtOgre 2015-05-03 00:50:56 +02:00
scrawl
1943110170 Add bullet debug drawer 2015-05-03 00:39:01 +02:00
scrawl
9cf9c2876e Pathgrid rendering 2015-05-02 22:45:39 +02:00
scrawl
1a5407af98 Reduce texture memory usage in OpenMW 2015-05-02 19:36:36 +02:00
scrawl
d772da3720 Main menu background videos 2015-05-02 18:15:00 +02:00
scrawl
dc9b27acfe Create manual GUI textures 2015-05-02 18:06:54 +02:00
scrawl
8817f44d63 Remove advanced FPS counter (obsoleted by the OSG stats viewer) 2015-05-02 17:48:24 +02:00
scrawl
bddd31e385 Dead code removal 2015-05-02 17:11:51 +02:00
Marc Zinnschlag
d873c2c603 focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
scrawl
cac288d5be Remove OgreInit 2015-05-01 21:49:36 +02:00
scrawl
d9d84bd7b2 Remove bullet raycasting shapes, to be replaced with OSG ray casts 2015-05-01 21:43:21 +02:00
Marc Zinnschlag
0bf28a6eab Merge remote-tracking branch 'cc9cii/leveled-list-edit' 2015-05-01 18:44:14 +02:00
scrawl
82c4d01b37 Add back resource handling workarounds to the gui code 2015-05-01 18:37:24 +02:00
scrawl
bd8f0248f0 Player rendering 2015-05-01 18:21:50 +02:00
Marc Zinnschlag
efde061c7c Merge remote-tracking branch 'cc9cii/script-dialog' 2015-05-01 09:12:39 +02:00
cc9cii
b04aeb6aad Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview. 2015-05-01 12:14:09 +10:00
scrawl
b0804734e5 Port VideoWidget 2015-05-01 03:03:44 +02:00
scrawl
223e3a53f5 Move OEngine::Gui::Layout to MWGui 2015-05-01 02:22:51 +02:00
scrawl
6afb0e43ef Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69 2015-05-01 01:44:21 +02:00
scrawl
a59940a2c7 Move MyGUI platform to components 2015-05-01 01:44:21 +02:00
scrawl
db7fe1952d Move MyGUI texture to a separate file 2015-05-01 01:44:21 +02:00
scrawl
62847f0489 Use node masks to separate Scene and GUI 2015-05-01 01:44:21 +02:00
scrawl
c90125f936 Uninitialized basenode fix 2015-05-01 01:44:21 +02:00
cc9cii
081f3ed263 Make font setting selection immediate. 2015-05-01 06:08:04 +10:00
scrawl
83c6ba97c0 Disable skinning updates for actors beyond the AI processing distance 2015-04-30 00:10:24 +02:00
cc9cii
7b4a9f1ea1 Moved script editor settings to its own section. 2015-04-30 06:32:03 +10:00
k1ll
901ee5b756 Add flag for mingw-w64 unicode support 2015-04-29 18:31:30 +02:00
k1ll
96d9afec38 More header case fixes 2015-04-29 18:31:30 +02:00
k1ll
a230050ec8 Boost tr1 unordered map does not work with mingw 2015-04-29 18:31:29 +02:00
cc9cii
8e49ccc2f4 Added user setting options. 2015-04-29 20:24:17 +10:00
cc9cii
7f2bd01f79 Handle plugins that has 0x00 for levelled list types, for example Ravenloft v5.02d, to use 0x01. 2015-04-29 12:08:11 +10:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
scrawl
48a6d7c1a0 Remove mygui platform libraries from cmake 2015-04-28 16:33:30 +02:00
scrawl
a27446c8fb Remove unused headers 2015-04-28 16:02:29 +02:00
cc9cii
28048c0bf3 Simple line numbering and fixed-width fonts for the script dialogue. Based on Qt examples. Should resolve Bugs #2505 and #2512. 2015-04-28 23:07:42 +10:00
Marc Zinnschlag
f1c0847897 Merge remote-tracking branch 'cc9cii/moveref' 2015-04-28 14:07:18 +02:00
cc9cii
49884f54f7 Fix loading moved references. 2015-04-28 08:07:01 +10:00
Marc Zinnschlag
ae5de0cb2b implemented additional check before performing replace (make sure data hasn't been changed since the search) 2015-04-27 22:43:09 +02:00
scrawl
8971a200f7 Sky fix 2015-04-26 14:34:14 +02:00
Marc Zinnschlag
6fac4c5dd9 made user settings handling in search sub view more consistent 2015-04-26 13:31:35 +02:00
Marc Zinnschlag
dab650a3d5 remove rows from result table after a successful replace (configurable via user settings) 2015-04-26 13:26:20 +02:00
cc9cii
33a8cd245a Fix crash with gcc/linux. 2015-04-26 21:02:50 +10:00
Marc Zinnschlag
2ef8103cc7 fixed ReportModel::RemoveRows view updates 2015-04-26 12:36:05 +02:00
cc9cii
889749a493 Allow non-empty mOriginalCell (case where a moved ref is moved again) 2015-04-26 15:44:40 +10:00
cc9cii
b54e5714c9 Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod. 2015-04-26 14:55:40 +10:00
cc9cii
e0d061c37b Implemented a workaround for saving moved refs. 2015-04-26 12:32:07 +10:00
cc9cii
7673be6d0f Loading of moved refs complete. 2015-04-26 12:18:23 +10:00
cc9cii
74b98f7178 Fixed initial loading of moved refs. 2015-04-26 11:35:46 +10:00
scrawl
7809caf9dc Dead code removal 2015-04-25 15:53:11 +02:00
scrawl
0ff7b2ff11 MechanicsManager, frame update 2015-04-25 15:19:17 +02:00
scrawl
2db097f80e Fix nested callbacks bug 2015-04-25 15:10:37 +02:00
cc9cii
2e2d6e04fe gcc friendly version. 2015-04-25 17:43:29 +10:00
cc9cii
dcce59f76c Pass MovedCellRef info to RefCollection. Still has debugging code. 2015-04-25 17:20:02 +10:00
cc9cii
932f1f9fbd Alternative way of finding UniversalId without bloating IdTree. 2015-04-25 15:26:32 +10:00
cc9cii
acb800b8f9 Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
scrawl
372a54bbc7 Dead code removal 2015-04-25 01:28:01 +02:00
scrawl
a3417a9c49 CharacterController compiles 2015-04-25 01:20:07 +02:00
scrawl
15164e20f7 Cleanup fix 2015-04-24 23:30:30 +02:00
cc9cii
f1a58994c6 Merge branch 'master' into moveref 
Conflicts:
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/ref.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
	components/esm/cellref.hpp
 2015-04-25 06:52:53 +10:00
cc9cii
8aaa74a983 Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand. 2015-04-25 06:06:11 +10:00
cc9cii
a6925683c6 Off by one error - can't delete the last element of a refid collection. 2015-04-25 06:04:39 +10:00
scrawl
42d6c6140c Add mygui backend by chris 2015-04-24 21:55:30 +02:00
scrawl
9f12e53956 Scale NPCs by their Weight property (Fixes #814) 2015-04-24 14:49:20 +02:00
scrawl
1c0e3a6488 rotateObject, scaleObject 2015-04-23 23:50:46 +02:00
scrawl
6f3e920f85 Animation port complete 2015-04-23 23:30:06 +02:00
scrawl
86b4a610cb Movement accumulation works 2015-04-23 22:46:07 +02:00
scrawl
09742d5b95 Animation playback works, no movement accumulation yet 2015-04-23 20:41:31 +02:00
Marc Zinnschlag
6fcf4ea9e3 In ModifyCommand replace proxy model with the source model (Fixes #2498) 2015-04-23 14:24:43 +02:00
scrawl
1a19cd3607 Some cleanup 2015-04-22 19:08:56 +02:00
scrawl
460304b069 Port bsatool 2015-04-22 18:06:29 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
7a46d4f46a Dead code removal 2015-04-22 17:48:06 +02:00
scrawl
04accb7652 Add LightController 2015-04-22 17:37:39 +02:00
cc9cii
82bc666e00 Make AI package items to be editable when a new row is added. 2015-04-22 09:25:55 +10:00
scrawl
e49b8fe690 Fix persuasion mechanics using player stats instead of NPC's (Fixes #2475) 2015-04-22 01:17:34 +02:00
scrawl
dfd8e08698 Dead code removal 2015-04-21 23:40:10 +02:00
scrawl
26766b8e0a Dead code removal 2015-04-21 23:36:36 +02:00
scrawl
9e177df61b Add fog, view distance, and far plane culling 2015-04-21 23:36:36 +02:00
scrawl
c53a56ed6e clear stream errors before attempting the read 2015-04-21 16:10:11 +02:00
Marc Zinnschlag
f7c7aeecb3 fixed missing state update when starting a global search 2015-04-21 14:44:51 +02:00
cc9cii
f326b14604 Allow Qt to cleanup its signals. 2015-04-21 10:25:19 +10:00
scrawl
92ef9b1c57 Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
scrawl
42f6d9e15b Port video player 2015-04-19 20:07:18 +02:00
scrawl
68f93294da Port EffectManager 2015-04-19 17:55:56 +02:00
scrawl
fcc7aa02ab Port addExtraLight 2015-04-19 15:03:08 +02:00
scrawl
c924e64047 Port HeadAnimationTime 2015-04-19 14:42:47 +02:00
scrawl
f7d2a28930 Port BoneOffset 2015-04-19 14:25:36 +02:00
cc9cii
a836446d22 Fix assert() triggering due to bad index being passed. 2015-04-19 21:07:45 +10:00
cc9cii
18162557b0 TopicInfos result script are now displayed in dialogue subviews. 2015-04-19 13:31:16 +10:00
scrawl
9c4b2ea61a CreatureAnimation compiles 2015-04-19 03:05:47 +02:00
scrawl
27cfe8fb58 Crash fix 2015-04-19 02:39:10 +02:00
cc9cii
cb3396643b Back to the old layout of dialoguesubview. 2015-04-19 10:32:06 +10:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-19 02:29:16 +02:00
scrawl
edc5cad79e Port Animation::addEffect 2015-04-19 01:57:52 +02:00
cc9cii
8b1ac451ac More warning fixes. 2015-04-19 09:42:44 +10:00
cc9cii
dd1e4e8b69 Remove gcc/clang warnings. 2015-04-19 08:58:52 +10:00
cc9cii
7561b195ab Revert auto expansion of enums as it was interfering with row based operations. Fix default values of magic effect skill & attributes. 2015-04-18 15:28:34 +10:00
cc9cii
48a6006202 Prevent enum delegates from auto expanding when opening a dialogue subview. 2015-04-18 14:16:55 +10:00
cc9cii
5e84858c0b Change the cell edit selection behaviour of the nested tables. Also auto-expand the enum delegate selections (both main table as well as nested table in the dialogue subview) 2015-04-18 10:07:53 +10:00
cc9cii
f88be67556 Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate 2015-04-18 09:37:19 +10:00
cc9cii
e241fb0104 Convert clothing/armour part reference type column in the nested tables to use enum delegates. 2015-04-18 08:31:08 +10:00
cc9cii
e00d7f72ac Convert magic effects ID and Range columns in the nested tables to use enum delegate 2015-04-18 08:09:14 +10:00
cc9cii
befd6fe658 Convert magic effects Skills column in the nested tables to use enum delegates. 2015-04-18 07:15:40 +10:00
cc9cii
0aff188d8d Fix enum delegate from adding a command to the undo stack when the value has not changed. 2015-04-18 07:13:02 +10:00
cc9cii
d6c2cff381 Convert magic effects Attribute column in the nested tables to use enum delegates. 2015-04-17 21:33:25 +10:00
cc9cii
c41b4b84a6 Cleanup post merge. 2015-04-17 13:45:45 +10:00
cc9cii
47d5eac290 Merge branch 'master' into NonTableFields 
Conflicts:
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/idtable.hpp
 2015-04-17 12:37:34 +10:00
cc9cii
32e73c3deb Add creature/item levelled lists (non table items) to dialogue subview. 2015-04-17 11:50:19 +10:00
scrawl
083c41c950 Environment map for enchanted objects 2015-04-17 01:23:37 +02:00
Marc Zinnschlag
38ce074a62 Merge branch 'replace' 2015-04-16 20:11:25 +02:00
Marc Zinnschlag
b939fd440e added replace all button 2015-04-16 20:11:14 +02:00
Marc Zinnschlag
36ce2d61f4 consider lock mode when replacing 2015-04-16 19:02:03 +02:00
Marc Zinnschlag
4951fc477c added replace function 2015-04-16 18:50:22 +02:00
cc9cii
a2d824bfa6 Changes to support dialogue only items but in a list view via QDataWidgetMapper. 2015-04-17 01:27:36 +10:00
scrawl
c334a76a6f Fix skinning bug 2015-04-15 22:38:43 +02:00
scrawl
5b8c28f641 NpcAnimation compiles 2015-04-15 22:11:38 +02:00
scrawl
13a1ba0aab Moon rendering 2015-04-15 18:50:50 +02:00
scrawl
c516e897ee Move Controller base classes to SceneUtil, add visitor to assign ControllerSources 2015-04-14 17:51:46 +02:00
scrawl
5dd1ab24fe More efficient StateSetController, beginnings of sky rendering 2015-04-14 15:58:16 +02:00
scrawl
8c7c89a4aa Port SoundManager 2015-04-13 22:48:37 +02:00
scrawl
246b06ca27 Forgot to add 2015-04-13 17:30:32 +02:00
cc9cii
1c7ed795c2 Add creature/item levelled lists to dialogue subview. 2015-04-13 22:21:27 +10:00
cc9cii
513c3a47cb Add clothing/armor part reference table to dialogue subview. 2015-04-13 21:08:23 +10:00
cc9cii
526b53fce0 Add AI packages table to dialogue subview. Also minor bug fixes. 2015-04-13 14:14:00 +10:00
cc9cii
60e5ff8811 Remove duplicated checks and exceptions. 2015-04-13 08:03:30 +10:00
cc9cii
221c57adee Fix template syntax and travis warnings. 2015-04-13 07:05:06 +10:00
cc9cii
a976dca27b Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key... 2015-04-13 06:39:38 +10:00
scrawl
61aaf0cf70 Attach light lists to the object base nodes instead of each renderable 
Apparently that is how Ogre worked (on the SceneNode) so let's roll with it for now. Have not tested yet what MW does.
 2015-04-12 18:03:36 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
cc9cii
7ccf53e750 Changed over inventory adapters. Fixed a few places where modified records were not set properly. 2015-04-12 20:03:55 +10:00
cc9cii
25261a60e5 Add potion magic effects table to dialogue subview. Integration of the adapters to RefIdCollection is incomplete. 2015-04-12 18:29:42 +10:00
cc9cii
ef84e553be Renamed some stuff. 2015-04-12 13:48:23 +10:00
cc9cii
41b368a759 Moved templated code around a bit. 2015-04-12 10:52:01 +10:00
cc9cii
4b9c9bf095 Simplify and relocate nested column definitions. 2015-04-12 08:52:09 +10:00
cc9cii
8dab2f9b14 Use human friendly strings in magic effects subtable. 2015-04-12 07:46:32 +10:00
scrawl
b0ea51a5c8 Colour conversion utility 2015-04-11 20:09:40 +02:00
scrawl
e6cf959134 Revert "Delete nifosgtest" 
This reverts commit ba3075dc11.
 2015-04-11 14:46:52 +02:00
cc9cii
a460409555 Add Spells and Enchantment magic effects table to dialogue subview. The numbers are not yet converted to strings. 2015-04-11 21:43:25 +10:00
cc9cii
49fd5afdf6 Add birthsign spells table to dialogue subview. 2015-04-11 19:17:17 +10:00
cc9cii
f939648736 Add race spells table to dialogue subview. 2015-04-11 19:05:03 +10:00
cc9cii
9c75dad1ac Why is gcc so unkind? 2015-04-11 18:21:08 +10:00