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

1388 commits

Author SHA1 Message Date
scrawl
eba60858dd Closes #1078: Show stat bar text even when 0 2014-01-02 21:48:33 +01:00
scrawl
299690631f Implement SoulTrap magic effect 2014-01-02 21:21:28 +01:00
Marc Zinnschlag
a6e6411686 Merge remote-tracking branch 'scrawl/master' 2014-01-02 12:12:52 +01:00
scrawl
783c501d70 Some checks to prevent bound item abuse 2014-01-02 01:36:08 +01:00
scrawl
5729672262 Show marked position on map. Implement Detect X magic effects. 2014-01-01 22:37:52 +01:00
Marc Zinnschlag
e1355be47c Merge remote-tracking branch 'lgro/valgrind_warnings' 2014-01-01 19:41:52 +01:00
Marc Zinnschlag
c3482b6f24 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/openmw/mwmechanics/spellcasting.cpp
 2014-01-01 15:05:42 +01:00
scrawl
c86760e3cd Remember the last known exterior position of the player in case we fail to map the interior to a world position. 2014-01-01 01:10:55 +01:00
scrawl
3604b9d171 Closes #566: In interior cells, update global map position marker using the first exterior teleport door 2013-12-31 18:35:46 +01:00
Alexander "Ace" Olofsson
8381cad5a4 Don't try to set a cursor before one exists 2013-12-31 14:13:42 +01:00
Lukasz Gromanowski
cb04f43384 Fixes for "Conditional jump or move depends on uninitialised value(s)" 
and memleaks reported by valgrind.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-30 23:08:53 +01:00
scrawl
04f9f7af56 Closes #990: Add option to unlock mouse cursor when in any menu 2013-12-29 00:58:48 +01:00
scrawl
2a8ab932ef Bug #951: Only recalculate derived stats when attributes change 2013-12-28 17:19:35 +01:00
scrawl
02277db685 Bug #1052: Don't use set/getOnlyText which discards escape characters 2013-12-27 19:52:10 +01:00
scrawl
30b1da996b Issue #1029 - Quick keys menu: Select compatible replacement when tool used up 2013-12-27 00:51:29 +01:00
scrawl
a3017e16d4 Don't allow changing the spell that is being cast mid-animation 2013-12-26 22:32:39 +01:00
scrawl
a9e1e89bbc Bug #1007: Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible 2013-12-26 20:53:51 +01:00
scrawl
31c1f484ed Slight performance improvement for WindowManager::updateVisible 2013-12-26 20:53:51 +01:00
scrawl
b6bad969a0 Fix an issue with items that have no UI icon 2013-12-26 20:53:51 +01:00
scrawl
a0d38dfb63 Fix highlighted topics being selectable when in a choice 2013-12-19 00:26:08 +01:00
scrawl
eb5e4ecec2 Remove more unused code 2013-12-16 15:35:38 +01:00
Emanuel Guevel
357ecd92b2 Do not display negative stat values 
Display zero instead of negative values.
Also remove useless for loops and some unused attributes.
 2013-12-10 00:41:36 +01:00
Marc Zinnschlag
77a2179d1e Merge remote-tracking branch 'scrawl/master' 2013-12-09 18:39:34 +01:00
scrawl
0bc3a13c0f Break invisibility on Use or Activate 2013-12-08 23:36:37 +01:00
Marc Zinnschlag
ef8c0fab73 Merge remote-tracking branch 'scrawl/master' 2013-12-07 16:26:52 +01:00
scrawl
742e0e014d Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline. 2013-12-07 14:15:51 +01:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +01:00
Lukasz Gromanowski
e01085cac5 Fixes #1015: Player status window scroll state resets on status change 
Removed resetting scroll state position.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-07 02:57:30 +01:00
scrawl
f695deb29d Remember window positions 2013-12-05 15:46:23 +01:00
Marc Zinnschlag
ee6ddc3404 block saving while chargen is in progress 2013-12-05 14:56:30 +01:00
Marc Zinnschlag
e818d43bc3 removed an outdated typedef and some dead code 2013-12-05 13:21:26 +01:00
Marc Zinnschlag
63721682f6 GUI fix: previous character was selected when saving new character 2013-12-03 15:19:13 +01:00
Marc Zinnschlag
0f971163f7 use Entry instead of plain string for topic and quest entries 2013-12-01 14:50:25 +01:00
Marc Zinnschlag
b273f9e387 splitting JournalEntry into Entry and JournalEntry 2013-12-01 14:44:27 +01:00
Marc Zinnschlag
43f5f16731 removed a todo comment 2013-11-30 12:54:44 +01:00
Marc Zinnschlag
177aab536d storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1) 2013-11-30 12:41:18 +01:00
Marc Zinnschlag
aebc2791a5 fixed selecting current character based on value stored in settings 2013-11-30 11:08:41 +01:00
scrawl
e1e9de0f02 Don't hide tooltips on mouse click. Probably wasn't such a bright idea. 2013-11-30 09:04:52 +01:00
scrawl
6aa9e18915 Reset filter when starting a trade 2013-11-30 08:33:18 +01:00
scrawl
20ccfe2324 Play sound when enchanting 2013-11-28 11:37:30 +01:00
Marc Zinnschlag
71436b1160 changed interface for global variable access 2013-11-28 09:10:38 +01:00
scrawl
03c4b680ca Fix changePointer 2013-11-27 18:49:04 +01:00
Marc Zinnschlag
99ea63dc4a factored out code for generating month names 2013-11-26 12:47:30 +01:00
Marc Zinnschlag
e6dc927f11 removed duplicates of the cell name function 2013-11-26 11:49:07 +01:00
Marc Zinnschlag
eea433f141 restore last played character selection across sessions 2013-11-26 10:37:58 +01:00
Marc Zinnschlag
e3670cff8a improved character selection logic 2013-11-24 16:58:41 +01:00
Marc Zinnschlag
67cd0887e6 added description field to saved game record; make use of description in GUI 2013-11-24 15:19:56 +01:00
Marc Zinnschlag
7efac4c9a5 fixed handling of characters without a valid slot 2013-11-24 15:05:00 +01:00
scrawl
14c9a4e1d3 Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window. 2013-11-23 23:12:54 +01:00
scrawl
f3e89e9168 Fix arrow down in console 2013-11-23 22:48:39 +01:00
scrawl
2e87cbc231 Add basic functionality to SaveGameDialog 2013-11-21 20:34:34 +01:00
scrawl
cf79a83d4f Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate. 2013-11-21 19:07:54 +01:00
scrawl
b6c22ad5d9 Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount. 2013-11-21 17:19:30 +01:00
scrawl
bab657fe2b Add a utility function to add items to a ContainerStore by RefID 2013-11-21 17:14:30 +01:00
Marc Zinnschlag
c165894869 load saved game record 2013-11-21 12:24:24 +01:00
scrawl
7f735c2c4c Release and show the cursor when focus lost 2013-11-20 16:07:14 +01:00
scrawl
5a4bd9b202 Remove software cursor option, hw cursors seem to be working well enough 2013-11-20 06:20:16 +01:00
scrawl
fa63924884 Simplify message box manager, should fix a random bug with boxes not disappearing 2013-11-20 05:49:05 +01:00
Marc Zinnschlag
5e64888227 added basic save slot management and connected main menu save to save function (bypassing the save GUI for now) 2013-11-19 15:38:26 +01:00
scrawl
74e42a2d02 Add missing skill increases for Enchant skill 2013-11-19 07:39:07 +01:00
scrawl
cab535dd69 Implement magic item recharging via soulgem use 2013-11-19 06:48:47 +01:00
scrawl
16e5477c60 Fix an uninitalized member 2013-11-19 02:17:44 +01:00
Marc Zinnschlag
1c7a4d4b3a adjust availability of main menu items based on game state 2013-11-18 15:52:25 +01:00
scrawl
0dc2e829dd Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX. 2013-11-17 23:31:08 +01:00
scrawl
2a11618ee7 Make sure the equipped weapon HUD icon is updated properly 2013-11-17 23:31:07 +01:00
scrawl
b8f5cd6cb7 Forgot to apply the same fix to companion window 2013-11-16 23:55:54 +01:00
scrawl
7eb1dcb682 Fix trade windows crashing after a new game 2013-11-16 22:29:40 +01:00
Marc Zinnschlag
ec5b2e9a7e added running flag; moved new game code to MWState 2013-11-16 12:22:28 +01:00
Marc Zinnschlag
f19973450f moved exit game flag from Environment to StateManager 2013-11-16 11:07:23 +01:00
scrawl
b1a29eb27e Implement Resist & Weakness effects 2013-11-16 02:34:43 +01:00
scrawl
aa4b2d9504 Fix uninitialized mSkill/mAttribute for spellmaker spells 2013-11-16 01:19:39 +01:00
scrawl
c73217627e Move code for listing effect sources to the spell management classes 2013-11-15 20:29:47 +01:00
Marc Zinnschlag
eddd6bf48d enabled load and save items in main menu 2013-11-15 10:29:53 +01:00
scrawl
065f14579f Fix a container window regression (oops) 2013-11-15 02:57:21 +01:00
scrawl
992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 2013-11-14 14:41:10 +01:00
scrawl
956d8adb99 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic 
Conflicts:
	apps/openmw/mwgui/inventoryitemmodel.cpp
 2013-11-14 14:25:22 +01:00
Marc Zinnschlag
9f0dac00ec silenced a warning 2013-11-14 12:22:24 +01:00
scrawl
a6e2f43b75 Stop continuous VFX when the effect is no longer active. 2013-11-13 15:44:43 +01:00
Marc Zinnschlag
a8274e5c86 Merge remote-tracking branch 'potatoesmaster/inventory-fix' 2013-11-13 13:55:24 +01:00
Emanuel Guevel
baf13483c0 Update actor model only when in the current cell 2013-11-13 00:04:04 +01:00
scrawl
60bec03987 Rename variables called 'slots' to work around wrong code parsing in QT Creator. 2013-11-12 23:23:19 +01:00
scrawl
700d06764c Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack. 2013-11-12 22:58:56 +01:00
scrawl
6f3d737498 Missing const, thanks to jeaye 2013-11-10 23:27:11 +01:00
scrawl
1773c70455 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic 2013-11-10 22:03:17 +01:00
Emanuel Guevel
f428921b93 Always update the source container view on drag&drop 
This fix the indicator not being displayed for items auto-equipped
after an other item is removed.
 2013-11-10 02:45:17 +01:00
Emanuel Guevel
4fcf427e1f InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged 
The unequipped item is also re-stacked if needed.
 2013-11-10 02:45:17 +01:00
Emanuel Guevel
aefa54d72d Pass item count to ManualRef constructor 
This remove the need to call setCount in multiple places.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
2786530430 Edit InventoryStore::equip() to call the new unequipSlot function… 
…to unequip previously equipped item.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
10abb9d297 Call ContainerStore::remove() to remove items from inventory 
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).

Enchanting an item now unequips it.
 2013-11-10 02:45:16 +01:00
scrawl
5c148a3d41 Fix effect source display 2013-11-09 11:09:44 +01:00
Marc Zinnschlag
8be3ffc2a0 Merge remote-tracking branch 'scrawl/magic' 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-11-09 10:54:51 +01:00
scrawl
cbe96a2170 Refactor ActiveSpells to track range type. Added basic self range magic. 2013-11-09 07:51:46 +01:00
Jordan Ayers
3fbf918751 Chargen Review Dialog: Init fix. 
Load the starting Health/Magicka/Fatigue from the player stats when
creating the Review Dialog, and remove the extra copy of these stats.
In some cases, the old stat values were never updated from 0/0.
 2013-11-06 23:19:53 -06:00
Jordan Ayers
d48cc27a89 Chargen fix: Back sequence control. 
Related to bug #894.
Eliminate double windows when using 'Back' from the review screen.
Force consistent back behavior (handling was changing after
a individual change button had been used).
 2013-11-06 23:19:53 -06:00
Jordan Ayers
e94da61ff0 Chargen cleanup. 
Move common gui state pop out of if checks.
Move health update before gui state push (used as input for some windows).
 2013-11-06 23:19:53 -06:00
scrawl
9e2b1942fc Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found. 2013-11-05 22:50:53 +01:00
scrawl
bf5529819d Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog. 2013-11-05 19:50:24 +01:00
scrawl
4f35fd8184 Removed a workaround from Renderer, some cleanup 2013-10-30 13:05:28 +01:00
Alex "rainChu" Haddad
23eaf90846 Breath meter flashes when drowning 2013-10-27 04:05:01 -04:00
Emanuel Guevel
ba4b8a37e2 Remember pressed message box button longer 
Remember which button was pressed until a new interactive message box is
displayed or until the pressed button number is read.

Before that, it was not possible to get the pressed button after the
message box was hidden/destroyed.
 2013-10-14 12:55:06 +02:00
Marc Zinnschlag
ce8694c84e Merge remote-tracking branch 'scrawl/master' 2013-10-13 18:55:49 +02:00
scrawl
683ad40e21 No need for this ifdef since there is a default argument. 2013-10-13 18:28:22 +02:00
scrawl
fa264935ff We can apply vsync at runtime now that the Ogre bug is fixed. 2013-10-13 17:56:26 +02:00
scrawl
f504ab42fe Turn off vsync while in the loading screen 2013-10-13 17:52:14 +02:00
Marc Zinnschlag
2606feec3a Merge remote-tracking branch 'lgro/cfg_without_data_path' 2013-10-12 13:52:38 +02:00
Lukasz Gromanowski
5ce1f50fab Cleanup in MWGui::WindowManager constructor initialzation list. 
Corrected order of initialization list, and added missing
member field initializations - without this openmw crashes when
installer is interrupted and there are no valid data path
in openmw.cfg, as reported by BrotherBrick in:

https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-10-10 23:06:37 +02:00
Jordan Ayers
6e4978643c Magic Effect descriptions: support feet / level modes. 
Show proper suffixes for all magnitudes.
Drop extra 'times' symbol in 'timesInt format (not consistent
with other magnitude displays).
 2013-10-09 00:08:11 -05:00
Jordan Ayers
6ab7002908 MagicEffect: Put magnitude type into ESM::MagicEffect helper. 2013-10-07 22:28:55 -05:00
Jordan Ayers
065f435225 Format fix: remove extra spaces from ranged TimesINT formatting. 2013-10-07 20:02:20 -05:00
Jordan Ayers
6303e56ce4 Magic Effect Display cleanup: Don't put spaces in percentages. 2013-10-06 20:35:59 -05:00
Jordan Ayers
707f45aa8e Magic Effect Display improvement. 
Related to Bug #794.
Always show one decimal point precision for Fortify Max. Magicka effect.
 2013-10-06 20:26:39 -05:00
Jordan Ayers
6983a55a16 Magic effect display improvement. 
Related to Bug #794.
Show the "x INT" notation for Fortify Max. Magicka.
Show "%" notation for weakness / resistance effects.
 2013-10-06 19:32:40 -05:00
Marc Zinnschlag
0f1c4cb00e cleanup 2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c Switched to using proper enums as opposed to ints. 2013-09-23 08:31:36 -04:00
Berulacks
0c518fb047 Replaced tabs with spaces. 2013-09-23 07:36:50 -04:00
Berulacks
c423479f20 Fixed bug #887 2013-09-23 07:31:14 -04:00
scrawl
d5ef843f56 Fix a missing model update 2013-09-16 19:22:08 +02:00
scrawl
09e692f1f6 Fixed polish font 2013-09-10 22:11:57 +02:00
scrawl
5918b84666 Don't crash on resize events during load 2013-08-28 17:05:28 +02:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
scrawl
c6d2d1999a Fix an item duplication glitch 2013-08-25 17:40:08 +02:00
vorenon
3bf3bd4b8c Silenced some warnings 2013-08-21 13:53:49 +02:00
scrawl
0545622f5a Fix werewolf state not getting completely reset when starting a new game 2013-08-20 11:24:19 +02:00
scrawl
ebf9debb80 Enabled terrain self shadows, implemented getHeightAt, some optimizations 2013-08-19 20:39:37 +02:00
Chris Robinson
2853b56ed5 Throw an exception when trying to get an empty Ptr's type 2013-08-15 04:52:01 -07:00
Chris Robinson
48c07fbd98 Remove some unnecessary fields from Ptr 2013-08-14 17:05:42 -07:00
Marc Zinnschlag
e2e76147c8 Merge remote-tracking branch 'potatoesmaster/magic' 2013-08-13 15:36:43 +02:00
Emanuel Guevel
ad3646cb15 Fix spell icons displayed when effect ended 2013-08-13 04:57:45 +02:00
Emanuel Guevel
37ea0f3fb9 Display refusal message when weapon/magic icons are clicked as werewolf 2013-08-12 15:36:16 +02:00
Emanuel Guevel
997f37700d Display HUD icons for hidden windows 2013-08-12 15:06:09 +02:00
Emanuel Guevel
c27c33f542 Fix pinned windows hiding 
They were always displayed in console mode and in game (even if they
were force hidden).
 2013-08-12 15:04:41 +02:00
Chris Robinson
5968165de0 Merge remote-tracking branch 'zini/master' into werewolf 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2013-08-09 07:00:00 -07:00
Chris Robinson
46bc7bd9c8 Some cleanup since NpcStats is now also CreatureStats 
This isn't a thorough cleaning, so keep an eye out for more
 2013-08-09 01:14:08 -07:00
Marc Zinnschlag
fb0b57efaa Merge remote-tracking branch 'vorenon/bug876' 2013-08-09 09:38:10 +02:00
Chris Robinson
6110a0ee3b Don't allow resting as a werewolf 2013-08-08 18:30:47 -07:00
Chris Robinson
5fbfce6d1e Don't show WerewolfRobe objects in the inventory 
Pretty ugly hard-coding, but this is likely what vanilla does since it
has no option to mark clothes or armor as unplayable like Oblivion does.
 2013-08-08 16:05:26 -07:00
vorenon
a718a62ef5 Fix for bug 876 2013-08-09 00:06:34 +02:00
Chris Robinson
3cff7b1e42 Don't assume icons have a period in their filename 2013-08-08 04:40:31 -07:00
Marc Zinnschlag
e9521dc8f1 Merge remote-tracking branch 'potatoesmaster/pinning' 2013-08-08 13:06:58 +02:00
Chris Robinson
2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
 2013-08-08 00:09:29 -07:00
Emanuel Guevel
b2e5e8dd0d Saner inventory window pinning/hiding 
Hide inventory window pin button in container, companion and barter mode.
Restore the pinned inventory window position when exiting these modes.
Allow toggling windows visibility in inventory mode only.
 2013-08-07 23:30:08 +02:00
Alex
a0931b01fe Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg 2013-08-07 13:19:23 -04:00
Alex
c3ca5b7c32 mild cleanup 2013-08-07 13:16:20 -04:00
PLkolek
8f4506f5b6 Implemented drowning. 
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
 2013-08-07 16:46:46 +02:00
Emanuel Guevel
48d2554ac3 Auto-equip when items are added to the inventory 
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
 2013-08-07 15:17:55 +02:00
Alex
de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 2013-08-06 20:38:41 -04:00
Emanuel Guevel
ddc92d1fbd Set appropriate weapon icon when player is a werewolf 2013-08-06 12:34:35 +02:00
Emanuel Guevel
d054366460 Permit to force hiding GUI windows 2013-08-06 12:34:35 +02:00
Emanuel Guevel
8f8362d2c4 Expose sneak indicator widget through WindowManager 2013-08-03 03:03:29 +02:00
Emanuel Guevel
9757694060 Update sneaking indicator position with other widgets 2013-08-03 02:43:56 +02:00