Commit Graph

149 Commits (a083439139b883b260605fac90d6304ea293effa)

Author SHA1 Message Date
David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
6 years ago
Capostrophic 51d369d4da Add resumeGame method 6 years ago
David Cernat 029dfc56ba [General] Implement player scale as part of PlayerShapeshift 6 years ago
David Cernat bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
7 years ago
Andrei Kortunov c6fd75bf42 Take in account elemental shields for GetResist and SetResist script commands (bug #4093) 7 years ago
David Cernat 43a3daf0aa [General] Add & implement PlayerShapeshift packet for werewolf states 7 years ago
David Cernat e36c0afc59 [General] Send faction reputation via PlayerFaction packets 7 years ago
David Cernat 1d504a665f [General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets 7 years ago
David Cernat 48ee8fd536 [Client] Send PlayerFaction packets when getting expelled from factions 7 years ago
David Cernat e6983993c2 [General] Implement sending and reading of PlayerFaction packets 7 years ago
David Cernat c10dd1b002 Merge pull request #188 from OpenMW/master
Add OpenMW commits up to 24 Mar 2017
7 years ago
Allofich 57aeec59d5 Change bounds behavior of stat script commands
Fixes (#3776)
7 years ago
David Cernat df051a777a Merge pull request #181 from OpenMW/master
Add OpenMW commits up to 4 Mar 2017
7 years ago
scrawl 29556a1802 More consistent wording of errors/warnings
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
7 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 7 years ago
David Cernat b320910c5f [Client] Don't add/remove all spells from ingame scripts for LocalPlayer 7 years ago
Koncord 536715cf46 Cleanup tes3mp headers 8 years ago
David Cernat 95efb77e53 Implement sending of ID_GAME_SPELLBOOK from client 8 years ago
scrawl e6619c5306 Rebuild actor animations on resurrection (Fixes #3124)
A new animation is necessary to set up the correct InventoryStore listener, to get notified of changes like the actor no longer being a werewolf, etc.
8 years ago
scrawl f052c05018 Move werewolf functions from World to MechanicsManager 9 years ago
scrawl 2bd8d60e9f Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank 9 years ago
scrawl 271fcb80c6 Remove container scripts before deleting container 9 years ago
scrawl 07b064f616 Rename to lowerCaseInPlace 9 years ago
Alexander "Ace" Olofsson 7d4125d97f Fixes for building with unity build 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 9 years ago
dteviot 0ee7407101 extracted common sub-expressions. 9 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 9 years ago
scrawl c819180aa1 Minor cleanup 9 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
9 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
9 years ago
scrawl ae77eacd7e Skill progress refactoring 9 years ago
scrawl 431f540791 ESSImport: fix NPC factions 9 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
scrawl 2952a0e2aa Make Resurrect function reset most of the runtime state (Fixes #2181) 10 years ago
scrawl d7220cdc2f Do not allow decrease below zero in modCurrentMagicka and modCurrentHealth (Fixes #2158) 10 years ago
scrawl dab05471be Reset crime when bounty is reset to 0 by a script (Fixes #2057) 10 years ago
Marc Zinnschlag 984b586bb1 fix for implicit references 10 years ago
Marc Zinnschlag 8afdf0f46b dagoth fix 10 years ago
scrawl 69bbbefc09 setDynamic workaround for broken endgame scripts (Fixes #2016) 10 years ago
scrawl c4fa671381 Don't allow raising faction rank if the next rank has no name (Fixes #1975) 10 years ago
Marc Zinnschlag 80d39780ae same fix for a couple of additional instructions 10 years ago
Marc Zinnschlag 7de49a66e2 fix for PCJoinFaction and for getPcRank without explicit reference 10 years ago
Marc Zinnschlag 0d8bfbfa9b getpcrank did not read the explicit reference in some cases (Fixed #1767) 10 years ago
scrawl 2db50da8dd Implement magic effect script instructions (Feature #1489) 10 years ago
scrawl eb1888a540 Fix GetPcRank and PcExpelled not accepting Faction IDs properly (Fixes #1709) 10 years ago
scrawl 205e039a39 Allow modCurrent instructions to decrease below zero (Bug #1589) 10 years ago
scrawl 2506c16bf5 Add a dummy GetStat function returning 0 (Fixes #1589) 10 years ago
scrawl 2451eead8a Some additional wrapping for faction rank instructions 10 years ago
scrawl e23a7694f3 Don't throw exception when using ModDisposition on creatures (Fixes #1548) 10 years ago
scrawl c3e4160a0a Don't crash in StatsWindow for invalid faction rank values
PcRaiseRank: don't allow to raise rank beyond max rank
10 years ago