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

11536 commits

This branch
This branch
All branches
Author SHA1 Message Date
cc9cii
312b7cd571 Merge branch 'master' into QtOGre 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
 2014-09-30 10:52:04 +10:00
Marc Zinnschlag
a5049fd7b0 Merge remote-tracking branch 'scrawl/master' 2014-09-27 10:14:18 +02:00
scrawl
e868a48a63 Don't trigger OnPcHitMe for friendly hits (Fixes #1950) 
Don't consider actors as followers if they are also in combat with the follow target
 2014-09-26 22:08:07 +02:00
scrawl
4b8ea25cf0 Add missing case folding for dependency filenames (Fixes #1940) 2014-09-26 20:47:53 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
790e0150b1 Fix global map markers being duplicated when cell is visited again 2014-09-26 16:51:48 +02:00
scrawl
6b82e3665b Remove old nifbullet test 2014-09-26 16:10:55 +02:00
scrawl
487e318ede Remove old niftool test 2014-09-26 15:25:51 +02:00
scrawl
fc4f069d0f Remove old BSA tests 2014-09-26 15:22:08 +02:00
scrawl
18be152ab1 Allow dragging map even when a marker is hovered 2014-09-26 14:27:52 +02:00
scrawl
603e558fb7 Fix broken getCollidingPc / getCollidingActor (cppcheck) 2014-09-26 14:16:46 +02:00
scrawl
97df7c9b22 Get rid of markers.png and use original MW texture, cleanup 2014-09-26 13:40:10 +02:00
scrawl
4f0fc79ea4 Change global map cell size from 24 to 18 and make it configurable 2014-09-26 12:47:33 +02:00
scrawl
764c6287e1 Remove some garbage 2014-09-26 12:36:55 +02:00
Marc Zinnschlag
39b6659045 Merge remote-tracking branch 'scrawl/master' 2014-09-26 10:44:08 +02:00
scrawl
9fbc7ebc02 Tweak CountDialog layout 
First time using the LayoutEditor. Success!
 2014-09-25 21:04:59 +02:00
scrawl
b75b464495 Move Cancel buttons to right side of dialog (Fixes #1715) 2014-09-25 21:04:58 +02:00
scrawl
0bc840aadd Add NumericEditBox widget 2014-09-25 21:04:51 +02:00
scrawl
e4c097b4f7 Fix wrong default ExpandDirection for AutoSizedButton 2014-09-25 19:22:26 +02:00
scrawl
f56711f443 Fix crash caused by teleportation spells (Fixes #1904) 2014-09-25 18:14:04 +02:00
scrawl
8ad2b95208 Revert "AiFollow: return from execute() if target is not player" 
This reverts commit 061c7813f6.

Fixes #1898.
 2014-09-25 17:57:10 +02:00
scrawl
40ce5add59 Don't report crime for attacking an NPC that is already in combat with another NPC (Fixes #1908, Fixes #1821) 2014-09-25 17:33:26 +02:00
scrawl
f721b7adfb Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them 2014-09-25 16:41:27 +02:00
scrawl
6b65502557 Add properties for new widget classes to MyGUI plugin 2014-09-25 16:25:08 +02:00
scrawl
2066097202 Fix incorrect reading of global map state in some cases when the map size changed (Fixes #1946) 2014-09-25 15:28:02 +02:00
scrawl
ad318c1f9d Add XML definition file for the MyGUI plugin 2014-09-25 15:07:15 +02:00
scrawl
40587f984d Implement price-based mercantile skill progress (Fixes #1947), thanks Hrnchamd 
Correct barter formula (removed erroneous clamping)
 2014-09-25 13:02:42 +02:00
scrawl
1afcc7adb5 Add imported font colors from openmw.cfg to MyGUI plugin 2014-09-25 00:04:38 +02:00
scrawl
62ab35881e Don't advance skills in werewolf mode (thanks Hrnchamd) 2014-09-25 00:03:55 +02:00
scrawl
088d01d727 Minor cleanup 2014-09-24 23:50:28 +02:00
Marc Zinnschlag
f5e493de7e Merge remote-tracking branch 'scrawl/master' 2014-09-24 20:20:58 +02:00
scrawl
62ea913e69 Fix cmake warning 2014-09-24 20:09:48 +02:00
Marc Zinnschlag
16f4fbdbd8 Merge remote-tracking branch 'lgro/updated_credits' 2014-09-24 12:43:57 +02:00
scrawl
0f99a959eb Update barter offer for all items when another item is added (Fixes #1935) 2014-09-24 12:21:19 +02:00
scrawl
a7c0e07d78 Add missing World cleanup for mLevitationEnabled 2014-09-24 12:21:19 +02:00
scrawl
5d77c5e8ca Transfer item ownership to the buyer if item wasn't stolen (Fixes #1933) 2014-09-24 12:21:19 +02:00
scrawl
45b4304237 Store levitation/teleport enabled state in savegames (Fixes #1923) 2014-09-24 12:21:19 +02:00
Lukasz Gromanowski
aabbcd6ce4 Added Okulo's name and surname, moved Nekochan to the inactive contributors. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-09-23 23:01:52 +02:00
Marc Zinnschlag
175d4f3d44 Merge remote-tracking branch 'ragora/playdeathlevelupmusic' 2014-09-23 13:30:50 +02:00
Marc Zinnschlag
56858c98b1 Merge remote-tracking branch 'miroslavr/master' 2014-09-23 13:23:00 +02:00
Ragora
06e683d378 Added code to play music on level up and on death 2014-09-23 04:58:19 -04:00
Marc Zinnschlag
147bffa7dd Merge remote-tracking branch 'slothlife/msvc-warning-fix' 
Conflicts:
	CMakeLists.txt
 2014-09-23 08:57:49 +02:00
slothlife
35ced14e45 Fix for MSVC warnings 2014-09-22 21:33:09 -05:00
MiroslavR
22c71cec18 Check for text size 2014-09-22 23:17:44 +02:00
MiroslavR
608e1518a5 Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2 2014-09-22 21:47:21 +02:00
MiroslavR
f87d7c3fce Book formatter: Do not insert last page if it's empty, code cleanup 2014-09-22 21:25:41 +02:00
MiroslavR
4b1df64fba Book parser: Fix comparison between signed and unsigned integer expressions 2014-09-22 16:28:17 +02:00
eroen
0738e862cb Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable 2014-09-22 15:36:42 +02:00
Marc Zinnschlag
aa7fc8ee47 fix for potential script problem during saved game loading 2014-09-22 10:12:07 +02:00
Marc Zinnschlag
5c8ef842b6 Merge branch 'edit' 2014-09-22 09:54:44 +02:00