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

8034 commits

Author SHA1 Message Date
Marek Kochanowicz
256b075914 getting rid of not needed abstract class 2014-06-19 16:11:31 +02:00
scrawl
11b05c352f Fix exception when casting Bound Gloves spell 2014-06-19 16:00:27 +02:00
Marc Zinnschlag
30f8e279ed Merge remote-tracking branch 'scrawl/master' 2014-06-19 10:35:28 +02:00
scrawl
4648524df4 Improve getLOS (use eye level). Also, don't crash when used with non-actors. 2014-06-19 04:53:25 +02:00
scrawl
185ff279a3 Add missing sound effect for mages guild transport 2014-06-19 03:29:36 +02:00
scrawl
cc3c6ae7b8 Fix very slow movement on some creatures, e.g. rats (Bug #1136) 
Neither fAthleticsRunBonus, fBaseRunMultiplier or the creature's athletics skill (i.e. Combat stat) have any effect on the run speed (tested by setting those to absurd values). The new formula is just a guess and doesn't seem to be completely accurate.
 2014-06-19 02:36:10 +02:00
scrawl
6760f4c897 Make cached GMSTs in MWClass::Npc/Creature safer 2014-06-19 02:09:46 +02:00
scrawl
4234c70232 Savegame: Disable CustomData load optimization for npcs and creatures for now to preserve compatibility (still enabled for containers) 2014-06-19 02:00:40 +02:00
scrawl
d878456d0f Don't add an extra path separator 2014-06-19 01:10:33 +02:00
scrawl
c3e4160a0a Don't crash in StatsWindow for invalid faction rank values 
PcRaiseRank: don't allow to raise rank beyond max rank
 2014-06-18 23:50:55 +02:00
scrawl
2193977eec Savegame: Don't fill CustomData from ESM records if the savegame overwrites it anyway 
This gets rid of some junk in ContainerStores (since clear() only sets count to 0 and doesn't really delete references), and significantly speeds up loading savegames (by about 80% in my test)
 2014-06-18 22:59:18 +02:00
scrawl
4e71db7081 Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs. 2014-06-18 21:39:17 +02:00
Marek Kochanowicz
873cfcf447 implemented basic headerData (still work in progress) 2014-06-18 17:34:21 +02:00
scrawl
8a4227ec38 Heal player while in jail 2014-06-18 16:57:54 +02:00
scrawl
9a6737073f Fix broken swimdeath in first person 2014-06-18 16:57:54 +02:00
scrawl
e95483c40f Fix crash for on target spells cast by non-actors (Fixes #1529) 2014-06-18 16:57:53 +02:00
scrawl
fe1e6a2719 Make Weakness effects apply to all subsequent effects within the same spell (Fixes #1150) 2014-06-18 16:57:53 +02:00
scrawl
56bc5a9d39 Fix being able to steal undetected just after invisibility breaks 2014-06-18 16:57:53 +02:00
scrawl
80f66e2157 Fix crash when avformat_open_input fails (Fixes #1522) 2014-06-18 16:57:53 +02:00
scrawl
d4678a8d55 Fix level up dialogue layout (Fixes #1393) 2014-06-18 16:57:53 +02:00
scrawl
666dbc6ddc Disable QuickKeysMenu in werewolf form 2014-06-18 16:57:53 +02:00
scrawl
a3ea7cb956 Ignore distance when considering aggression due to crime (seems to work better, all balmora mages guild members now come to help when one is attacked) 2014-06-18 16:57:53 +02:00
Marek Kochanowicz
b63f2f4cd5 Actually using new nestedmodel 2014-06-18 16:56:37 +02:00
scrawl
1dc9e151cb Count werewolf kills (Fixes #1525) 2014-06-18 16:56:36 +02:00
Marek Kochanowicz
1fb18873cb adding proxy model that is ment to be used by the dialoguesubview 2014-06-18 15:35:31 +02:00
Marek Kochanowicz
75b5513c6c Column is responsible for telling that it can nest columns now. 2014-06-18 11:58:18 +02:00
Marek Kochanowicz
ce5e889015 Nested table sits inside it's own layout now. 2014-06-17 20:12:14 +02:00
scrawl
1244da85df Make Detect Life spell detect NPCs when in werewolf form (Fixes #1527) 2014-06-17 16:27:33 +02:00
scrawl
4f9ebd148c Fix broken AI movement on Z axis 2014-06-17 15:25:54 +02:00
Marek Kochanowicz
5bee682bb3 modified: ../../view/world/dialoguesubview.cpp 2014-06-17 14:58:25 +02:00
Marek Kochanowicz
03980034a5 Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw 
into NonTableFields

I have no idea what I'm doing

Conflicts:
	apps/opencs/model/world/idtable.cpp
	apps/opencs/model/world/refidadapter.hpp
	apps/opencs/model/world/refidadapterimp.hpp
 2014-06-17 14:21:50 +02:00
Marek Kochanowicz
defd0b1754 Merge branch 'dialog-fix' into NonTableFields 
TODO stop failing epicly with git
 2014-06-17 14:08:59 +02:00
Marc Zinnschlag
2683aa9503 Merge remote-tracking branch 'filkry/bug640_luminescent_water' 2014-06-17 13:08:06 +02:00
Marek Kochanowicz
187fccc8cc Merge branch 'dialog-fix' into NonTableFields 2014-06-17 12:58:14 +02:00
Marek Kochanowicz
32fcc9ad61 Trying to merge. 2014-06-17 11:14:12 +02:00
Marc Zinnschlag
073cc3f02c fixed base flag in content file loader code 2014-06-17 11:01:17 +02:00
Marek Kochanowicz
bbe7854968 Corrected formatting to follow our standard better. 2014-06-17 10:46:54 +02:00
scrawl
2477456f99 Implement Murder crimes and OnMurder instruction (Fixes #1315) 2014-06-17 04:05:27 +02:00
scrawl
3801dfb4ba Add delay to sneak icon update and skill progress (Fixes #1321) 2014-06-17 04:05:27 +02:00
scrawl
ffb6f5d555 Use fFight<Crime> GMSTs to control attacks in response to crimes 2014-06-17 04:05:27 +02:00
scrawl
8ac019611d Fix Potion use action removing the potion even when the action is not executed (Fixes #1521) 2014-06-17 04:05:20 +02:00
Fil Krynicki
c36fc48c47 Fixed underwater issue 
I had accidentally deleted some interpolation parameters.
 2014-06-16 17:15:49 -04:00
Fil Krynicki
cfea7736d9 WIP fix 
Bug is fixed, but appears to have broken vision underwater. Notes:

+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
 2014-06-16 17:08:02 -04:00
scrawl
28feb260eb Implement disposition/distance based aggression (Fixes #1520) 2014-06-16 20:05:53 +02:00
scrawl
d11a5e19f7 Fix positionCell not properly teleporting actors from inactive to active cells (Fixes #1516) 2014-06-16 20:05:53 +02:00
scrawl
2ce8323a42 Fix getDistance not detecting references in inactive cells properly 2014-06-16 20:05:47 +02:00
Marek Kochanowicz
d6288a8055 Remove unneded revert and delete slots 2014-06-16 11:58:55 +02:00
Marek Kochanowicz
786c68f09a refactoring dialogue subview 2014-06-16 11:31:57 +02:00
Marek Kochanowicz
7eb82f74ae Fixed complitaion. 2014-06-16 10:22:14 +02:00
Marek Kochanowicz
48691136fb Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix 2014-06-16 09:44:49 +02:00
scrawl
47bd170d7e Crashcatcher: create temp file in /tmp, not working directory (which may not have write access) 2014-06-16 04:13:36 +02:00
scrawl
f935cfc6c9 Fix crash when stealing items with the owner not around (Fixes #1512) 2014-06-16 04:03:53 +02:00
scrawl
1b610cdbd0 Allow following NPCs to fast-travel (Fixes #1501) 2014-06-16 03:17:31 +02:00
scrawl
78f30e2970 Fix a journal layout bug 2014-06-16 02:52:25 +02:00
scrawl
345ba99c17 Fix WeaponAnimationTime not working after restoring draw state (when loading save or re-entering a cell - Fixes #1497) 2014-06-16 02:52:25 +02:00
scrawl
9ea071c1e8 Fix weapon incorrectly showing when saving and loading with spell equipped 2014-06-16 02:52:25 +02:00
scrawl
edccb62c1f Clear MyGUI's clipboard, since we don't want to use it (Fixes #1277) 
This would cause pasted text to appear twice, but only when using an SVN version of MyGUI, since 3.2 had a bug where it wouldn't recognize the Ctrl C/V/X keys when using separated key/textinput events.
 2014-06-16 02:52:25 +02:00
scrawl
4f73e8bb71 Add items to player inventory upon drag start (Fixes #1507) 2014-06-16 02:52:25 +02:00
scrawl
0aba1088a1 Attempt to open companion window if no greetings are found (Bug #1507) 2014-06-16 02:52:25 +02:00
scrawl
3b7119ba0d Make Bipedal creatures always able to walk and swim (Fixes #1509) 
This is necessary since the vanilla CS greys out the walk/swim checkboxes when Bipedal is checked.
 2014-06-16 02:52:24 +02:00
scrawl
d5b97005ab Make ESM::Faction skills optional (Fixes #1508) 
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
 2014-06-16 02:52:16 +02:00
scrawl
ee2b81763e Savegame: Store AiSettings and summoned creatures 
CreatureStats state is now completely stored (Closes #1174)

Also play VFX_Summon_Start and VFX_Summon_End visual effects.
 2014-06-15 21:19:37 +02:00
scrawl
a0f9a6718f Disable fProjectileThrownStoreChance when shooting at player (Fixes #1490) 2014-06-15 16:11:22 +02:00
scrawl
fd59a4a79e Fix some doxygen typos 2014-06-15 16:11:22 +02:00
scrawl
77388fe2ce Implement BetaComment instruction (dumps reference info) 2014-06-15 16:11:16 +02:00
scrawl
326c747508 Don't run scripts when in pause menu (Fixes #1495) 2014-06-15 14:18:16 +02:00
scrawl
9e6d21d95b Clear message boxes in windowmanager cleanup (Fixes #1496) 2014-06-15 14:18:16 +02:00
scrawl
e288437885 Disable all other animations on death (Fixes #1483) 2014-06-15 14:18:16 +02:00
scrawl
1adb81abd0 Sort using ciLess, not ciEqual 2014-06-15 14:18:16 +02:00
scrawl
88f8f25ffa Don't allow scripted dialogue with dead actors (Fixes #1493) 2014-06-15 14:18:16 +02:00
scrawl
8d8015ce18 Remove a squareroot in pathfinding 2014-06-15 14:18:16 +02:00
scrawl
afbd5162ee Move AiWander arrival check to time-critical section 2014-06-15 14:18:16 +02:00
scrawl
7afd2ca614 Consider moved references in CellStore::listRefs 2014-06-15 14:18:16 +02:00
scrawl
31a4e10c6f Fix incorrect trigger of change flag for static doors 2014-06-15 14:18:16 +02:00
scrawl
395f98e476 Fix triggering changed flag for all references when cell is visited 
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.

Also clean up RefData interface slightly.
 2014-06-15 14:18:16 +02:00
scrawl
b20f8cc04f Don't clear AiSequence if there are no saved packages (eg for old savegames) 2014-06-15 14:18:16 +02:00
Marc Zinnschlag
01c90a3434 Merge remote-tracking branch 'mrcheko/master' 2014-06-15 14:12:38 +02:00
mrcheko
a6ee4272aa fix bug when you were able to kill somebody from large distance without 
being spotted
 2014-06-15 00:14:18 +04:00
mrcheko
6da061fd96 fix http://bugs.openmw.org/issues/1340 
Did I understand right that guards trigger combat after refusing pay
gold/go to jail via script?
 2014-06-14 23:36:57 +04:00
Alexander "Ace" Olofsson
c24e08dff6 Use Ogre::Math::PI 2014-06-14 14:43:24 +02:00
Alexander "Ace" Olofsson
6ea29812ac Another way of getting M_PI 2014-06-14 13:54:01 +02:00
Alexander "Ace" Olofsson
dc2fefffc7 Fix missing M_PI define on Windows 2014-06-14 13:29:55 +02:00
scrawl
832f1a4857 Fix merge mistake 2014-06-14 02:31:01 +02:00
scrawl
0637cde267 Bug #1417: Make sure to reset all position/rotation fields when placing items 2014-06-13 23:40:49 +02:00
scrawl
ad3a78706e Bug #1417: Use fmod to wrap local rotations (more efficient and robust) 2014-06-13 23:40:35 +02:00
scrawl
54d8606b78 Fix logging fatal exceptions to cerr, and log them to openmw.log 2014-06-13 22:04:20 +02:00
mrcheko
9d40f2e196 Merge remote-tracking branch 'origin/master' 2014-06-13 23:23:25 +04:00
mrcheko
c4e5872620 fix bug http://bugs.openmw.org/issues/1470 2014-06-13 23:22:00 +04:00
scrawl
3334078d4d Add first person meshes to refraction render (Fixes #1481) 2014-06-13 21:14:17 +02:00
scrawl
fe5bbfce3c Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
 2014-06-13 19:31:33 +02:00
scrawl
8114f48469 Workaround per-frame resources leak in MyGUI. New vertex buffers were being created every frame. 2014-06-13 19:06:09 +02:00
mrcheko
fc6366fb27 Merge remote-tracking branch 'upstream/master' 
Equipping_Weapon check isn't needed cause there won't be WeapType_None in
that case

Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2014-06-13 14:12:41 +04:00
scrawl
e458cf1df2 Savegame: Store death counter (Fixes #1477) 2014-06-13 02:26:53 +02:00
scrawl
797134aa51 Handle activation scripts in AiActivate (Fixes #1478) 2014-06-13 02:26:52 +02:00
scrawl
a54ac579a5 Savegame: Store AiSequence 2014-06-13 02:26:52 +02:00
scrawl
be6f1fe4fe Fix a sign error 2014-06-13 02:26:52 +02:00
scrawl
91ed5183c8 Show base item value in tooltip, not real value (Fixes #1469) 2014-06-13 02:26:52 +02:00
scrawl
604d5ac000 Fix console reference label not resetting when loading save 2014-06-13 02:26:52 +02:00
mrcheko
df7213185f warning fixes 2014-06-12 23:42:33 +04:00
Marc Zinnschlag
2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 2014-06-12 12:54:39 +02:00
Marc Zinnschlag
82eb13c070 Merge remote-tracking branch 'cc9cii/master' 2014-06-12 12:46:04 +02:00
cc9cii
37f0c253f6 For compiling with MSVC 2012 2014-06-12 07:04:57 +10:00
scrawl
68d6b6b2f3 Cell merge fix (reference context position was not saved correctly) 2014-06-11 21:56:10 +02:00
scrawl
41ab7329a8 Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202 
Note: breaks compatibility with input.xml, so the filename was changed.
 2014-06-11 19:47:42 +02:00
scrawl
013916fca3 Fix for broken physics in exteriors (Fixes #1446) 
The wrong function was being used to check the distance between old and new positions. It took the length of the vectors into account, which makes no sense for positions. The issue was only observed in exteriors, since most interiors are relatively close to the origin.
 2014-06-11 19:01:23 +02:00
scrawl
d970cc06d7 Don't play the same music track twice in a row (Fixes #746) 2014-06-11 18:11:16 +02:00
scrawl
d60df66811 Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108) 2014-06-11 16:56:41 +02:00
scrawl
73be457805 Merge ESM::Cell fields by subrecord 
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.

Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
 2014-06-11 16:13:33 +02:00
Marc Zinnschlag
c23e9e03fd Merge branch 'refs' 2014-06-11 11:44:43 +02:00
Marc Zinnschlag
7d1ecea20c added extended versions of revert and delete 2014-06-11 11:43:38 +02:00
Marc Zinnschlag
2faeceacfa Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/openmw/main.cpp
 2014-06-11 08:51:18 +02:00
scrawl
0f31e31088 Allow opening journal during dialogue (Fixes #1460) 2014-06-11 03:08:22 +02:00
scrawl
14a9f0ebf8 Handle Quadratic and Linear attenuation independently (Fixes #1456) 2014-06-11 02:24:17 +02:00
Emanuel Guevel
a41339da1e Write logs in log directory 
The crash.log file was created in the working directory, requiring users
that had installed the game to run it with augmented privileges to be
able to create the file.
 2014-06-10 23:46:49 +02:00
mrcheko
d6d9df6cec split getStartTime 2014-06-11 00:20:46 +04:00
scrawl
07d20c212b Fix crash activating quick key 1 2014-06-10 21:34:47 +02:00
scrawl
10758d6297 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2014-06-10 19:32:49 +02:00
scrawl
7b5482f25b Fix character selection caption when there is no character in settings.cfg 2014-06-10 19:01:18 +02:00
scrawl
5a955279bb Fix main menu background showing when resizing window during load 2014-06-10 18:49:42 +02:00
scrawl
3788fb042e Implement MenuTest script instruction (Fixes #1454) 2014-06-10 18:49:42 +02:00
scrawl
6ba112619a Fix dropped items ending up inaccessible when standing in objects with no collision (Fixes #1441) 2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc Implement ClearInfoActor script instruction (Fixes #1422) 2014-06-10 18:49:41 +02:00
scrawl
a90245147b Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor (Fixes #1423) 2014-06-10 18:46:16 +02:00
scrawl
1ed3f092c1 Implement text replacement for journal topic responses (Fixes #1429) 2014-06-10 15:42:50 +02:00
scrawl
3bf599248e CMake cleanup: Remove distribution-specific install stuff (unused) 2014-06-10 15:03:27 +02:00
scrawl
4119038f1d Remove an old workaround (Fixes #1458) 2014-06-10 14:46:44 +02:00
mrcheko
979128b2c5 Combat music; some minor combat fixes 2014-06-10 14:20:29 +04:00
scrawl
65d5311037 Revert "Don't try to show exceptions in a message box if SDL was not initialized" 
According to SDL docs, "This function may be called at any time, even before SDL_Init()".

Also fixes an issue where message boxes weren't working due to SDL_Quit already having been called by ~Engine.

This reverts commit 39eea24dc3.

Conflicts:
	apps/openmw/main.cpp
 2014-06-10 04:10:34 +02:00
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
881ae33b74 Don't allow Creatures with no movement abilities to move (Fixes #1457) 2014-06-10 02:15:09 +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
7721e54191 Use descriptive names for save files and character folders (Fixes #1449) 2014-06-10 00:22:00 +02:00
scrawl
e796fa2313 Add another french morrowind font workaround (Fixes #1447) 2014-06-09 22:18:53 +02:00
mrcheko
698cbba6ef old bug + comment fix 2014-06-09 23:02:06 +04:00
mrcheko
08e8dab067 merge openmw master 2014-06-09 22:37:49 +04:00
Marek Kochanowicz
8763309a1b reformatting to make code easier to read 2014-06-09 13:31:15 +02:00
Marek Kochanowicz
9ee00534b9 check if index is valid before attempting to use it 2014-06-09 13:18:17 +02:00
Marek Kochanowicz
c8458654ac correcting problems 2014-06-09 13:16:10 +02:00
Marek Kochanowicz
269a357644 Merge remote-tracking branch 'master/refs' into dialog-fix 
Conflicts:
	CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/dialoguesubview.cpp
 2014-06-09 11:51:41 +02:00
Marek Kochanowicz
6f5935edb3 subview does not store row number anymore 2014-06-09 11:37:48 +02:00
Marek Kochanowicz
21a1f6f4ae working on the issue 2014-06-09 10:35:39 +02:00
Marek Kochanowicz
29231b8fc9 starting new branch 2014-06-09 10:26:53 +02:00
scrawl
1bab74a98d Fix punishment for stealing 0 value items (Fixes #1435) 2014-06-09 03:42:29 +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
a3752da79f Store Always Run control state in settings 2014-06-08 19:50:39 +02:00
mrcheko
67abc60264 aiming to moving target in ranged combat ai 
1) Taking into account target move vector and speed. However aiming is not
ideal, since attack strength can't be controlled directly. I did achieve
almost 100% accuracy updating it everyframe but then thought it would be
unfair, cause AI should mimic human targetting.
2) Also added in this commit func to measure real attack durations for
weapon.
 2014-06-08 20:59:26 +04:00
Marc Zinnschlag
48468b7d0c some dialogue subview cleanup and start of command dispatching refactoring 2014-06-08 14:10:08 +02:00
Marc Zinnschlag
b717e3fcb8 Merge remote-tracking branch 'filkry/bug1196jumpdialog' 2014-06-08 11:25:34 +02:00