Commit Graph

142 Commits (celladd)

Author SHA1 Message Date
dteviot 36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
10 years ago
dteviot e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
Marc Zinnschlag ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 10 years ago
dteviot 45b6538820 fixed MSVC 2013 warning C4800
forcing value to bool 'true' or 'false'
10 years ago
scrawl 8931ddf428 Remove unneeded casts 10 years ago
scrawl 3ccf4642b4 Implement ToggleScripts 10 years ago
Marc Zinnschlag e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 10 years ago
Alexander "Ace" Olofsson fce404acc5 Remove some including of mwbase/world.hpp
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
10 years ago
MiroslavR 2223a69ab8 Fix getpcinjail returning 0 when the console is open 10 years ago
MiroslavR 9bbe6f8c5e Remove todo 10 years ago
MiroslavR 1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 10 years ago
scrawl 6d097fbfbd Normalise spelling of "levelled" throughout the code 10 years ago
scrawl 1780bcc238 Print RefNum in BetaComment 10 years ago
dteviot 7aa0f887c0 Minor changes to ESM::RefNum
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
10 years ago
scrawl 31d28e727f Implement leveled list script functions (Fixes #1546) 10 years ago
scrawl 886903d70e Implement HitAttemptOnMe function (Bug #2078) 10 years ago
scrawl 5f00a3d5c3 Reset lastHitObject when it is retrieved rather than every frame
This seems to be how vanilla MW does it.
10 years ago
scrawl be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 10 years ago
scrawl f49fde3d5d Add support for undeleting references (Fixes #2193)
Deleted references should be accessible via an explicit reference, and can be undeleted using "setdelete 0". Also the Resurrect function implicitely undeletes the given reference.
10 years ago
MiroslavR 6e1a11f322 Queue screen fade operations invoked by scripts 10 years ago
scrawl 4fd3a994e9 Add model and script information to BetaComment 10 years ago
MiroslavR 925fa8d193 Reset ownership of items dropped via 'drop' instruction (Fixes #2053) 10 years ago
scrawl 8cb09e89ed Make spells cast by scripts always succeed (Fixes #1993) 10 years ago
scrawl c010c28337 Implement ToggleWorld instruction 10 years ago
scrawl 603e558fb7 Fix broken getCollidingPc / getCollidingActor (cppcheck) 10 years ago
scrawl f3d4b63aaf Fix AI moving load doors and throw an exception when trying to do this (Fixes #1907) 10 years ago
scrawl 457b96a8af Reset bounty and crime immediately when going to jail (Fixes #1892) 10 years ago
scrawl d8943aef2f Encapsulate magic effect magnitude (Feature #1489) 11 years ago
scrawl a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 11 years ago
scrawl 543bb22e8f Implement collision script instructions (Fixes #1111) 11 years ago
scrawl ca45a63cf7 Close doors instantly when using Lock instruction 11 years ago
scrawl df62c06acf Print exterior grid position in betaComment 11 years ago
Marc Zinnschlag 3100206b28 replaced an assert with an exception 11 years ago
scrawl 77388fe2ce Implement BetaComment instruction (dumps reference info) 11 years ago
scrawl 797134aa51 Handle activation scripts in AiActivate (Fixes #1478) 11 years ago
scrawl e68600eda2 Make Activate instruction work properly even when onActivate was not called in the same frame.
There are two major differences to the old implementation:
 - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
 - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.

Fixes #1166 and #1346.
11 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
11 years ago
Emanuel Guevel 1e4a854433 Remove static method MWWorld::Class::get(&Ptr)
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
11 years ago
scrawl 028e00c98f Add missing status report for some toggle commands 11 years ago
Thomas f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 11 years ago
Thomas 61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 11 years ago
Thomas 420163d35f Small changes to lock command (If no valid lockLevel exists, defaults to 100) 11 years ago
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.
11 years ago
Marc Zinnschlag a91b386381 Merge remote-tracking branch 'jeffreyhaines/master' 11 years ago
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.
11 years ago
Marc Zinnschlag 86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/CMakeLists.txt
11 years ago
Jeffrey Haines 940c88d2ec Cleaned up code, implemented crime ids
There is a problem with my game freezing. ToggleAi stops my character
11 years ago
Jeffrey Haines b1abef7a38 Cleaned up code 11 years ago
Jeffrey Haines 58b135a2be Crime is now checked every frame call 11 years ago
Jeffrey Haines 6f1211dd8d Moved mWitnesses into Player. resetCrime for paying fine. 11 years ago