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

1630 commits

Author SHA1 Message Date
scrawl
c0c1db4490 Don't list non-usable items in QuickKeysMenu selection (Fixes #1427) 2014-06-10 03:28:21 +02:00
scrawl
271aac3fcc Savegame dialog: Grey out buttons if no save is selected 2014-06-10 02:47:02 +02:00
scrawl
311acfa8ff Add delete button to save load menu (Fixes #1453) 2014-06-10 02:27:38 +02:00
scrawl
e0d6670ac4 Move video skip detection to WindowManager 
Fixes a bug where skipping using Esc would not work if a mouse button had been pressed previously
 2014-06-10 01:57:54 +02:00
scrawl
e796fa2313 Add another french morrowind font workaround (Fixes #1447) 2014-06-09 22:18:53 +02:00
scrawl
5488fe1ab3 Change npc training skills to prefer skills with lowest ID if skill values are the same (Fixes #1445) 2014-06-09 03:40:14 +02:00
scrawl
d2dca27067 Correct wrong assertions (Fixes #1425) 2014-06-08 11:25:10 +02:00
scrawl
2ec324c80b Consider all splash screens in the Splash folder (Fixes #1416) 2014-06-08 11:22:37 +02:00
Marc Zinnschlag
0668019c86 Merge remote-tracking branch 'scrawl/master' 2014-06-06 19:09:24 +02:00
scrawl
58d963d6e6 Fix warning 2014-06-06 18:43:30 +02:00
scrawl
9627146bf4 Another fix for trade exploit (hopefully the last: Fixes #1408) 2014-06-06 15:08:44 +02:00
scrawl
40d6c8abf7 Remove horizontal messagebox layout, not used in vanilla (Fixes #1402) 2014-06-06 02:24:51 +02:00
scrawl
6db936bb3a Refactor item icon code into ItemWidget (Fixes #1391) 
- Removed duplicate code
 - Fixed missing magic backgrounds during item drag&drop
 - Change background texture used for HUD icons
 2014-06-05 22:13:18 +02:00
scrawl
1173957e56 Fix item weight displaying as 1e+3 for Stendarr's Hammer 2014-06-05 18:15:48 +02:00
scrawl
17f8b49db6 Add missing padding for item tooltip magic effects 2014-06-05 17:51:15 +02:00
scrawl
4e235516c3 Work around missing character in french morrowind font (Bug #1390) 2014-06-05 16:16:16 +02:00
scrawl
85c9871178 Use question mark for not found glyphs in the font 2014-06-05 16:15:47 +02:00
scrawl
cefa20bfb9 Fix not reacting to quit request while video is playing 2014-06-05 15:52:02 +02:00
Marc Zinnschlag
5313862a46 Merge remote-tracking branch 'scrawl/master' 2014-06-04 15:14:29 +02:00
scrawl
d7f3cd75ac Rewrite journal GUI topic list to use MWList 2014-06-03 16:04:18 +02:00
scrawl
17b15a6f4f Fix overlapping text in SpellWindow when the window is too small 2014-06-03 01:12:31 +02:00
scrawl
bbc5b125ab Rewrite journal GUI quest index 
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
 - Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
 - Fixes a bug where the quest index would not be updated when opened.
 2014-06-03 00:28:33 +02:00
slothlife
281d3b4c95 Fix for dereferencing past end of mGuiModes. 2014-06-02 17:21:13 -05:00
scrawl
577ed3943b Show wallpaper when loading a savegame 2014-06-02 23:26:43 +02:00
scrawl
68afac6a19 Fix large size_t being truncated to int 2014-06-02 19:47:39 +02:00
scrawl
dcc0e2d105 When dialogue goodbye is forced, allow using either the red link or the goodbye button 
Fixes #1373
 2014-06-01 00:21:55 +02:00
scrawl
0f1b39bca4 Fix trade exploit 
Using the Max Sale button it was possible to "invert" the buying/selling state.
 2014-05-31 18:28:00 +02:00
scrawl
a1bdf20958 Make trade balance label editable 2014-05-31 13:53:36 +02:00
scrawl
de7fcf0beb Fix unhandled edge case in TradeItemModel with items that are able to stack, but are not currently stacked (e.g. after repairing a damaged item) 
Fixes #1368
 2014-05-31 13:45:47 +02:00
scrawl
8761aa5795 Loop main menu video when it's finished playing 2014-05-30 14:28:04 +02:00
scrawl
ac77b07e29 Small fix for menu background 2014-05-30 14:28:04 +02:00
Marc Zinnschlag
be88168e91 Merge remote-tracking branch 'scrawl/master' 2014-05-30 10:07:18 +02:00
scrawl
b81c7d05c6 Remove CG shaders from settings window (not fully supported on non-nvidia cards, amd profiles have an instruction limit making them useless) 
Can still be used by editing the config file, however.
 2014-05-29 23:16:36 +02:00
scrawl
6a882e1e8d Don't show hidden factions in StatsWindow (e.g. Nerevarine) 2014-05-29 18:09:04 +02:00
scrawl
3b3b53d665 Support animated main menus (menu_background.bik) 
Closes #1362
 2014-05-29 17:24:25 +02:00
Digmaster
03d7137655 Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button 2014-05-29 06:19:25 -04:00
Digmaster
a5cfa8a049 Removes add behavior when pressing escape while waiting. 2014-05-29 01:52:41 -04:00
scrawl
c6a4506ac2 Make console error prefix slightly less technical (see https://bugs.openmw.org/issues/1194#note-2) 2014-05-28 22:35:36 +02:00
scrawl
41a04b9c65 Slightly adjust menu button position 2014-05-28 21:50:08 +02:00
scrawl
18e24a2007 Fix old savegames causing the save list to not fill properly (Error in framelistener: Object '$dynamic0' not found) 
Fixes #1357
 2014-05-28 21:08:20 +02:00
Digmaster
033f1850f9 Fixed crass on character creation, allowed some character creation windows to be Esc-able 2014-05-27 14:30:26 -04:00
Digmaster
060a50f94a Fixed issue with QuickKeyMenu and ItemSelectionDialog 2014-05-27 13:50:24 -04:00
Digmaster
2b3b11d848 Give access to the main menu when at a choice in dialogue 2014-05-27 05:33:25 -04:00
Digmaster
ee7b5fa5c2 Fixed crash when Esc-ing out of Save "are you sure" dialog. 2014-05-27 04:38:13 -04:00
Digmaster
e0356cf89d Added support to close modal windows with Esc 2014-05-27 03:00:31 -04:00
Digmaster
e0d55116a4 Dims and disabled Goodbye button in dialogs when unavailable. 2014-05-27 00:30:37 -04:00
Digmaster
e3e51324a4 Esc button exits all non-modal GUI windows 2014-05-26 23:13:37 -04:00
scrawl
039398c8ae Basic RefData and CellRef change tracking 
Wrapped item charge handling in getItemHealth function
 2014-05-25 14:30:07 +02:00
scrawl
b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
 2014-05-23 08:39:48 +02:00
Marc Zinnschlag
6ac700a501 Merge remote-tracking branch 'potatoesmaster/getClass' 2014-05-23 08:00:52 +02:00
Marc Zinnschlag
244eb11651 Merge remote-tracking branch 'greye/widechar' 2014-05-23 07:48:26 +02:00
Emanuel Guevel
1e4a854433 Remove static method MWWorld::Class::get(&Ptr) 
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
 2014-05-22 20:50:00 +02:00
scrawl
c6c254d279 Do not trigger levelup if rest was interrupted 2014-05-22 11:08:36 +02:00
scrawl
18bba6bcec Fix layout glitch when autosaving 2014-05-22 11:03:45 +02:00
scrawl
cf07d2ab93 Fix swapped position of Save and Load menu buttons 2014-05-21 16:38:50 +02:00
scrawl
f812746010 Auto-select first save in load dialog 2014-05-21 16:36:55 +02:00
scrawl
abd6b6ab33 Fix not returning to main menu on failed loads when using quickload 2014-05-20 17:11:26 +02:00
scrawl
7ab98f0c6f Clear choices when dialogue starts 
This is usually not needed, because it is not possible to exit dialogue while in a choice. However you can still exit dialogue by loading a different savegame.
 2014-05-20 16:57:38 +02:00
scrawl
220ab86eca Simplify new game movie player 2014-05-20 10:07:08 +02:00
scrawl
6f03694d50 Fixes #1334: Only unequip item if the sell/drag action is actually successful 2014-05-19 08:03:55 +02:00
scrawl
5b76c0893a Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	components/esm/inventorystate.hpp
 2014-05-18 12:55:43 +02:00
greye
e02b04536f fix most vexing parse issue 2014-05-18 14:55:05 +04:00
greye
a22ec223d8 open fstreams from boost::filesystem::path, vol.1 2014-05-18 14:55:05 +04:00
scrawl
90ec19c3ac Remove unneeded MWScrollView 2014-05-18 10:30:03 +02:00
scrawl
150b920ef1 Fix long journal entries not being displayed 2014-05-18 10:14:03 +02:00
scrawl
b4ed828e21 Feature #1323: Implement restocking items (does not handle levelled lists yet) 2014-05-17 14:30:31 +02:00
Marc Zinnschlag
f7c89015f9 Merge remote-tracking branch 'scrawl/master' 2014-05-17 11:50:31 +02:00
scrawl
028e00c98f Add missing status report for some toggle commands 2014-05-16 09:21:28 +02:00
scrawl
940a434479 Use ItemModel for moving items from a container to the world 
Fixes owner not resetting when moving an item from a corpse to the world.
 2014-05-16 03:19:38 +02:00
Marc Zinnschlag
3b2ba4f6cd Merge remote-tracking branch 'scrawl/master' 2014-05-15 14:25:36 +02:00
scrawl
eb40032bde Fix item owner not resetting when dragging an item from a corpse to the player avatar 2014-05-15 09:54:10 +02:00
scrawl
bac4d875df Fix a potential exploit that made it possible to reset the owner of any item 2014-05-15 09:54:10 +02:00
Marc Zinnschlag
d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup' 
Conflicts:
	apps/openmw/mwrender/localmap.cpp
 2014-05-15 08:13:15 +02:00
slothlife
f33559fead Fixes for MSVC warnings, less overall changes 
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
 2014-05-14 20:12:52 -05:00
scrawl
dfacf8c044 Change ActiveSpells to use ActorId 2014-05-14 07:14:08 +02:00
slothlife
c160a04ede Revert "Fixes for warnings when building with MSVC" 
This reverts commit 46eb20b98c.
 2014-05-14 00:03:30 -05:00
scrawl
6cc691115b Savegame: store most of CreatureStats 2014-05-12 21:37:36 +02:00
scrawl
117b812fb1 Fix invisibility not breaking on certain actions 2014-05-12 02:20:56 +02:00
scrawl
961c4d4dc4 Fixes #772: Give scripts a chance to run before updating map, so that disabled objects are not visible 2014-05-11 18:01:47 +02:00
Marc Zinnschlag
368c868623 Merge remote-tracking branch 'scrawl/master' 2014-05-11 11:10:51 +02:00
Marc Zinnschlag
a85c73cf35 Merge remote-tracking branch 'filkry/bug1047dialoglinks' 2014-05-11 11:07:23 +02:00
scrawl
c98bea2a88 Moved local map update to LocalMap::updatePlayer to fix a brief desync on cell transitions due to sFogOfWarSkip 2014-05-11 02:27:43 +02:00
scrawl
7b46e9f914 Get rid of no longer needed widget names 2014-05-11 01:05:49 +02:00
Fil Krynicki
eb5ef270ba Bug 1047 update - defaults and edge case 
Handles edge case where it was possible to highlight adjacent
sub-terms without whitespace between them.

Also makes ignoring words not prefixed by whitespace the
assumed behaviour.
 2014-05-10 17:47:21 -04:00
scrawl
dab4db87ff Fix a bug in marker placement for interior maps 2014-05-10 23:47:00 +02:00
Fil Krynicki
9095a45ba7 Bug 1047 Fix 
Dialog links can no longer be highlighted if they appear in the
middle of the word. This is achieved by confirming that the
character before a match is not alphabetic, so that words
following hyphens can still potentially match.
 2014-05-10 17:05:15 -04:00
scrawl
9fb5cef287 Oops, committed debug code 2014-05-10 21:31:49 +02:00
scrawl
242e19a136 Fix crash when exiting OpenMW while dialogue/journal is opened and mouse cursor on a topic 
(Fixes #1300)
 2014-05-10 01:37:34 +02:00
scrawl
5163358478 Fix a crash when exiting OpenMW while the mouse cursor is over a local map marker 2014-05-10 01:14:12 +02:00
scrawl
d86585b153 Fix clearing of local map markers 
destroyWidget changes the child count, so the for loop is flawed.
 2014-05-10 01:07:40 +02:00
slothlife
46eb20b98c Fixes for warnings when building with MSVC 
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
 2014-05-09 08:32:52 -05:00
scrawl
536fc5e192 Fix autosaves 2014-05-05 22:38:08 +02:00
scrawl
df1694c27b Console autocompletion: List candidates when repeatedly pressing tab (bash-style) 2014-05-02 22:19:02 +02:00
scrawl
8560b43464 Move to esm component 2014-05-02 12:48:07 +02:00
scrawl
f8cc328b5e Slightly prettier backdrop when loading game from main menu. 2014-05-02 12:48:01 +02:00
scrawl
6381b1e938 Fixes #1309: Do not allow saving while dialogs are opened, just like vanilla 
This limitation could be removed post-1.0 by serializing the state of open windows.
 2014-05-02 11:20:43 +02:00
scrawl
17bb8d7f9a Fixes #1252: Add item/magic keybindings to savegame 2014-05-01 21:16:32 +02:00
scrawl
64a30ad182 Fix another leak 2014-05-01 16:55:16 +02:00
scrawl
6f7fbc867f Fix several leaks 2014-05-01 16:55:15 +02:00
scrawl
5415ca6a63 Fix exception when shift+click on empty space in save dialog 2014-05-01 16:55:15 +02:00
Marc Zinnschlag
3013c34d9b Merge remote-tracking branch 'scrawl/master' 2014-04-28 21:46:05 +02:00
scrawl
7a0aeeaa38 Allow to delete savegames (shift + click) 2014-04-28 20:57:45 +02:00
scrawl
a35f7c73ae Fixes #1286 (Dialogue topic list clips with window frame) 
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
 2014-04-28 18:40:29 +02:00
Lars Söderberg
04e5b9c72c Right aligned version/revision 
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.

Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.

Comments?
 2014-04-28 16:23:07 +02:00
Marc Zinnschlag
421679b319 Merge remote-tracking branch 'scrawl/master' 2014-04-28 15:13:09 +02:00
scrawl
7e4a0c2478 Removed asserts 2014-04-28 15:00:52 +02:00
scrawl
27a05027f4 Fixes #1172: Added basic loading/saving progress bar 
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
 2014-04-28 11:29:57 +02:00
Marc Zinnschlag
0b2371a05d Merge remote-tracking branch 'thoronador/fix-minor-stuff' 2014-04-28 10:59:34 +02:00
scrawl
b89463db09 Fix #1207: Remember previous choice in class creation dialog 2014-04-28 09:12:03 +02:00
Thoronador
1b8c975d5b minor performance improvements in apps/openmw 
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.

For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
 2014-04-27 19:10:23 +02:00
scrawl
dac0b7090a Get rid of bigbars.png and smallbars.png 
Changed loading bar colour to match vanilla
 2014-04-27 09:43:48 +02:00
scrawl
93b76a603b Fixes #1100: Looting a corpse is no longer considered stealing 2014-04-27 06:08:08 +02:00
scrawl
e8210c92c6 Fixes #1240: Don't hardcode drowning time 2014-04-27 04:27:26 +02:00
scrawl
04964595ef Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame 2014-04-26 16:44:20 +02:00
scrawl
30666f2cce Fixes #1297: Store global map markers in savegame 2014-04-26 13:42:32 +02:00
scrawl
5b011e43a7 Fix a crash after loading game 2014-04-26 05:01:26 +02:00
Thomas
5b681e2199 Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait. 2014-04-24 03:14:47 -04:00
Thomas
05b21c92af Moved quick save into statemanager class. Kept loader as is as it's rather specalized. 2014-04-24 03:06:36 -04:00
Thomas
6a8bf71c4c Moved autosave to before you rest, not after it. 2014-04-23 23:33:57 -04:00
Thomas
a598060071 Added autosave on rest, as well as an option in the settings menu 2014-04-23 23:12:30 -04:00
cc9cii
1fc030653f Avoid hard coding "thief.dds" string. 2014-04-15 22:30:41 +10:00
cc9cii
89be1069a7 Bug #1260: show thief.dds image for a custom class level up menu 2014-04-14 18:31:46 +10:00
Marc Zinnschlag
4ee1069baa Merge remote-tracking branch 'scrawl/master' 2014-03-31 10:11:54 +02:00
scrawl
f5810b8e1c Consider aspect ratio for loading screen background 
More consistent with the main menu.
 2014-03-30 23:07:49 +02:00
scrawl
1265131203 Set the selected index after all items are added (workaround for MyGUI bug) 2014-03-30 20:07:43 +02:00
cc9cii
d04bb3befb MSVC uses C version of locale. 2014-03-30 17:23:22 +11:00
scrawl
5eeed03f5b Only exchange bribe gold if the bribe was accepted 2014-03-30 00:12:31 +01:00
scrawl
72df9e77c6 Don't show version text in the pause menu 2014-03-30 00:07:32 +01:00
Marc Zinnschlag
adab85eeb7 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-29 13:29:06 +01:00
Jeffrey Haines
6b28c06b2c Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe 2014-03-29 07:47:41 -04:00
Jeffrey Haines
ad9286a30f Revert "Revert "made mReceiver private"" 
This reverts commit 33aecc5218.
 2014-03-29 07:45:56 -04:00
Jeffrey Haines
33aecc5218 Revert "made mReceiver private" 
This reverts commit 3e8f7b3bae.
 2014-03-29 07:45:36 -04:00
Marc Zinnschlag
04baa4a573 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-29 08:14:04 +01:00
Jeffrey Haines
3e8f7b3bae made mReceiver private 2014-03-29 02:59:47 -04:00
Jeffrey Haines
13d330e427 Feature #1233 Bribe gold not in inventory 
Gold is now put into inventory receivers when bribing.
 2014-03-28 21:16:42 -04:00
Marc Zinnschlag
c38812d026 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-28 19:34:40 +01:00
Jeffrey Haines
401d21b4ee getBaseGold implemented in MWWorld::Class for NPC and Creature 
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
 2014-03-28 14:21:38 -04:00
Jeffrey Haines
895748f18d Gold Pool implemented for Vendors 
It appears that my solution breaks persuasion gold for some reason. I
may be wrong. I can’t see where this could be happening as the files
I’ve changes should not affect persuasion at all.
 2014-03-28 12:01:56 -04:00
Marc Zinnschlag
2c2106205d Merge remote-tracking branch 'scrawl/master' 2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21 Bug #1224: Changed fix to potentially allow for language independent saves 2014-03-27 22:32:42 +01:00
scrawl
f2cd37edd0 Play company logo movie 2014-03-27 19:51:48 +01:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01:00
scrawl
2e4ef93b28 Add proper main menu (background image, logo animation, title music) 2014-03-27 15:25:01 +01:00
Jeffrey Haines
6896142db1 Trader Gold Reset Delay 
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
 2014-03-27 07:30:24 -04:00
Jeffrey Haines
2a8bf46607 Trader Gold Reset Delay 
Implemented traded gold reset delay.

Note:
Traders gold pool is still in inventory.
 2014-03-27 01:23:56 -04:00
scrawl
27956f3624 Savegame dialog: Hide main menu after successful load 2014-03-27 02:36:21 +01:00
scrawl
e5e1e84c52 Ask for confirmation to exit OpenMW 2014-03-26 22:05:21 +01:00
scrawl
a5598e9c2e Add Credits button to main menu (plays mw_credits.bik) 2014-03-26 21:38:57 +01:00
scrawl
5562c78ac4 Ask for confirmation when selecting 'New Game' 2014-03-26 21:11:39 +01:00
scrawl
ecfaa41e93 Savegame dialog: use locale-aware datetime format 2014-03-26 20:56:39 +01:00