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
8541 commits 38 branches 54 tags 122 MiB
Commit graph

6218 commits

Author SHA1 Message Date
scrawl
b8ac37347c Code cleanup for Class::canBeEquipped 2013-12-30 19:04:35 +01:00
scrawl
79a440e94a Many additions to 900bc06d2c: 
- Fix indentation
 - Consider any kind of light, not just torch_infinite_time
 - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
 - Remove redundant code and don't add additional lights to the inventory
 - World::isDark returns false for interiors which are unaffected by weather
 2013-12-30 17:57:41 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
Lukasz Gromanowski
c65f018760 Fixes #417: Apply weather instantly when teleporting 
Corrected constant name.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-29 15:09:49 +01:00
Marc Zinnschlag
6de39a7329 Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day' 
Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2013-12-29 15:00:31 +01:00
Lukasz Gromanowski
faf8011c48 Fixes #417: Apply weather instantly when teleporting 
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-29 12:47:44 +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
17ff8165d2 Closes #1065: Don't apply fall damage when landing in water 2013-12-29 00:36:36 +01:00
scrawl
2a8ab932ef Bug #951: Only recalculate derived stats when attributes change 2013-12-28 17:19:35 +01:00
Lukasz Gromanowski
100edda8c0 Fixes #417: Apply weather instantly when teleporting 
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-28 16:15:34 +01:00
scrawl
596c9b80a9 Check if threads are joinable before joining (issue with boost 1.52) 2013-12-27 22:38:30 +01:00
scrawl
85ec80100c Bug #1005: Hide torches/shields during spellcasting and hand-to-hand combat 2013-12-27 22:00:16 +01:00
scrawl
7265b427fe Bug #1013: Rewrote fall height detection 2013-12-27 21:21:18 +01:00
scrawl
02277db685 Bug #1052: Don't use set/getOnlyText which discards escape characters 2013-12-27 19:52:10 +01:00
scrawl
686d9efac3 Bug #1060: Fix incorrect spell type checks 2013-12-27 18:58:35 +01:00
scrawl
27092a4494 flagAsModified should be private 2013-12-27 18:58:35 +01:00
scrawl
6400f23ab0 Use the material controller manager for effects with overridden texture 2013-12-27 14:54:36 +01:00
scrawl
d262d9e6b0 Bug #1054: Set render queue group for effects 2013-12-27 14:51:59 +01:00
scrawl
1c60a781a5 Add header to CMakeLists 2013-12-27 14:42:22 +01:00
scrawl
561c661156 Reset starting angle / position when adding world item to a container 2013-12-27 01:57:08 +01:00
scrawl
608bd0f525 Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028 2013-12-27 01:34:56 +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
5a287a7e01 Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData. 2013-12-27 00:41:19 +01:00
scrawl
d09a86e208 Issue #1018: Don't allow view mode switching while performing an action 2013-12-27 00:36:06 +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
5054d8e6c1 Bug #1055: Check power use and mana before starting cast animation 2013-12-26 22:06:13 +01:00
scrawl
71d9755ef1 Bug #991: Don't autoequip items with harmful permanent enchantments 2013-12-26 21:26:59 +01:00
scrawl
5931fdcbde Implement NiBillboardNode. Flags not handled yet. 2013-12-26 20:53:52 +01:00
scrawl
a3ff9e5be8 Change destruction order - fixes a shutdown crash discovered with mesa 2013-12-26 20:53:52 +01:00
scrawl
fb845e81a4 Rename nosound to no-sound for consistency 2013-12-26 20:53:52 +01:00
scrawl
85ed21dbd2 Remove unused command line option 2013-12-26 20:53:51 +01:00
scrawl
33389b9b63 XDG compliant paths 2013-12-26 20:53:51 +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
81ec8c2f55 Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense 2013-12-26 20:53:51 +01:00
scrawl
6d27ebabb6 Integrate AddGlow with material controllers 2013-12-26 20:53:45 +01:00
Lukasz Gromanowski
900bc06d2c Fixes #845: NPCs hold torches during the day 
Moved 'equipping torches at night and unequipping at day' code from Character
to Actors class.

Removed unneeded showLights method (introduced in previous commits)
from animation/npcanimation classes.

Since this commit autoEquip() method doesn't automatically equip lights.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-20 22:38:23 +01:00
Lukasz Gromanowski
abc126e2af Fixes #845: NPCs hold torches during the day 
Added check for Player character so it won't be affected by showing,
or hidding torches.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-20 01:01:30 +01:00
Lukasz Gromanowski
6eb674e4e5 Fixes #845: NPCs hold torches during the day 
Added equipping/unequipping torches.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-20 00:18:34 +01:00
Lukasz Gromanowski
92072d968b Fixes #845: NPCs hold torches during the day 
Simplified a bit code which shows and hides light.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-19 21:11:07 +01:00
Marc Zinnschlag
16b3927f17 Merge remote-tracking branch 'scrawl/master' 2013-12-19 14:26:41 +01:00
scrawl
9afdf71af3 Fix crash with player->position command 2013-12-19 00:37:57 +01:00
scrawl
a0d38dfb63 Fix highlighted topics being selectable when in a choice 2013-12-19 00:26:08 +01:00
scrawl
876fb9a899 Addition to bb4bd999ba : adjust position for objects placed from inventory 2013-12-19 00:11:14 +01:00
pvdk
da9b67b6d2 Fix for Bug #922: Launcher writing merged openmw.cfg files 2013-12-16 20:40:58 +01:00
scrawl
eb5e4ecec2 Remove more unused code 2013-12-16 15:35:38 +01:00
scrawl
19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/main.cpp
 2013-12-16 13:35:31 +01:00
scrawl
56893a097d Don't stack used torches 2013-12-16 13:31:03 +01:00
scrawl
cd756a8a39 Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips. 2013-12-16 13:22:27 +01:00
Marc Zinnschlag
0890fa66b0 Merge remote-tracking branch 'mrcheko/master' 2013-12-13 18:47:11 +01:00
mrcheko
8b3a393a6b bug fix at http://bugs.openmw.org/issues/985 2013-12-13 19:33:01 +02:00
mrcheko
c8bf69b91a Revert "bug fix http://bugs.openmw.org/issues/985" 
This reverts commit 7a9b64c6f4.
 2013-12-13 19:02:25 +02:00
scrawl
39eea24dc3 Don't try to show exceptions in a message box if SDL was not initialized 2013-12-13 03:50:01 +01:00
mrcheko
7a9b64c6f4 bug fix http://bugs.openmw.org/issues/985 2013-12-12 16:09:38 +02:00
Lukasz Gromanowski
91a4d9a2eb Fixes #845: NPCs hold torches during the day 
Added method in WeatherManger and World which returns true if it is night.
This method is used later in character controller to show torches
(or other sources of light) at night and hide them at day.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-10 23:48:49 +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
Emanuel Guevel
fc8bd1aacb Allow fatigue stat to become negative when fatigue damages are taken 2013-12-09 21:53:04 +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
scrawl
5fd2df5546 Ignore invisible targets for combat AI 2013-12-08 23:21:23 +01:00
scrawl
37a7ee8fcd Set alpha value of character animations according to Invisibility / Chameleon effects. 2013-12-08 23:05:21 +01:00
Lukasz Gromanowski
594cc693b2 Fixes #1006: Many NPCs have 0 skill 
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-08 21:47:43 +01:00
Lukasz Gromanowski
8d63f8eea2 Fixes #998: Setting the max health should also set the current health 
Added setting current value of dynamic stat in OpSetDynamic class.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-07 21:00:46 +01:00
scrawl
1624e0fd8a Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine. 2013-12-07 20:15:39 +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
scrawl
bb70deabb1 Add an incomplete implementation of SayAnimationValue (lip animation) 2013-12-07 14:15:45 +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
Marc Zinnschlag
48b779af80 Merge remote-tracking branch 'ace/win-fix' 2013-12-06 15:17:34 +01:00
Alexander "Ace" Olofsson
baacf91de4 Another windows build fix 2013-12-06 11:37:29 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
Marc Zinnschlag
07f692bdd2 Merge remote-tracking branch 'scrawl/master' 2013-12-05 16:04:50 +01:00
scrawl
845bc5f7eb Show fatal exceptions in a message box instead of cerr when running without a terminal 2013-12-05 15:51:07 +01:00
scrawl
afa71bb622 Throw an exception if a BSA is not found 2013-12-05 15:51:07 +01:00
scrawl
9ab8fe1038 Fix bsatool warning 2013-12-05 15:46:33 +01:00
scrawl
f695deb29d Remember window positions 2013-12-05 15:46:23 +01:00
scrawl
8f4ffe4ddc Fix new window size not being written to settings when manually resizing window 2013-12-03 15:55:31 +01:00
Marc Zinnschlag
2fe135d85f journals subview was bound to the wrong universal ID type 2013-12-02 16:25:26 +01:00
Marc Zinnschlag
c94f006307 Merge remote-tracking branch 'scrawl/master' 2013-11-30 15:06:09 +01:00
scrawl
8391891a5b Ignore case for content file extensions 2013-11-30 14:25:29 +01:00
pvdk
46973e8e82 Fix for Bug #982: unchecking addons is now saved to profile 2013-11-30 12:08:37 +01:00
Marc Zinnschlag
8b3e852ffc Merge remote-tracking branch 'scrawl/master' 2013-11-30 11:09:38 +01:00
scrawl
4b4025ed0f Keep the player's CharacterController when changing cells. Fixes several glitches. 2013-11-30 11:01:45 +01:00
Marc Zinnschlag
016500af98 Merge remote-tracking branch 'scrawl/master' 2013-11-30 09:45:46 +01:00
Marc Zinnschlag
04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 2013-11-30 09:45: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
bb4bd999ba PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod. 2013-11-30 08:29:22 +01:00
scrawl
0e267b79ec Don't heal dead actors when resting 2013-11-29 20:21:57 +01:00
scrawl
bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 2013-11-29 20:06:54 +01:00
scrawl
ce2d521b8f Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra". 
When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.
 2013-11-29 20:03:50 +01:00
scrawl
ffc885853a Fix bolt for magic effects that don't have one specified 2013-11-29 10:39:37 +01:00
scrawl
b82ee4b44f Fix some problems with the previous commit 2013-11-28 21:49:15 +01:00
scrawl
076cc9230b First try at handling target magic 2013-11-28 17:31:17 +01:00
scrawl
20ccfe2324 Play sound when enchanting 2013-11-28 11:37:30 +01:00
scrawl
97fadb24ca Update the Ptr in mObjects in Objects::updateObjectCell 2013-11-27 18:49:04 +01:00
scrawl
03c4b680ca Fix changePointer 2013-11-27 18:49:04 +01:00
scrawl
a8c838b53a Don't list deleted refs in CellStore::foreach 2013-11-27 18:49:04 +01:00
scrawl
49ea1aae67 Use GMST for sun damage reduction 2013-11-26 15:01:22 +01:00