mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
Code Issues Releases Wiki Activity
18070 commits 38 branches 54 tags 122 MiB
Commit graph

2234 commits

Author SHA1 Message Date
scrawl
8aaba0af6f Fix journal page navigation bug introduced by 7dd09dd637 (Fixes #2899) 2015-08-30 17:38:21 +02:00
Jordan Ayers
cd5bef958f Remove dead code from alchemywindow. 
Also align some braces.
 2015-08-24 07:43:30 -05:00
Marc Zinnschlag
a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-08-23 12:11:30 +02:00
scrawl
52d8bc555c Add missing checks to see if spell still exists when loading a savegame (Bug #2883) 2015-08-21 14:24:49 +02:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
scrawl
af3b0cd883 Improve some error messages 2015-08-21 00:31:43 +02:00
Marc Zinnschlag
d436dc332b Merge remote-tracking branch 'jeffreyhaines/gametimetracker' 2015-08-20 20:39:44 +02:00
Jeffrey Haines
f94d3237fc Removed unused cmake import 2015-08-19 13:28:01 -04:00
Jeffrey Haines
61bb55aff4 Removed long int parameter 2015-08-19 13:23:40 -04:00
Jeffrey Haines
d91f197119 Time played display setting 2015-08-19 11:31:43 -04:00
Jeffrey Haines
69729046bf Updated parameter name to reflect units 2015-08-19 10:11:40 -04:00
Jeffrey Haines
e86891d6e1 Time played displayed in save/load menus 2015-08-19 10:05:08 -04:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
scrawl
9fad33cd14 Don't reset the item model's sort/filter options in updatePlayer (Fixes #2863) 2015-08-16 17:49:53 +02:00
scrawl
c8d6679a25 Remove an unused function 2015-08-16 17:40:20 +02:00
scrawl
afb3d94ba4 Fix cell names in the save/load menu not being localised (Fixes #2840) 2015-08-16 01:55:14 +02:00
scrawl
c25dacb480 Fix "Level" string in the save/load menu not being localised (Bug #2840) 2015-08-16 01:53:58 +02:00
scrawl
7dd09dd637 Fix being able to flip journal pages with the mousewheel when the options overlay is active (Fixes #2855) 2015-08-15 20:44:15 +02:00
scrawl
c57e72fe03 Adjust the sleep interruption chance (Fixes #2781) 2015-08-15 16:09:53 +02:00
scrawl
e8c9d3ea2a Fix cell names on world map not always being translated (Fixes #2832) 2015-08-13 17:08:21 +02:00
scrawl
0d8f07d563 Properly apply changes when backing out of chargen dialogs (Fixes #2627) 2015-08-13 17:08:21 +02:00
Marc Zinnschlag
d2cd151f77 Merge remote-tracking branch 'kunesj/master' 2015-07-20 09:45:14 +02:00
Jiří Kuneš
a14a3c82de added description of new syntax to the onRetrieveTag function comment 2015-07-19 19:52:50 +02:00
scrawl
1156668843 Render certain map markers on top of the player arrow (Fixes #2559) 2015-07-19 00:45:02 +02:00
Jiří Kuneš
a5b4e087c5 define owned colours in settings.cfg 2015-07-18 22:17:46 +02:00
Jiří Kuneš
cbc44b33ba define crosshair owned colour in openmw_hud_box.skin.xml 2015-07-18 21:29:38 +02:00
scrawl
77f1387da8 Include cleanup 2015-07-18 20:36:28 +02:00
Jiří Kuneš
75f5972898 show owned - better settings 2015-07-18 17:13:20 +02:00
Jiří Kuneš
df077f8649 color tooltip red when taking item would result in crime 2015-07-18 16:56:57 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2015-07-18 12:22:37 +02:00
Marc Zinnschlag
edde1fb727 Merge remote-tracking branch 'scrawl/master' 2015-07-18 11:40:36 +02:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in 
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
 2015-07-18 03:09:04 +02:00
scrawl
6e493500c9 Show custom map markers on the tooltip of the world map marker (Fixes #2711) 2015-07-18 00:14:11 +02:00
scrawl
41bed4c7d9 Use multimap to speed up custom map marker code 2015-07-17 20:49:10 +02:00
Jiří Kuneš
4a6d806127 fixed comment, save settings to member variable, removed usless include, changed variable to const 2015-07-17 20:30:00 +02:00
Jiří Kuneš
e68b388d16 removed setCrosshairOwned from windowmanager 2015-07-17 19:13:45 +02:00
Jiří Kuneš
c019f8e23d use correct mechanics manager 2015-07-17 18:49:47 +02:00
Jiří Kuneš
15107ca5cf crosshair owned - settings option 2015-07-17 17:48:38 +02:00
Jiří Kuneš
66edae9b93 change collor of crosshair 2015-07-17 17:29:00 +02:00
Jiří Kuneš
72728b9c01 disable cusor when item/container is owned 2015-07-17 16:32:35 +02:00
scrawl
91d71d0fcd Disable MyGUI's scrollbar autorepeat (Fixes #2779) 
We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.
 2015-07-17 03:39:09 +02:00
scrawl
f8d360190d Remove an unneeded virtual 2015-07-15 19:10:09 +02:00
scrawl
992b770315 Don't set OnPcEquip for items that failed to equip (Fixes #2776) 2015-07-15 18:52:23 +02:00
scrawl
de6dc21552 Create hardware cursors in advance (Fixes #2660) 2015-07-13 23:36:25 +02:00
scrawl
dca4704b4b Print exceptions in CharacterCreation::spawnDialog 2015-07-13 18:40:05 +02:00
scrawl
f1b52c964a Select the current resolution in resolution list on game start (Fixes #2768) 2015-07-13 18:00:41 +02:00
scrawl
24ae1d5ace Fix some issues found by coverity 2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson
b1cc74dd9a Explicity instantiate MWMechanics::Stat 2015-07-09 14:41:37 +02:00
Alexander "Ace" Olofsson
3655ef16af Explicitly instantiate ESM::StatState 2015-07-07 19:19:37 +02:00
scrawl
bf9c62fa42 Fix for some coverity scan defects 2015-07-02 20:46:34 +02:00
scrawl
b90fc8ad92 Fix for various Viewer::frame calls resetting the simulationTime 2015-06-14 18:19:53 +02:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +02:00
scrawl
d4c45efb2b Remove useless #undef's for windows now that we have NOMINMAX flag 2015-06-12 04:39:44 +02:00
scrawl
0330d3d61e Restore the "transparent" loading screen 2015-06-07 21:21:57 +02:00
scrawl
f3cbe7b9da Hide FPS widget since it currently doesn't work, use F3 instead 2015-06-07 19:38:59 +02:00
scrawl
e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-06-07 15:23:54 +02:00
Stanislav Bas
49512a2b57 Correct the explanation for the Console::acceptCommand() 2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba Add the explanation to Console::acceptCommand() 2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f Reset Console editbox before command execution 2015-06-05 22:00:02 +03:00
Stanislav Bas
c40987338d Scrollbars don't save their positions between openings 2015-06-04 23:09:40 +03:00
scrawl
30ab15e605 Fix -Wunused-private-field clang warnings 2015-06-04 20:42:05 +02:00
scrawl
e23775e338 Fix -Woverloaded-virtual clang warnings 2015-06-04 20:31:28 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
7bacb9418d Various math code ported to osg 2015-06-03 19:41:19 +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
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
8e0a988289 Icon fix 2015-06-01 01:32:02 +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
Marc Zinnschlag
9f0ccdc37a Merge remote-tracking branch 'scrawl/master' 2015-05-31 11:05:43 +02:00
scrawl
6d3528af70 Port global map exploration 2015-05-29 01:49:52 +02: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
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
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
scrawl
723beb1cac Move IncrementalCompileOperation to SceneManager 2015-05-26 20:20:18 +02:00
scrawl
3dcb167066 Map rendering 2015-05-26 16:40:44 +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
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
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
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
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
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
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
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
c819180aa1 Minor cleanup 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
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
scrawl
52a4456cf7 LoadingScreen update 2015-05-09 00:02:38 +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
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
83a7eea2a9 Merge remote-tracking branch 'scrawl/master' 2015-05-03 09:54:32 +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
82c4d01b37 Add back resource handling workarounds to the gui code 2015-05-01 18:37:24 +02: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
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
scrawl
a27446c8fb Remove unused headers 2015-04-28 16:02:29 +02:00
scrawl
7809caf9dc Dead code removal 2015-04-25 15:53:11 +02:00
scrawl
15164e20f7 Cleanup fix 2015-04-24 23:30:30 +02:00
scrawl
42d6c6140c Add mygui backend by chris 2015-04-24 21:55:30 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
26766b8e0a Dead code removal 2015-04-21 23:36:36 +02:00
scrawl
92ef9b1c57 Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02: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
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
dteviot
fe69dc2863 Made LineInfo a struct, as requested by Scrawl. 2015-04-05 14:56:29 +12:00
dteviot
52de622e97 provide incremental update of SpellWindow (Fixes #2411) 
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
 2015-04-03 17:59:13 +13:00
dteviot
6b6bed520d removed redundant calls. 2015-04-03 13:45:13 +13:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
 2015-03-27 17:30:48 +01:00
scrawl
5cb61fa01c Don't mark gold as stolen, adjust stolen tooltip (Fixes #2465) 2015-03-22 17:28:27 +01:00
scrawl
d573458896 Fix case sensitivity bug in default head/hair selection (Fixes #2453) 2015-03-16 17:42:15 +01:00
Marc Zinnschlag
86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 2015-03-15 22:04:26 +01:00
dteviot
3f28634d1f consolidate random number logic 
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
 2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa Fixed more MSVC 2013 warnings. 2015-03-15 08:49:03 +13:00
scrawl
f603a68144 Allow binding Hand To Hand in quick keys menu (Fixes #2024) 2015-03-12 02:23:46 +01:00
scrawl
7fd1c2c2e2 CharacterCreation refactoring 2015-03-12 00:43:28 +01:00
scrawl
48ea6286fd Book/scroll window refactoring 2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76 WindowManager refactoring 2015-03-11 20:04:25 +01:00
scrawl
e30f240ba2 Add travel service support for creatures (Fixes #2432) 2015-03-09 03:15:11 +01:00
dteviot
ca8c8c6aa4 fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 17:42:07 +13:00
dteviot
e6cd8484a2 fixing MSVC 2013 warning C4244: & C4305 
fixes for mistakes in last commit.
 2015-03-08 13:22:56 +13:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
dteviot
f2ac939e61 reverted mShouldRepeat back to unsigned char. 
As recommended by Scrawl.
 2015-03-07 11:04:54 +13:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
dteviot
407cd50890 fixed warning C4099: 
type name first seen using 'class' now seen using 'struct'
 2015-03-06 21:36:42 +13:00
scrawl
653ddd3f25 Warning fix 2015-03-02 20:16:11 +01:00
Marc Zinnschlag
8b84fa5579 Merge remote-tracking branch 'scrawl/master' 2015-03-02 20:01:31 +01:00
scrawl
730138035d Cycle infinite loop fix (Fixes #2421) 2015-03-02 17:25:26 +01:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
 2015-02-27 22:21:02 +01:00
scrawl
2eedb3acec Include fix 2015-02-27 20:22:43 +01:00
Marc Zinnschlag
da9bd09a8c Merge remote-tracking branch 'miroslavr/master' 2015-02-23 20:53:44 +01:00
MiroslavR
47c053444f Make the jail progress last one second 2015-02-23 00:23:09 +01:00
scrawl
a5847afdac Fix ignored clicks on HUD mini-map (Fixes #2388) 2015-02-20 00:00:13 +01:00
scrawl
6d62aa7544 Don't prompt for spell deletion when using cycling keys (Fixes #2382) 2015-02-18 19:06:36 +01:00
scrawl
a139e4efb0 Grey out completed quests in journal quests list 2015-02-13 16:51:34 +01:00
scrawl
3ccf4642b4 Implement ToggleScripts 2015-02-10 20:25:57 +01:00
scrawl
218f789d88 Fix player DrawState reset when selecting enchanted item (Fixes #2356) 2015-02-09 20:16:29 +01:00
Marc Zinnschlag
e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 2015-02-09 18:03:28 +01:00
Alexander "Ace" Olofsson
d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 2015-02-09 16:23:41 +01:00
Alexander "Ace" Olofsson
df5a08b6de Move manualref code out of header 2015-02-09 15:01:49 +01:00
MiroslavR
1230cf49bf Properly center jail progress widget, fix a bug with it not disappearing if the console is open 2015-02-07 18:38:41 +01:00
MiroslavR
1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 2015-02-07 04:05:28 +01:00
scrawl
9ce3e4b4e1 UI consistency fix in levelup dialog 2015-02-06 01:27:17 +01:00
scrawl
61ec9196c8 Cap the displayed attribute multiplier in levelup to attribute points left to 100 2015-02-06 01:27:17 +01:00
scrawl
55cd9b526c Skill progress bar changed to match MW 2015-02-06 01:27:17 +01:00
scrawl
ae77eacd7e Skill progress refactoring 2015-02-06 01:27:16 +01:00
scrawl
356d1c7657 ESSImport: convert stolen item tracker 2015-02-06 01:27:16 +01:00
scrawl
bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
scrawl
aa6ebcd75c Change stolen items handling to match MW (Fixes #1443, Fixes #2290) 2015-02-05 04:18:43 +01:00
scrawl
955505c167 Remove unused function 2015-02-05 04:18:43 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
scrawl
7542fb5cd9 Show map notes on door marker leading to the cell with the note (Fixes #2284) 2015-01-31 22:40:41 +01:00
scrawl
54e79c8c98 Use mouse pressed event for pin button instead of mouse click 2015-01-31 22:40:41 +01:00
scrawl
c093e284d9 Delegate cleanup 2015-01-31 22:40:41 +01:00
scrawl
2346c3528d Remove NpcStats::mProfit and store it in the script instead 
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
 2015-01-31 22:40:40 +01:00
scrawl
d1b5956a98 Fix crash on exit 2015-01-31 22:40:40 +01:00
scrawl
c0a88161b2 Get rid of unneeded setSize/setCoord overrides 2015-01-29 03:38:59 +01:00
scrawl
9bcc84ceec Add option to stretch menu backgrounds/cutscenes to the whole screen 2015-01-28 00:22:56 +01:00
scrawl
4cbb79191f Don't put duplicate lines in the console history 2015-01-27 23:12:20 +01:00
scrawl
4921c6ef9e Split window caption bars so that the caption can be transparent (Fixes #531) 
Fix transparent window background not applying to the header bar (Fixes #2294)
 2015-01-27 23:05:19 +01:00
Jordan Ayers
1410819e20 Dialog fix for line breaks in the middle of words. 
Issue 1049
Adjust the TypesetBookImpl::Typesetter to not assume a word break
at the end of write() calls.
A word break is assumed if any of the other content insertion methods
are used (section break, add/select content, etc).
 2015-01-25 22:36:20 -06:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00
Alexander "Ace" Olofsson
3a88f4ebd5 Fix windows build, MessageBox is a defined symbol 
Windows and its stupid defines...
 2015-01-20 17:07:26 +01:00
scrawl
f9cf31fcd5 ESSImport: convert custom map markers, not working for interiors yet 2015-01-19 09:29:21 +01:00
scrawl
bb718f216d Initialize ENAMstruct in SpellCreationDialog (Coverity) 2015-01-12 23:29:58 +01:00
scrawl
de23ad5c8d Change dynamic_cast to static_cast to make coverity happy 2015-01-12 23:29:58 +01:00
scrawl
c3f3f8b3d0 Use only Cell records for saving progress bar (Fixes #2259) 2015-01-11 18:01:06 +01:00
scrawl
f9227beedd Add warning when loading a savegame that depends on non-existing content files (Fixes #2261) 2015-01-11 00:06:52 +01:00
scrawl
579f5d232f Move interactive messageBox to separate function 2015-01-10 23:23:48 +01:00
scrawl
5b9d10f851 Reduce includes in MWGui 2015-01-10 03:56:06 +01:00
scrawl
728b842e72 Use MyGUI::utility in favor of boost lexical_cast 2015-01-10 03:01:01 +01:00
scrawl
eecea4131f Reduce MyGUI includes 2015-01-10 02:50:43 +01:00
scrawl
4b704f665f Reduce includes, move DragAndDrop to separate file 2015-01-10 01:21:17 +01:00
scrawl
eb99ed697b Reduce includes 2015-01-10 01:00:52 +01:00
scrawl
ddd6e682bc Dialogue: add conflict resolution for overlapping keywords (Fixes #2245) 2015-01-09 04:19:38 +01:00
scrawl
928b9ee41b Fix missing GUI mode update when showing soulgem dialog 2015-01-08 16:27:13 +01:00
scrawl
ef7e0070a6 Don't right-shift signed integers which is implementation-defined 2015-01-08 16:27:13 +01:00
Marc Zinnschlag
38a413a483 Merge remote-tracking branch 'scrawl/master' 2015-01-07 20:22:15 +01:00
scrawl
13c5bd5cc2 Enchanting: fix skill-based cast cost bonus being applied twice 2015-01-07 04:41:12 +01:00
scrawl
4e92f6ab48 Add commandline option to load a save game on startup 2015-01-07 03:27:24 +01:00
scrawl
f267497c03 Allow separate summoned creature instances for each spell ID (Fixes #2194) 2015-01-06 16:11:05 +01:00
Marc Zinnschlag
31f6ccdf4d Merge remote-tracking branch 'internecine/bug2031' 2015-01-06 09:43:59 +01:00
scrawl
464f8abb3f List exterior cell names in tab completion (Fixes #2252) 2015-01-06 01:10:09 +01:00
scrawl
c1955ef7fa Fix enchanting dialog effect labels showing a duration for constant effects 2015-01-05 18:57:08 +01:00
Marc Zinnschlag
ec1df719fe Merge remote-tracking branch 'mrcheko/master' 2015-01-02 18:08:47 +01:00
mrcheko
a8621e6230 defaults are set to 1.0; remove contrast setting 
(can be changed in config though); disable gamma control for not Windows
OSs
 2015-01-02 16:49:22 +03:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
scrawl
2f0793390f Fix cut off text for some widgets in the stats window 2014-12-27 01:25:26 +01:00
Marc Zinnschlag
2fa0764c89 Merge remote-tracking branch 'swick/master' 2014-12-26 16:08:07 +01:00
Marc Zinnschlag
da722a5cf1 Merge remote-tracking branch 'miroslavr/master' 2014-12-26 16:05:20 +01:00
Sebastian Wick
764cd9ca16 disable "window border" setting in the ingame settings UI if fullscreen is enabled 2014-12-24 16:31:23 +01:00
scrawl
6f72989cb1 SpellModel, SortFilterItemModel: case insensitive sorting 2014-12-24 15:45:15 +01:00
scrawl
2e5e7370ba Adjust default angle, FOV and viewport of character preview (Fixes #2220) 2014-12-24 15:45:15 +01:00
scrawl
9a1bde684f Sort class list in select class dialog 2014-12-24 15:45:14 +01:00
scrawl
b8fa73dfa9 Preserve record ordering in Store 
This fixes the default head/hair used for some races in the chargen UI.
 2014-12-24 15:45:14 +01:00
scrawl
5d7dcafa53 Make local map widget size configurable 2014-12-24 15:45:14 +01:00
scrawl
0081a68376 Use fMagicStartIconBlink for spell effect indicator fading 2014-12-24 15:45:13 +01:00
scrawl
877e07823d Fix incorrect sound for spell creation success 2014-12-24 15:45:13 +01:00
scrawl
fb542a64ec Merchant items should be restocked instantly 2014-12-24 15:45:13 +01:00
scrawl
37e11b7272 Adjust loading box size for large captions 2014-12-24 15:45:12 +01:00
scrawl
866fdfe8bd Crime system improvements 
- If someone saw the crime, they will notify everyone else in range, even if the Alarm rating of the witness is 0.
- Pickpocket and selling stolen items now works properly, i.e. honors the victim's Alarm rating instead of always being reported.
 2014-12-24 15:45:12 +01:00
scrawl
307b84e9f6 Add enemy health bar fading and use relevant GMSTs 2014-12-24 15:45:12 +01:00
scrawl
a29abb85f1 Fix ItemView sizing bug 2014-12-24 15:45:12 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
Sebastian Wick
e85df00158 change setting "borderless" to "window border" 
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
 2014-12-24 15:09:50 +01:00
Sebastian Wick
639fbfad0b make borderless setting available to the UI 2014-12-22 02:44:20 +01:00
MiroslavR
c796589420 Allow adding multiple Attribute/Skill effects in spell making (Fixes #2224) 2014-12-22 01:54:24 +01:00
Alexander "Ace" Olofsson
462b41a3a8 Missing files, aka; Why you shouldn't stresscommit 2014-12-19 11:26:54 +01:00
Alexander "Ace" Olofsson
0af5c7b379 Starting to clean up some heavy includes 2014-12-19 09:23:16 +01:00
Marc Zinnschlag
899ae763e6 fixing a travis build problem 2014-12-17 09:33:40 +01:00
scrawl
0dc9401269 Fix GUI crash due to outdated spells list 2014-12-15 20:20:17 +01:00
scrawl
ec00c830e5 Fix missing armor rating label update 2014-12-15 19:19:08 +01:00
scrawl
e4127aa491 Use space in ItemView more efficiently 2014-12-15 19:04:53 +01:00
scrawl
c7e1c0b595 Fix weapon cycle getting stuck for same item IDs 2014-12-15 17:49:08 +01:00
scrawl
935cccf974 Implement weapon/spell cycling hotkeys (Fixes #1024) 2014-12-15 16:23:08 +01:00
scrawl
4d5adfb5dd Fix being able to use enchantments of items that failed to equip (Fixes #2215) 2014-12-15 13:47:34 +01:00
scrawl
79237d16a7 Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu 
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
 2014-12-15 13:28:03 +01:00
MiroslavR
c5a604453e Fix several book formatting issues (Fixes #2204) 2014-12-14 16:25:27 +01:00
scrawl
03da21f088 Remove redundant GUI element showing during loading screens 2014-12-12 02:13:50 +01:00
scrawl
e69cf11029 Hide tooltips during loading screens 2014-12-12 02:09:15 +01:00