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

6327 commits

Author SHA1 Message Date
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
fc7e79027a Fixes #1144: Don't refreshCurrentAnims when adding already dead actors 2014-05-01 16:55:16 +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
f99eda1a54 Fixes #1302: Do not attempt to set OnPcAdd before the script has been added 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
mrcheko
9e79fb5b87 fix to broken aiwander logic 2014-05-01 11:41:25 +04:00
mrcheko
e8f7d12c01 uninit bool and invalid iterator bugs fixes 2014-04-30 23:57:19 +04:00
Jeffrey Haines
5c9c467b26 Improved sneak. 2014-04-30 08:06:36 -04:00
Jeffrey Haines
14ebd8b110 Fixed logic in commit crime 2014-04-30 07:44:29 -04:00
Thomas
10a5bb9464 Made code a bit more standardized and added a good bit of documentation. 2014-04-29 23:40:59 -04:00
Marc Zinnschlag
0c2843b0f7 some missing cleanup 2014-04-29 19:56:33 +02:00
Marc Zinnschlag
9a1b5dc1c6 a bit of cleanup 2014-04-29 15:32:00 +02:00
Marc Zinnschlag
f6a876bc3d added actor ID 2014-04-29 15:27:49 +02:00
Marc Zinnschlag
4eeed4e2c7 Merge remote-tracking branch 'scrawl/return' 2014-04-29 12:27:27 +02:00
scrawl
28ef236f0e Don't allow setting a new return position if there already is one and we haven't reached it yet 2014-04-29 11:17:07 +02:00
Marc Zinnschlag
8fea2cfa2a Merge remote-tracking branch 'mrcheko/master' 2014-04-29 10:03:29 +02:00
scrawl
1fd7a07b5e Merge branch 'master' of https://github.com/OpenMW/openmw into return 
Conflicts:
	apps/openmw/mwmechanics/aisequence.cpp
	apps/openmw/mwmechanics/aiwander.cpp
 2014-04-29 09:14:13 +02:00
scrawl
9b36a13821 Feature #1289: NPCs return to default position 
Make stationary NPCs return to their previous position once combat/crime AI finishes.
 2014-04-29 09:09:51 +02:00
scrawl
3780503275 Removed quicksave/quickload message boxes, now that the same text is shown in the progress bar 2014-04-29 07:07:03 +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
7f37f2c2be Fixes #1187: Make GetDistance handle actors in remote cells gracefully 2014-04-28 19:23:25 +02:00
Marc Zinnschlag
2e7b4e798e Merge remote-tracking branch 'digmaster/master' 2014-04-28 19:22:54 +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
scrawl
518a32c19d Fixes #1195: Make NPCs equip torches in interiors under certain conditions 2014-04-28 18:33:42 +02:00
Thomas
885228ec02 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
 2014-04-28 12:27:57 -04: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
scrawl
84961d7843 Fixes #1254: PcRank should return first rank if not in the faction 2014-04-28 15:31:18 +02:00
scrawl
b2119441b9 Fix bug in PcRank / PcNextRank 
It was using the first faction instead of the actor's faction.
 2014-04-28 15:26:40 +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
mrcheko
35c1724d39 unblock vertical aiming for combatants 2014-04-28 16:34:49 +04:00
scrawl
0796815da0 Ignore dead actors in getActorsFollowing/Fighting 
Prevents dead enemies from disallowing resting near them
 2014-04-28 11:44:56 +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
Marc Zinnschlag
af322a9f77 Merge remote-tracking branch 'scrawl/master' 2014-04-28 10:48:57 +02:00
scrawl
1da99d9fc7 Remove unused variable 2014-04-28 10:26:24 +02:00
scrawl
b89463db09 Fix #1207: Remember previous choice in class creation dialog 2014-04-28 09:12:03 +02:00
scrawl
1da19585dc Remove some unneeded includes 2014-04-28 07:49:08 +02:00
Thomas
dc54bd5a5f Merge remote-tracking branch 'upstream/master' 2014-04-27 20:56:45 -04:00
Thomas
c2127845af Added onKnockdown command 2014-04-27 20:54:22 -04:00
mrcheko
22cdb166f2 warning fix, vars renaming 2014-04-27 22:38:04 +04: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
Marc Zinnschlag
ca097e146b Merge remote-tracking branch 'jeffreyhaines/master' 2014-04-27 17:35:10 +02:00
Jeffrey Haines
edbc319c42 fixed logic. || 2014-04-27 10:05:34 -04:00
Jeffrey Haines
52bb7c3f69 fixed logic. ! 2014-04-27 09:55:38 -04:00
Jeffrey Haines
7599b26d30 Fixed: creatures won't witness crimes 
and potential crash.
 2014-04-27 09:37:43 -04:00
Jeffrey Haines
0409e18a0e revert 2014-04-27 09:35:49 -04:00
Jeffrey Haines
b9bd4bc126 broken 2014-04-27 09:34:59 -04:00
Jeffrey Haines
ce106d3bec Revert "NPCs detect crime exclusively" 
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.

Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 2014-04-27 09:34:33 -04:00
mrcheko
82121e0401 some checks reworked 2014-04-27 16:59:21 +04:00
scrawl
e42855d522 Minor fix for spell icon 2014-04-27 12:54:18 +02:00
mrcheko
6a3dddfb9a merge master 2014-04-27 13:49:31 +04:00
scrawl
3eb1e4e117 Fixes #1241: Removed disposition-based combat conditions 
The information for this code came from UESP, which in turn cites a (extremely vague) section from the TES-CS help text, so no surprise that it wasn't accurate.

The guard on the boat has a fight rating of 70, so with the old code it would attack on sight if the disposition is low enough. BTB-Character.esp includes something (not sure what) that drops his disposition to 35 when playing as a Khajiit, making him attack.

Testing in Vanilla it appears that disposition has no effect on combat engagement at all. Even with disposition 0 and fight 70 the NPCs don't attack.

Setting an NPCs fight rating to 70 or less still has a meaning, because the higher it is, the easier it becomes to raise the fight rating to 80 (by taunting, for example).
 2014-04-27 09:43:54 +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
3161647809 Fix for not being able to pick up scrolls during combat 
This is the behaviour I observed in vanilla morrowind.
 2014-04-27 09:15:37 +02:00
scrawl
d92f95f5bf Fix a stacking issue 2014-04-27 06:08:15 +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
cc9cii
1fb2c8d87b NPC turning is less hacky but still not perfect. NPC's should walk away after a period of non-action by the player (vanilla behaviour) - not yet implemented. 2014-04-27 07:38:31 +10:00
Thomas
c2b692e124 getActorsFollowing/Fighting no longer returns dead actors 2014-04-26 17:21:53 -04:00
mrcheko
dbe1307de0 code refining + minor fixes 2014-04-26 22:21:20 +04:00
Marc Zinnschlag
5e7cd806c4 Merge remote-tracking branch 'scrawl/master' 2014-04-26 18:05:04 +02:00
scrawl
04964595ef Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame 2014-04-26 16:44:20 +02:00
scrawl
d5dd864404 Fixes #1236: Disable all controls while playing movie 2014-04-26 14:33:45 +02:00
scrawl
30666f2cce Fixes #1297: Store global map markers in savegame 2014-04-26 13:42:32 +02:00
scrawl
f921f2e7db Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last. 
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
 2014-04-26 12:04:37 +02:00
scrawl
ef39b0f6ab Fixes #1291: Faction rank saving issue 
A value of 0 is the first rank, -1 means not a member
 2014-04-26 11:41:44 +02:00
scrawl
45d2a00717 Fixes #1293: Allow interpolation type 0 in case of 0 keys 2014-04-26 11:36:27 +02:00
scrawl
b13b25dd1b Fixes #1295: Support partial matches in Cell filter 2014-04-26 11:03:17 +02:00
scrawl
6eca5ac4bb Fixes #1296: Streamlined cellChanged detection 2014-04-26 07:46:19 +02:00
scrawl
cd1b4218e7 Fix dynamically placed objects being discarded when loading game 2014-04-26 05:01:26 +02:00
scrawl
f05606657c Correctly insert pasted text at cursor position 2014-04-26 05:01:26 +02:00
scrawl
91e50585ff AiWander: make sure to walk, not run 2014-04-26 05:01:26 +02:00
scrawl
5b011e43a7 Fix a crash after loading game 2014-04-26 05:01:26 +02:00
mrcheko
f3626adc86 remake of z-moving in combat for flying/swimming enemies 2014-04-26 00:20:55 +04:00
Marc Zinnschlag
c63d6437c0 Merge remote-tracking branch 'jeffreyhaines/master' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
 2014-04-25 15:29:23 +02:00
Marc Zinnschlag
1f6ed584c2 Merge remote-tracking branch 'digmaster/master' 
Conflicts:
	apps/openmw/mwstate/statemanagerimp.cpp
 2014-04-25 08:39:40 +02:00
Jeffrey Haines
4a4c08946c Checks the state of the passed sneak variable 2014-04-24 23:02:11 -04:00
Thomas
f3272c941f Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat. 
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
 2014-04-24 22:47:45 -04:00
Jeffrey Haines
42b879a9a5 Reworked the accusation of actors 2014-04-24 22:41:05 -04:00
Jeffrey Haines
c3e08916da Sneak: Added support for state checking 
I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
 2014-04-24 20:40:17 -04:00
Marc Zinnschlag
9db9ad410d fixed checks for allowing load/save and some general cleanup 2014-04-24 10:14:17 +02:00
Marc Zinnschlag
760c8c7214 removed a redundant include 2014-04-24 09:56:51 +02:00
Marc Zinnschlag
42b3233bda removed a redundant check 2014-04-24 09:54:47 +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
Thomas
682c395488 Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts) 2014-04-23 21:39:25 -04:00
Thomas
49620968b9 Disallowed quicksave/load in character creation 2014-04-23 21:21:11 -04:00
Thomas
e873135da7 Missed a debug message 2014-04-23 21:04:52 -04:00
Thomas
f90810223a Added quicksave and quickload 2014-04-23 21:02:09 -04:00
Thomas
ee581f593b Fixed issue which may occur if there's no evidence chest nearby 2014-04-23 13:20:43 -04:00
Thomas
f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 2014-04-23 13:02:51 -04:00
Thomas
61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 2014-04-23 10:00:18 -04:00
Thomas
6022ffbd1f Evidence chest now locks when new evidence is added to it 2014-04-23 05:54:18 -04:00
Thomas
420163d35f Small changes to lock command (If no valid lockLevel exists, defaults to 100) 2014-04-23 05:19:34 -04:00
Thomas
cac8e52154 Seperated locked and lock level, to allow for relocking doors to previous lock level. 
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
 2014-04-23 05:12:07 -04:00
Thomas
e71a119c23 Made aifollowers run when long distances (800 or 10000, depending) from what they're following. 2014-04-23 02:57:48 -04:00
mrcheko
fbd0ffe86f enable z-moving for flying/water combatants 2014-04-22 22:59:39 +04:00
mrcheko
f811abb752 pathgrid shortcutting extended 2014-04-20 20:35:07 +04:00
Marc Zinnschlag
0eed697f9a Merge remote-tracking branch 'digmaster/master' 2014-04-20 13:36:39 +02:00
Marc Zinnschlag
a91b386381 Merge remote-tracking branch 'jeffreyhaines/master' 2014-04-20 13:34:58 +02:00
cc9cii
6a1435c49e Remove rotation check that was freezing NPC's. 2014-04-20 17:59:08 +10:00
cc9cii
e17fab891d Suppress travis warning and one more tweak. 2014-04-20 16:49:57 +10:00
Thomas Luppi
d6f1f129eb Forgot to capitalize something. whooooops 
dat y do
 2014-04-20 00:39:50 -04:00
Thomas Luppi
95ef874205 Gets default keybindings from scancode, not keyvalue. 
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
 2014-04-20 00:34:58 -04:00
cc9cii
2b544d550b Fixed the rotation animation glitch. 2014-04-20 14:27:18 +10:00
cc9cii
000afa48b7 An attempt at making turning animation smoother. Copied some code from AiCombat for rotation. 2014-04-20 11:59:47 +10:00
cc9cii
3d26702f5e Make idle actors face the player. Turning animation is not smooth. 2014-04-20 10:36:01 +10:00
cc9cii
9bd31b6236 Added reaction time and moved game setting variables init to the constructor. 2014-04-20 10:06:03 +10:00
Jeffrey Haines
3484df0743 Fixed garage value found in beta's static analysis 
Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844
 2014-04-19 19:42:49 -04:00
Jeffrey Haines
6733a1541e Fixes to Crime System 
Victimless crimes were removed because victims may not exist in the
case of stealing items.

Is class now uses case insensitive comparison.

Fixed issue with confiscation of stolen items.
 2014-04-19 19:03:31 -04:00
cc9cii
3dfd08cf2d Cleanup and little tweaking. 2014-04-20 08:31:02 +10:00
cc9cii
479a94b35d Backing off closed doors working, needs cleanup and tweaking. 2014-04-20 08:14:54 +10:00
Marc Zinnschlag
7eb6a2e52d Merge remote-tracking branch 'scrawl/alarm' 2014-04-18 16:19:28 +02:00
Marc Zinnschlag
34092f9f5d Merge remote-tracking branch 'scrawl/master' 2014-04-18 15:08:30 +02:00
scrawl
b3916e7744 Crime: mark witnesses as alarmed. 
Fixes guard dialogue to properly detect if the player turned himself in.
 2014-04-18 13:44:09 +02:00
scrawl
4625adfb7f Fix typo in a condition. 2014-04-18 11:43:37 +02:00
cc9cii
7437647f70 Forgot to add a guard :-( 2014-04-18 16:45:31 +10:00
cc9cii
a0fc514df7 Suppress compiler warning. 2014-04-18 15:45:39 +10:00
cc9cii
c652cb1568 More cleaning up. 2014-04-18 15:19:22 +10:00
cc9cii
2447f0f4aa Cleaned up logging statements. 2014-04-18 14:41:44 +10:00
cc9cii
aad13d315c Fixed issue where allowed nodes were being erased. PathFinder was returning an empty path if the closest pathgrid point to the start was also the closest pathgrid point to the goal. Still need to clean up and remove logging statements. 2014-04-18 14:41:44 +10:00
cc9cii
d3be725ee7 Actors are moved on if idling near a closed interior door. Unreachable pathgrid points due to a closed door are removed from the allowed set of points. 2014-04-18 14:41:43 +10:00
cc9cii
1ceeeb4a22 Fix movement glitches for actors with low speeds (e.g. a rat). Was caused by false detection of being stuck. 2014-04-18 14:41:43 +10:00
Marc Zinnschlag
30d5040f2f Merge remote-tracking branch 'cc9cii/Bug-No-1260' 2014-04-15 15:26:58 +02:00
cc9cii
1fc030653f Avoid hard coding "thief.dds" string. 2014-04-15 22:30:41 +10:00
Marc Zinnschlag
86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2014-04-15 11:31:48 +02:00
Jeffrey Haines
e2fab228f9 Save state is handled correctly now. 2014-04-14 18:11:04 -04:00
mrcheko
4e7ee97050 fix for windows builds 2014-04-14 17:18:29 +04:00
cc9cii
89be1069a7 Bug #1260: show thief.dds image for a custom class level up menu 2014-04-14 18:31:46 +10:00
cc9cii
966ed46870 Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status. 2014-04-13 18:34:08 +10:00
cc9cii
3e6e325e5b Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr). 2014-04-13 14:53:36 +10:00
cc9cii
e9be6d3f42 Fix falling animation where vec.z is set to zero. 2014-04-13 11:34:59 +10:00
cc9cii
0bef754873 Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271. 2014-04-13 08:46:02 +10:00
cc9cii
d2a41167d0 Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075 2014-04-11 21:24:00 +10:00
Emanuel Guevel
09bd0324c9 Fail properly when a content file is not found 2014-04-08 20:19:09 +02:00
Marc Zinnschlag
03b3487f1b minor cleanup 2014-04-07 09:56:36 +02:00
Marc Zinnschlag
fafb7501e3 Merge remote-tracking branch 'cc9cii/PathFinder-split' 2014-04-07 09:48:15 +02:00
Emanuel Guevel
ce7aa96371 Fix visual glitch happening when closing inventory while sneaking 
(bug #1255)
 2014-04-06 22:21:28 +02:00
Marc Zinnschlag
c7f2cfeca0 Merge remote-tracking branch 'gus/AIFix2' 2014-04-06 15:13:30 +02:00
Jeffrey Haines
a274b48f2f States are saved. Crime is reacted to. 
Issues where some crime is ignored. Needs a lot more work
 2014-04-05 22:45:40 -04:00
Jeffrey Haines
940c88d2ec Cleaned up code, implemented crime ids 
There is a problem with my game freezing. ToggleAi stops my character
 2014-04-05 10:26:14 -04:00
Jeffrey Haines
df5cbe5dec Minor changes 2014-04-04 08:10:35 -04:00
cc9cii
28f7c42fb7 One more comment fix. 2014-04-04 18:17:42 +11:00
cc9cii
f59226265a Remove redundant parameter from aStarSearch. Also update some comments. 2014-04-04 18:10:06 +11:00
Jeffrey Haines
70919ba60a Removed witnesses and minor changes 2014-04-03 16:13:14 -04:00
cc9cii
5cf8e7e933 Remove logging. 2014-04-04 06:16:26 +11:00
cc9cii
040d4f8fc4 Move PathgridGraph into separate files. 2014-04-04 06:13:47 +11:00
Jeffrey Haines
0c957a3cde Added witnesses to the mix 2014-04-03 14:53:31 -04:00
cc9cii
a8b2eb1fe9 Make Travis happy. 2014-04-03 22:49:22 +11:00
cc9cii
325d0616bb Cleanup debug statements. 2014-04-03 22:17:45 +11:00
cc9cii
98f77714ce Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder. 
This version still has debugging statements and needs cleaning up.
 2014-04-03 21:43:44 +11:00
Jeffrey Haines
b1abef7a38 Cleaned up code 2014-04-03 01:07:56 -04:00
Jeffrey Haines
58b135a2be Crime is now checked every frame call 2014-04-03 00:50:09 -04:00
cc9cii
f597d3e88b Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors). 2014-04-03 07:46:26 +11:00
Jeffrey Haines
510f2d10ac Replaces broken code with todo 2014-04-02 14:20:33 -04:00
Jeffrey Haines
6f1211dd8d Moved mWitnesses into Player. resetCrime for paying fine. 2014-04-02 12:23:38 -04:00
Jeffrey Haines
7c0b51fb7e Ai pursue now controls guards pursuit of crimes 
Should extend AiActivate in the future
 2014-04-02 00:18:22 -04:00
Jeffrey Haines
50dac98a2b Feature 1154 & 73: Crime and NPC reactions 2014-04-01 20:24:25 -04:00
Jeffrey Haines
4037f3705e Feature 1154 & 73: NPCs react to crime 2014-04-01 14:15:55 -04:00
Marc Zinnschlag
12e46c5dc7 Merge remote-tracking branch 'megaton/master' 2014-03-31 10:24:12 +02: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
megaton
50af9bc0d3 General perfomance optimizations. 2014-03-30 19:45:27 +04:00
cc9cii
d04bb3befb MSVC uses C version of locale. 2014-03-30 17:23:22 +11:00
Jeffrey Haines
8ce938c6f1 Revert 6b28c06..98fd381 
This rolls back to commit 6b28c06b2c.
 2014-03-29 22:26:53 -04:00
Jeffrey Haines
98fd381564 Feature #1154 Not all NPCs get aggressive when one is attacked 
Compiling fix
 2014-03-29 21:25:20 -04:00
Jeffrey Haines
6c866deb1b Feature #1154 Not all NPCs get aggressive when one is attacked 
Partially implemented
 2014-03-29 21:23:34 -04: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
gus
d9ea7107b7 compile fix. 2014-03-29 18:36:32 +01:00
gus
bee057346b Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2 
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
 2014-03-29 18:05:56 +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
c7b969821f silenced a warning 2014-03-29 11:11:43 +01:00
Marc Zinnschlag
27095f3edb Merge remote-tracking branch 'cc9cii/AiWander-improvements' 2014-03-29 11:08:51 +01:00
cc9cii
ebb1813b9b Minor comment clarification. 2014-03-29 20:17:04 +11:00
cc9cii
07fd801d94 My previous analysis of the pathfinding issue was incorrect. It was in fact caused due to some of the pathgrid points being unreachable. Instead of returning an empty path in such a scenario, incorrect path + requested destination were being returned. There was also a defect where past cost was being used for selecting open points. 
There is still an unresolved issue where mGraph and mSCComp are being rebuilt unnecessarily.  The check mCell != cell in buildPath() is being triggered frequently. Not sure why.
 2014-03-29 19:35:52 +11:00
cc9cii
267855c44e Prevent NPC suicides off silt the strider platform in Seyda Neen. Added some comments as well. There may be opportunities for some optimization but left that out for now. 2014-03-29 19:35:52 +11:00
cc9cii
90a813ad2c Allow interrupting a walking NPC to trigger a greeting. 2014-03-29 19:35:52 +11: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
86e5179fd8 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-28 22:40:12 +01:00
Jeffrey Haines
9efef31bb8 Feature #953 Trader Gold - Unused code/warning resolved 
Removed unused code
getBaseGold throws proper error
 2014-03-28 17:27:23 -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
4f852daf45 Don't play company logo when using --skip-menu 2014-03-27 19:59:33 +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
Marc Zinnschlag
5c81f20f46 Merge remote-tracking branch 'rohitnirmal/load-weap-icon' 2014-03-27 14:57:55 +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
Rohit Nirmal
e695890e01 Only update the icon if player is NOT unarmed, to avoid bad dereference. 2014-03-26 21:53:35 -05:00
Rohit Nirmal
bcacdc49af Update weapon icon in HUD when save is loaded. 2014-03-26 21:08:31 -05: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
23f4bbc5b0 Videoplayer: only pause previous sounds if there is an audio stream 2014-03-26 21:36: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
scrawl
53ba23e303 Fixes #1224: Store class name instead of id in savegame header 2014-03-26 19:56:12 +01:00
scrawl
793649c854 ToggleAI: Report current status on toggle 2014-03-26 19:55:52 +01:00
scrawl
688415ce54 Play deathknockout/deathknockdown animations when appropriate 2014-03-26 18:55:16 +01:00
Marc Zinnschlag
1b6b4e3442 Merge remote-tracking branch 'slothlife/weather_save' 2014-03-23 08:36:45 +01:00
cc9cii
772a49b2a6 Just some notes for future maintenance. 2014-03-23 13:38:11 +11:00
scrawl
0a17245633 Refactored settings window 2014-03-22 19:02:14 +01:00
Marc Zinnschlag
87ae03b5d4 fix for previous commit 2014-03-22 16:39:24 +01:00
Marc Zinnschlag
6bd3b3ee78 include local variable state in saved games 2014-03-22 15:00:49 +01:00
Marc Zinnschlag
4d80bc009a Merge remote-tracking branch 'scrawl/master' 2014-03-22 09:54:42 +01:00
scrawl
394284d0f8 Fixes #1209: Tarhiel never falls 
There are a few pitfalls with this code:
 - Gravity is only considered when applying queued movement. Therefore, make sure to queue some movement every frame. (Could be refactored in the future?)
 - The character controller never detects being in free fall (!World::isOnGround) unless movement has been applied.
 2014-03-22 02:08:04 +01:00
slothlife
6dce3e5186 Fixed include to use C99 header, not C++11 header 2014-03-21 01:33:11 -05:00
slothlife
6eab9c5179 Move weather state save/load to a new class 2014-03-21 01:19:40 -05:00
Rohit Nirmal
e3a9daf921 Play item sound when trying to sell a bound item, too. 2014-03-20 22:22:31 -05:00
Marc Zinnschlag
688e03a9d2 Merge remote-tracking branch 'sirherrbatka/Editor-Dialog' 2014-03-20 22:27:28 +01:00
slothlife
1acd1bd913 Feature #1173: Saved Game: include weather state 
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
 2014-03-20 01:25:52 -05:00
Rohit Nirmal
e4c4747a27 Play item sound even if merchant doesn't purchase it. 2014-03-19 20:08:01 -05:00
Marek Kochanowicz
6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
 2014-03-19 10:23:15 +01:00
scrawl
128a47570e One more fix 2014-03-17 14:15:52 +01:00
scrawl
4443e22387 Build fix 2014-03-17 13:32:13 +01:00
scrawl
c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 2014-03-16 23:49:06 +01:00
scrawl
81dfc26d26 mwscript/locals was added twice 2014-03-16 21:39:46 +01:00
Marc Zinnschlag
8b36de6c67 Merge remote-tracking branch 'cc9cii/Slaughterfish-fix' 2014-03-16 12:57:38 +01:00
Marc Zinnschlag
afbdd84467 Merge remote-tracking branch 'cc9cii/AiWander-fix' 2014-03-16 12:47:30 +01:00
cc9cii
f71fb83bfc Cleaned up more inaccurate comments. 2014-03-16 20:56:11 +11:00
cc9cii
f57c11254f Revert to original variable names. 2014-03-16 20:09:18 +11:00
cc9cii
22c544d9d7 Remove unnecessary comment. 2014-03-16 12:51:12 +11:00
cc9cii
fdbd564700 Apparently fall trace needs to be done with the middle of the object. 2014-03-16 08:57:55 +11:00
cc9cii
43757efdc4 Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however. 2014-03-16 08:09:14 +11:00
scrawl
d08394bf78 Fixes #1205: apparently creature and hand-to-hand (health) attacks should also level up armor skill (tested in vanilla) 2014-03-15 21:00:25 +01:00
scrawl
61955111f1 Fixes #1204: Any health value < 1 should show as empty life bar. 2014-03-15 20:48:54 +01:00
scrawl
93c21b5ef2 Fixes #1197: incorrect mouse wheel step 2014-03-15 20:34:12 +01:00
scrawl
3880247017 Fixes #1206: effect texture override was not accounted for 2014-03-15 20:28:48 +01:00
Marc Zinnschlag
2fdf80bcbf Merge remote-tracking branch 'gsedej/master' 2014-03-15 13:53:05 +01:00
cc9cii
e6977d00e8 Oops. Fix typo picked up by Zini. 2014-03-15 08:16:35 +11:00
cc9cii
b2e3fa70c2 Fix spelling errors in comments. 2014-03-14 07:04:39 +11:00
cc9cii
d54ae58ec9 Bug #900 fix - minor update to comments 2014-03-14 00:09:03 +11:00
cc9cii
d92740efc9 Bug #900 fix - only fixed AiWonder, AiCombat, AiTravel and others may need a different strategy to this. 2014-03-13 23:44:52 +11:00
Marc Zinnschlag
7bc97fb8b8 reworked code for player positioning on startup and new game 2014-03-13 13:19:32 +01:00
Gašper Sedej
43a12fffd5 indentation issue... 2014-03-12 14:37:44 +01:00
Gašper Sedej
d72a2f1ffb Added code to test if git hash is availible 2014-03-12 12:33:42 +01:00
scrawl
0cd40294a2 Fixed ranged combat for creatures 2014-03-12 11:30:44 +01:00
Gašper Sedej
06e02ed77f Added version and revision number to mainmenu 2014-03-12 10:53:56 +01:00
Marc Zinnschlag
2de862126a moved resources group creation from Engine to bsa component 2014-03-09 11:42:39 +01:00
scrawl
6eaa7553f8 Fixes #1181: Enable controls when loading a savegame 2014-03-09 03:34:49 +01:00
Sandy Carter
72a3c50eb8 (#1191) Disallow picking up if inventory disabled 
Check if window manager has allowed the inventory window
if not, then items should not be possible to pick up
 2014-03-08 13:45:54 -05:00
scrawl
072dc6d438 Feature #50: Implement marksman mechanics. 2014-03-08 06:03:45 +01:00
scrawl
12de0afb03 Feature #50: Spawn projectiles 
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
 2014-03-08 01:31:27 +01:00
cc9cii
f36bea03ab Bug #1189 fix by scrawl 2014-03-07 19:36:44 +11:00
scrawl
e08f6c9ce3 Bug #416: Copy framebuffer to a texture instead of not clearing 
Potentially faster than the previous workaround, and should work for triple buffering too.
 2014-03-06 04:01:25 +01:00
scrawl
83b6fcf22e Bug #416: Workaround for page flipping problem 2014-03-05 22:24:05 +01:00
scrawl
1d926816b5 Terrain: background load blendmaps & layer textures. Refactor QuadTree update. 2014-03-05 21:46:37 +01:00
scrawl
2a4e99c069 Set StaticGeometry origin 
Fixes an exception for coordinates far away from (0,0,0).
 2014-03-05 21:46:37 +01:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
scrawl
195071efc7 Terrain: geometry is now loaded in background threads. 
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
 2014-03-05 21:46:37 +01:00
scrawl
065b6d3331 Terrain: moved ESM::Land load to earlier in the startup procedure 
Required for background loading as we cannot load ESM::Land data from background threads.
 2014-03-05 21:46:36 +01:00
scrawl
8730b61362 Render maps after *all* cells have finished loading 
Still not fixing Bug #772, but at least this will allow for background loading of terrain.
 2014-03-05 21:46:36 +01:00
scrawl
c9e349f60f Terrain: support alternate coordinate systems. Get rid of LoadingListener for now 2014-03-05 21:46:36 +01:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
cc9cii
ce8d327e8e Debug MSVC build of openmw needs number of sections beyond 2^16 2014-03-05 22:11:10 +11:00
gus
d84319300a fix 2014-03-05 11:27:16 +01:00
gus
f4879dacd5 add AIfollow to summoned creatures 2014-03-05 11:24:39 +01:00
Marc Zinnschlag
f9d2fde783 Merge branch 'openmw-29' 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
 2014-03-04 09:34:38 +01:00
Marc Zinnschlag
0ae9cc0106 removed unused function 2014-03-03 08:21:16 +01:00
Marc Zinnschlag
ca30f2af3d minor fix 2014-03-02 11:03:37 +01:00
scrawl
a99aa15d14 Fix a copy&paste mistake leaving start rotation uninitialized 2014-02-28 17:23:58 +01:00
Marc Zinnschlag
0926501717 Merge remote-tracking branch 'cc9cii/branch_0_29_fixes' into openmw-29 2014-02-27 15:45:45 +01:00
cc9cii
56ae85df0c Fix 32bit Windows crash while taking the save screenshot. 2014-02-28 00:28:02 +11:00
cc9cii
8fa88f4480 sync with upstream 2014-02-28 00:13:57 +11:00
cc9cii
2421f23c2f cleanup the mess... 2014-02-27 23:59:23 +11:00
cc9cii
5b48ca114f aicombat pathfinding fix - check the correct list 2014-02-25 08:31:14 +01:00
cc9cii
85c467f00f Minor cleanup for aicombat pathfinding workaround. 2014-02-25 08:30:52 +01:00
Marc Zinnschlag
9b18e01507 keep track of which cells have state that needs to be saved 2014-02-24 10:03:04 +01:00
Marc Zinnschlag
bfcd768078 various bits of cleanup 2014-02-23 21:39:18 +01:00
Marc Zinnschlag
83ded18af0 encapsulated reference collections 2014-02-23 21:21:27 +01:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
Marc Zinnschlag
f220867144 make Ptr a bit more pointer-like 2014-02-23 18:17:41 +01:00
Marc Zinnschlag
b72c1c2c58 encapsulated water level 2014-02-23 17:34:18 +01:00
gus
95ff869163 Merge branch 'openmw-29' of https://github.com/zinnschlag/openmw.git into AIFix2 2014-02-23 17:07:49 +01:00
Marc Zinnschlag
79e723ad06 encapsulated mIds 2014-02-23 16:46:07 +01:00
Marc Zinnschlag
8ea686c6c8 encapsulated mState 2014-02-23 14:26:36 +01:00
cc9cii
1bd2664cb0 aicombat pathfinding workaround 2014-02-23 11:47:25 +01:00
cc9cii
1ab5948f19 merge upstream changes 2014-02-23 19:11:37 +11:00
Marc Zinnschlag
b0ae5b8ab7 Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29 2014-02-22 17:16:55 +01:00
cc9cii
fcfc8fcccb Revert "Allow MinGW64 compilation in Windows/msys" 
This reverts commit c3f350e3fb.

Conflicts:
	libs/platform/string.h
 2014-02-22 23:45:13 +11:00
cc9cii
ac606a865c Back out unnecessary change. 2014-02-22 23:22:23 +11:00
cc9cii
c241405d91 Fix Windows save & load. 2014-02-22 12:15:20 +11:00
cc9cii
c3f350e3fb Allow MinGW64 compilation in Windows/msys 2014-02-22 12:06:50 +11:00
Marc Zinnschlag
7693f712bc started making CellStore into a proper class; encapsulated mCell member 2014-02-21 11:35:46 +01:00
Marc Zinnschlag
736644de05 Revert "#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()" 
This reverts commit 51fb9f65ea.
 2014-02-20 12:31:40 +01:00
scrawl
d25b3ad9cb Fix AiCombat for creatures with weapons 2014-02-19 11:23:03 +01:00
scrawl
ebc67a82cf Don't list unnamed quests in the quest book 2014-02-19 11:23:03 +01:00
scrawl
1fba5d1bb9 Terrain: change world bounds from AABB to 4 floats 2014-02-19 11:23:03 +01:00
scrawl
bc376e6649 Closes #888: Treat "Bip 01" as animation root if existing 2014-02-19 11:23:03 +01:00
scrawl
439018e706 Get rid of useless return values 2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc Moved includes to appropriate place 2014-02-19 11:23:03 +01:00
Marc Zinnschlag
550e5eb686 Merge remote-tracking branch 'corristo/osx-music-fix' 2014-02-18 09:12:02 +01:00
gus
d8f24ac499 bug fix 2014-02-17 15:49:49 +01:00
Marc Zinnschlag
ea16f79d77 Merge remote-tracking branch 'gus/AIFix2' 2014-02-17 10:54:07 +01:00
gus
84959eea28 woops, thanks scrawl 2014-02-17 10:50:10 +01:00
gus
6e1425321b remove cout spam 2014-02-17 10:43:09 +01:00
gus
e5b19cf3c6 clean up 2014-02-17 10:37:11 +01:00
Nikolay Kasyanov
51fb9f65ea #1041 in progress: decode first sample batch right in OpenAL_SoundStream::play() 2014-02-17 02:59:23 +04:00
Nikolay Kasyanov
5e8cb2e466 Another attempt to fix #1041. This time I'm sending real data from decoder 
once after playback started.
 2014-02-17 02:35:13 +04:00
Marc Zinnschlag
c18c3e51ee handle IDs that don't exist anymore after loading 2014-02-16 16:23:05 +01:00
Marc Zinnschlag
9788bbcab9 partially store creature state in saved game files (only attributes and dynamics for now) 2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85 store NPC state in saved game files 2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144 store list of known topics in saved game files 2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15 Merge branch 'script' 
Conflicts:
	readme.txt
 2014-02-16 12:12:56 +01:00
Marc Zinnschlag
9cdfca6c26 Merge remote-tracking branch 'potatoesmaster/disable-crash' 2014-02-15 22:55:00 +01:00
Emanuel Guevel
3d8ca02479 Fix breaking of enchanted items casting 2014-02-15 17:39:57 +01:00
gus
a315d5cc2b aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp 2014-02-14 12:55:14 +01:00
Marc Zinnschlag
451e1f413b instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly 2014-02-14 11:15:16 +01:00
Emanuel Guevel
7c981587fc When searching object by id, search in active cells before searching in the player's inventory 2014-02-13 22:58:12 +01:00
Emanuel Guevel
e597328b6b Make enable/disable a no-op for items in containers 2014-02-13 20:24:27 +01:00
Marc Zinnschlag
d6e212a02b Merge branch 'master' into script 2014-02-13 15:02:02 +01:00
gus
7c6e27e4f9 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 
Conflicts:
	apps/openmw/mwmechanics/aitravel.cpp
 2014-02-13 12:59:04 +01:00
Marc Zinnschlag
9c52820754 Merge remote-tracking branch 'scrawl/master' 2014-02-13 10:54:51 +01:00
scrawl
c6fb0f2d9b Removed terrain component's dependency on ESM 2014-02-13 10:13:53 +01:00
Marc Zinnschlag
dde4fbd818 allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away 2014-02-13 09:52:44 +01:00
Marc Zinnschlag
b3412b7eec another case fix (remote member access again) 2014-02-12 15:22:17 +01:00
Marc Zinnschlag
dc433a3c09 fixed case handling problem for local variable access 2014-02-12 13:38:16 +01:00
Marc Zinnschlag
388735046f fixed broken remote member variable access 2014-02-12 13:35:24 +01:00
Emanuel Guevel
8824af30b4 Allow to display message box outside of dialogue window 2014-02-11 18:26:57 +01:00
Marc Zinnschlag
ffd1783690 Merge remote-tracking branch 'mrcheko/master' 2014-02-11 17:03:50 +01:00
Marc Zinnschlag
e44a7268fc Merge remote-tracking branch 'potatoesmaster/selected-spell' 2014-02-11 17:00:41 +01:00
Emanuel Guevel
a3eea4f6b6 Do not allow spellcasting stance without spell selected 2014-02-11 16:34:51 +01:00
Emanuel Guevel
70d35da116 Unset selected spell when removed 2014-02-11 16:34:23 +01:00
Emanuel Guevel
6a4820c0f7 Show a message when the player attempts to cast a disabled spell 2014-02-11 14:52:58 +01:00
Marc Zinnschlag
9de2922d22 fixed case problem in remote member variable access 2014-02-11 13:56:56 +01:00
Marc Zinnschlag
3b990795c4 added access to remote access of local variables of global scripts 2014-02-10 14:45:55 +01:00
mrcheko
a6be72673c improves animation-controlled velocity check 2014-02-08 16:59:15 +02:00
scrawl
8f949c6ae2 Fix lockpicks 2014-02-08 07:35:34 +01:00
scrawl
6ce499f0e6 Fixes #848: Use hardcoded animation velocity for first person movement 2014-02-06 04:05:22 +01:00
scrawl
ff11d85a62 Fix wrong assertion 2014-02-06 03:15:01 +01:00
gus
632834ce10 WIP 2014-02-05 16:12:50 +01:00
scrawl
4a26909172 Fixes #1159: Don't allow quick keys menu in chargen 2014-02-05 12:15:49 +01:00
scrawl
677fc84223 Refactor actors update 2014-02-05 09:50:21 +01:00
scrawl
0cc1cd8f7e Fix message box formatting bug 2014-02-05 05:18:11 +01:00
scrawl
7907181c0c Fix uninitialized member 2014-02-05 05:18:11 +01:00
scrawl
ffe19e7a52 Feature #50: Handle attach & release of projectiles 2014-02-05 05:18:11 +01:00
scrawl
8b8fb931a0 Feature #50: Don't allow ranged weapon attack when ammunition is empty 2014-02-05 05:18:10 +01:00
scrawl
a07eaa0c0d Feature #50: Allow body pitch in third person for ranged weapon aiming 2014-02-05 05:18:10 +01:00
scrawl
5ee105c812 Fix typo 2014-02-05 05:18:10 +01:00
scrawl
7cf22391a5 Feature #50: Handle weapon controllers (i.e. bowstring animations, etc) 2014-02-05 05:18:10 +01:00
scrawl
e1e7a492e2 Fix movement speed formula for flying creatures 2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc Fixes #1158 (Armor rating label issues) 2014-02-05 05:18:10 +01:00
scrawl
8aed4fcfa4 Correction for marksman weapon inventory preview 2014-02-05 05:18:10 +01:00
scrawl
5b076aa570 Revert "Bug #1074: Inventory paperdoll obscures armour rating" 
This reverts commit b017a3be3e.
 2014-02-05 05:18:10 +01:00
scrawl
df78357e05 Handle knockout separately (Closes #1151) 2014-02-05 05:18:09 +01:00
mrcheko
688f359a33 discard creatures speed and negative fatique changes 2014-02-03 23:09:26 +02:00
Marc Zinnschlag
c5b92ed6c8 Merge remote-tracking branch 'pvdk/versioninfo' 2014-02-03 11:21:11 +01:00
Marc Zinnschlag
21f502df34 compatibility fix 2014-02-03 11:20:55 +01:00
pvdk
f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 2014-02-03 02:27:24 +01:00
Alexander "Ace" Olofsson
e50a393de4 Fix linking issues on Windows using MSVC. 2014-02-02 23:59:57 +01:00
Marc Zinnschlag
32860a05e3 added dummy implementations for getPcInJail and getPcTraveling 2014-02-02 15:35:18 +01:00
mrcheko
761f13d3ce activate whole-body attack animations 2014-02-02 16:29:51 +02:00
Marc Zinnschlag
914ab1b8ab allow 'x' instead of 'getjournalindex x' 2014-02-02 15:08:27 +01:00
Marc Zinnschlag
4ee43612f6 added new switch: --script-warn 2014-02-02 14:09:59 +01:00
mrcheko
b85a4dd35e pos accum without conformity with animation bug/creature speed 2014-02-02 15:01:49 +02:00
Alexander "Ace" Olofsson
e3d85af70a Fix an issue with int32_t being unknown on windows. 2014-02-02 13:57:19 +01:00
scrawl
1deb0a7cdf Savegame dialog: Set key focus to editbox 2014-02-01 18:42:01 +01:00
scrawl
ec46575671 Overwriting saves fixes - copy description of overwritten slot, ask for confirmation 2014-02-01 18:42:01 +01:00
scrawl
6d37cd7e86 Savegame dialog: Don't allow empty save names 2014-02-01 18:42:01 +01:00
scrawl
63284d21a0 Savegame dialog: 'Enter' while editing a name is equivalent to pressing the ok button 2014-02-01 18:42:01 +01:00
scrawl
dea9d21db6 Some additional safety checks for global map loading 2014-02-01 18:42:01 +01:00
scrawl
f89b3cac02 Feature #764: Store the actor that gave the dialog response 2014-02-01 18:42:01 +01:00
scrawl
a988a0d6dc Don't add duplicate topic responses to the journal 2014-02-01 18:42:00 +01:00
scrawl
37ef8ec908 Savegame dialog: support loading saves using Enter key or double-click 2014-02-01 18:42:00 +01:00
scrawl
49e26415be Don't call loadGame() from within the MWMechanics::Actors update sequence 2014-02-01 18:42:00 +01:00
Marc Zinnschlag
1b5301eec0 Merge branch 'savedgame' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
 2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d added creature/NPC state to saved games (only container/inventory for now) 2014-02-01 17:36:23 +01:00
Marc Zinnschlag
d2ec3ffdc8 handle equipped items when serialising inventory state 2014-02-01 17:31:05 +01:00
Marc Zinnschlag
bcc5894e2d changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later) 2014-02-01 15:24:01 +01:00
Marc Zinnschlag
dd674566a2 store content of containers in saved game files 2014-01-31 13:25:32 +01:00
scrawl
4ec86d1c68 Bug #1147: Fix the inventory preview pose used for ranged weapons 2014-01-31 05:06:35 +01:00
scrawl
60bbab52fe Support keyframe controllers for bones that aren't in the skeleton base 2014-01-31 05:06:34 +01:00
scrawl
da34f8bda1 Fix LastHitObject 2014-01-31 04:43:35 +01:00
scrawl
067c2bc2ec Disable combat movements for creatures without weapons 2014-01-31 04:43:35 +01:00
scrawl
7820ea5806 "Always best attack" should only affect the player 2014-01-31 04:43:35 +01:00
scrawl
d0c6ecd03a Bug #1148: Workaround for broken images in some MW versions 2014-01-31 04:43:35 +01:00
scrawl
52f89e9a17 Don't play "idle" voice entries for NPCs with Hello 0 
Not entirely sure if this is correct, but it prevents the NPCs in the starting boat from incorrectly playing them.
 2014-01-31 04:43:35 +01:00
scrawl
39d86a9468 Improvements to smooth NPC steering 2014-01-31 04:43:29 +01:00
mrcheko
80d8aa4030 bug with sequence of knockouts; giving sense to some hit state code 2014-01-30 23:54:26 +02:00
Marc Zinnschlag
900532a6ca store additional state of lights in saved game files 2014-01-30 12:37:33 +01:00
Marc Zinnschlag
ec7cb90ca4 added support for serialisation of CustomData state 2014-01-30 11:50:13 +01:00
scrawl
2b15b8b484 Fix gold bugs (Fixes #1145, Fixes #1146) 2014-01-29 15:37:27 +01:00
scrawl
305e78c981 Fix creature attack bug 2014-01-29 15:37:27 +01:00
scrawl
e717694b36 Reset Run stance in AiWander 2014-01-29 15:37:27 +01:00
scrawl
23ffb8a4dc Fixes #1143: Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame. 
This makes the Mehra Milo script work properly.
 2014-01-29 15:37:27 +01:00
scrawl
434fd21584 Don't set journal index if a higher index is currently set 
This is vanilla behaviour, and required for the Mehra Milo vivec informants quest.
 2014-01-29 15:37:27 +01:00
scrawl
edff88542b Allow double click / Enter key for accepting race/class/birthsign 2014-01-29 15:37:27 +01:00
scrawl
a8a09762ce Don't crash when deleting or disabling a moving door 2014-01-29 15:37:26 +01:00
scrawl
190512156d Use some more GMSTs for enchanting 2014-01-29 15:37:26 +01:00
scrawl
ea7e0abdc2 Move WhenStrikes skill success to a more appropriate place 2014-01-29 15:37:26 +01:00
scrawl
b8db151da7 Add missing skill increases for armor hits 2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d Use GMSTs for levelup 2014-01-29 15:37:26 +01:00
scrawl
cc40cec395 Move levelup to NpcStats 
The code came from back in the days where NpcStats did not derive from CreatureStats.
 2014-01-29 15:37:26 +01:00
scrawl
ba67bf45f8 Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail. 
This caused an exception when looting a creature that had moved cells.
 2014-01-29 15:37:26 +01:00
scrawl
365ae15532 Drag&Drop: auto-hide windows that can't be drop targets on mouseover 2014-01-29 15:37:26 +01:00
mrcheko
3a5da7e6e8 merged with master 2014-01-29 00:03:00 +02:00
mrcheko
5ee1dc6be8 attacktypes error fix 2014-01-28 21:07:26 +02:00
Marc Zinnschlag
a473c3f619 some cleanup 2014-01-28 12:36:10 +01:00
Marc Zinnschlag
fd5486864a Merge remote-tracking branch 'gus/AIFix2' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/actors.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2014-01-28 12:33:31 +01:00
mrcheko
e50e94af0b remove CreatureStats::mAttackType, set/getAttackType() 2014-01-27 23:05:17 +02:00
mrcheko
fe0268062d merge with master 2014-01-27 22:38:01 +02:00
gus
846276f747 clean up 2014-01-27 15:14:24 +01:00
Marc Zinnschlag
29c3a288e3 load and save of reference in cells (without CustomData state) 2014-01-27 13:27:42 +01:00
mrcheko
45b3aa3d93 corrected things connected to determining attack type 2014-01-26 23:32:57 +02:00
gus
f5d589388c bug fix 2014-01-26 22:06:54 +01:00
gus
764011dd1b clean up 2014-01-26 21:53:55 +01:00
gus
7cb47aa635 new implementation of pathfinding. Works, but need clean up 2014-01-26 21:26:19 +01:00
scrawl
eba6c9a8fd Fix massive console spam regarding the scrib's idle3 animation 2014-01-26 02:49:32 +01:00
scrawl
b1066de81d Revert "Merge remote-tracking branch 'mrcheko/master'" 
This reverts commit 4e360136b1, reversing
changes made to 047bbe43b2.

Conflicts:

	apps/openmw/mwmechanics/aicombat.cpp
 2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8 Revert "Merge remote-tracking branch 'mrcheko/master'" 
This reverts commit df7c139e2f, reversing
changes made to fec26342cd.
 2014-01-26 00:14:49 +01:00
scrawl
e0de76a6f7 Save/load global map 2014-01-25 19:06:14 +01:00
scrawl
e62bf8fca9 Remove some garbage 2014-01-25 16:41:26 +01:00
scrawl
79a9c4e048 Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame. 2014-01-25 16:33:39 +01:00
scrawl
bdb03926c2 Fix crash when loading another game after dying 2014-01-25 16:13:45 +01:00
scrawl
28185e2017 Death/godmode fixes: Revive player *after* character update, since there might be fall damage. 2014-01-25 15:54:24 +01:00
scrawl
f09328ca84 Clear global map overlay when starting/loading a game 2014-01-25 13:34:56 +01:00
gus
707e579dfe Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
 2014-01-24 19:16:50 +01:00
gus
5ca5946760 WIP 2014-01-24 19:13:23 +01:00
scrawl
03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
 2014-01-24 18:28:35 +01:00
scrawl
295aed3533 Implement savegame screenshots 2014-01-24 17:49:16 +01:00
scrawl
786ed6ca5b Include some required Ogre headers explicitely 2014-01-24 15:02:34 +01:00
scrawl
ac1859fb77 Merge branch 'savedgame' of https://github.com/zinnschlag/openmw into savedgame 2014-01-24 15:02:13 +01:00
scrawl
9b9c39af7a Fix being able to activate magic bolts mid-flight 2014-01-24 13:22:39 +01:00
scrawl
ac4c904e62 Fix projectile bug 2014-01-24 13:22:30 +01:00
mrcheko
87e83a92f8 refactoring of setting an attack type 2014-01-23 23:14:20 +02:00
scrawl
70264eae3b Feature #764: Quest completetion status in quest book 2014-01-23 13:08:56 +01:00
scrawl
849ee54399 Feature #764: Show quest names in quest book if present 2014-01-23 12:54:37 +01:00
Marc Zinnschlag
460089c0aa ignore deleted references that did not came from a content file 2014-01-23 12:53:55 +01:00
Marc Zinnschlag
419e3a7d30 write references in cells to saved game file 2014-01-23 12:51:42 +01:00
scrawl
358cc3c62f Closes #1060: Fix incorrect message box size 2014-01-23 12:24:06 +01:00
Marc Zinnschlag
22cb4784b5 store cell state in saved game files (no references yet) 2014-01-23 11:29:40 +01:00
pvdk
c95b8bcb39 Moved the generated version header stuff into components 2014-01-22 17:33:55 +01:00