teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
14100 commits 34 branches 0 tags 66 MiB
Commit graph

10655 commits

Author SHA1 Message Date
scrawl
1ba3fa4169 Remove leftovers of the old OpenCS navigation 2015-06-03 18:11:34 +02:00
scrawl
e642f20a65 Restore screenshot key functionality 2015-06-03 17:25:18 +02:00
scrawl
2a85a22dba Write savegame screenshot 2015-06-03 16:40:16 +02:00
scrawl
24551c7bab Fix for savegame incompatibility with master branch 2015-06-03 14:56:57 +02:00
Stanislav Bas
bd46ddcf47 Correct the return type in IdTree::data() for Display_Role 2015-06-03 15:51:34 +03:00
Stanislav Bas
b25cc6bc55 IdCompletionManager uses Display type instread of ColumnId for creating completers 2015-06-03 12:01:13 +03:00
scrawl
41cce5240f Delete remaining files that won't be of any use 2015-06-03 03:29:21 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
292fa0b5e3 Unify raycasting techniques for "on touch" magic 
We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.
 2015-06-03 03:16:26 +02:00
scrawl
cee1db532f Improve area orb positioning for "on touch" spells 2015-06-03 03:04:39 +02:00
scrawl
cd47dff196 Minor cleanup 2015-06-03 03:03:16 +02:00
scrawl
2883ecc19a Fix the hilarious bug of NPCs falling to their deaths in interiors 2015-06-03 02:48:45 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
Stanislav Bas
4e759370de Change Display_String to the proper display type where appropriate 2015-06-03 00:02:53 +03:00
Stanislav Bas
f84c36b500 CommandDelegate: extract a display type from a model if it isn't specified 2015-06-03 00:00:39 +03:00
scrawl
58ebf57154 Apply a comment that got lost in the endless depths of my git stash 2015-06-02 17:13:30 +02:00
scrawl
8c50f8ed26 Fix for lights with no mesh 2015-06-02 17:06:55 +02:00
scrawl
5a7f2a4f1f Restore light attenuation settings 2015-06-02 17:02:56 +02:00
scrawl
01944c33f5 Basic water rendering 2015-06-02 16:35:35 +02:00
scrawl
adc8e0b93e Merge branch 'smbas-master' 2015-06-02 14:35:45 +02:00
Stanislav Bas
2c4025ec72 Rename the method isCompleterExistFor() to hasCompleterFor() 2015-06-02 00:26:31 +03:00
Stanislav Bas
959fe3eb87 Reset the scrollbar position in the topic list when DialogueWindow is closed 2015-06-01 23:49:40 +03:00
scrawl
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
c85764b654 Wireframe mode 2015-06-01 17:02:44 +02:00
Marc Zinnschlag
b866e11873 Merge remote-tracking branch 'cc9cii/pathgrid-check-extra' 2015-06-01 16:49:28 +02:00
scrawl
7f9f9a32d2 InitWorldSpaceParticles fix 2015-06-01 16:29:42 +02:00
scrawl
987918ca15 NpcAnimation::setAlpha 2015-06-01 16:18:57 +02:00
scrawl
bed31996c9 Camera raycast 2015-06-01 15:34:46 +02:00
scrawl
2869424847 Fix first person camera for beast races 2015-06-01 04:41:03 +02:00
scrawl
f88079fddd Restore the isOnGround hack 2015-06-01 02:40:42 +02:00
scrawl
ccd95419e5 Restore various raycasting 2015-06-01 01:57:15 +02:00
scrawl
8e0a988289 Icon fix 2015-06-01 01:32:02 +02:00
scrawl
e306853570 Fix chargen crash 2015-06-01 00:50:55 +02:00
scrawl
84fd682e4e Fix for unnecessary exceptions when opening sounds 
This would throw often during normal play, even though the throws are caught and ignored, can be annoying when the debugger is set to 'catch throw'.
 2015-06-01 00:41:44 +02:00
Stanislav Bas
5dc6cdeb99 Scroll to the top of the topic list when dialog is started 2015-06-01 01:14:11 +03:00
scrawl
5b846ebc71 Camera precision fix 2015-05-31 23:09:37 +02:00
scrawl
ed4863ad7d Restore ranged weapon aiming 2015-05-31 18:53:16 +02:00
scrawl
71bafcb52b Restore head tracking 2015-05-31 18:04:14 +02:00
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