Commit Graph

957 Commits (8c7e06293fbe6d0ed1dd7dd0f424b9f1b6f92162)

Author SHA1 Message Date
scrawl 1522bda60b
Fix crash in getDistance when invoked before the game starts 7 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 7 years ago
David Cernat ecb0ad0d77 Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
7 years ago
Andrei Kortunov ba46473038 Do not skip weather transitions from SetPos script command (bug #3603) 7 years ago
Andrei Kortunov c908ad2fba Do not allow to place actors underground via SetPos (bug #3783) 7 years ago
David Cernat c9c363ebef [General] Allow GameSettings to set bed & wilderness resting separately 7 years ago
David Cernat 3508a16836 [General] Use GameSettings packet to set ability to rest and wait 7 years ago
David Cernat dd25c7db4e Merge pull request #324 from OpenMW/master
Add OpenMW commits up to 24 Oct 2017
7 years ago
scrawl 0c6ef17fb5 Add explicit variant of 'OnActivate' 7 years ago
David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
scrawl 64e27c032b Merge pull request #1481 from scrawl/keyfocus
WindowManager overhaul & improved keyboard support
7 years ago
scrawl 2ce79e07a4 Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways.
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
7 years ago
scrawl 32f9c8058a Remove redundant RestBed gui mode 7 years ago
scrawl ad4b91131f toggleGui renamed to toggleHud, remove unused variable 7 years ago
David Cernat 73e7aa838d Merge pull request #296 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwgui/container.cpp
7 years ago
scrawl 0e648222b8 Merge pull request #1446 from akortunov/takeallfix
Do not allow to equip a replacement, when take all items from a dead corpse
7 years ago
Andrei Kortunov 4580024d76 Unequip all items from dead corpse when take all items (bug #4095) 7 years ago
David Cernat 7f0ea7d01f Merge pull request #294 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/character.cpp
7 years ago
Andrei Kortunov 65d8e2ff5d Allow to use GetDetected without a reference (bug #3110) 7 years ago
David Cernat 960b91a53c Merge pull request #290 from OpenMW/master
Add OpenMW commits up to 17 Sep 2017
7 years ago
Chris Robinson 780e82480d Make the PlayMode and PlayType enums scoped
Also shorten them by putting them in the MWSound namespace
7 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 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
David Cernat a883c8f8aa [Client] Prevent scripts from creating PlayerTopic packet spam 7 years ago
David Cernat 056d54e9f7 [Client] Only send ObjectScale packets for objects located in cells 7 years ago
David Cernat ac27ca663b [Client] Don't send ObjectState packets for items in containers 7 years ago
Andrei Kortunov bc7353f100 Check animation state for GetPCRunning and GetPCSneaking 7 years ago
David Cernat d51736d68f [Client] Fix crashes caused by inventory items with disabling scripts 8 years ago
David Cernat 2f551aba02 [Client] Don't start dialogue via client scripts if already in dialogue
This prevents infinite greeting spam in scripts such as hlormarScript.
8 years ago
David Cernat 7173a48f4b [Client] Prevent ObjectState packet spam 8 years ago
David Cernat fd046e42ef Merge pull request #242 from OpenMW/master
Add OpenMW commits up to 16 Jul 2017
8 years ago
Andrei Kortunov 3b163ce6ce Disable sound distortion for PlaySound script command 8 years ago
David Cernat 43a3daf0aa [General] Add & implement PlayerShapeshift packet for werewolf states 8 years ago
David Cernat e36c0afc59 [General] Send faction reputation via PlayerFaction packets 8 years ago
David Cernat be93ec8ef6 [General] Implement ObjectState packet 8 years ago
David Cernat 1d504a665f [General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets 8 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
8 years ago
Allofich 42402976e3 Fixes for building in MSVC 8 years ago
Bret Curtis c781d1f8ed purge unnecessary imports
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
8 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 8 years ago
David Cernat 4e5c8873e0 [General] Use ObjectSpawn instead of ObjectPlace for actors 8 years ago
David Cernat 7f6c5e2f48 [Client] Only send PlayerJournal packets for new journal entries 8 years ago
David Cernat 97768be14b [Client] Send ObjectPlace packet for random creatures interrupting rest 8 years ago
David Cernat 11369f6513 [General] Implement sending and reading of PlayerTopic packets 8 years ago
David Cernat 870fd9a78b [General] Remove ObjectUnlock packet, use ObjectLock with 0 lock instead 8 years ago
David Cernat 48ee8fd536 [Client] Send PlayerFaction packets when getting expelled from factions 8 years ago
David Cernat e6983993c2 [General] Implement sending and reading of PlayerFaction packets 8 years ago
David Cernat dcc61a095a [Client] Allow multiple WorldObjects to be added to a WorldEvent 8 years ago
David Cernat a82646a130 [Client] Delineate tes3mp-only code more clearly, part 2 8 years ago
David Cernat a5484d237b Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
8 years ago
Allofich 143ee387cc Add enabled check to animation script commands
(Fixes #3793)
8 years ago
Allofich ff3e307059 Pass parameters by const reference 8 years ago
David Cernat 11a9e3bdb1 Merge pull request #197 from OpenMW/master
Add OpenMW commits up to 14 Apr 2017
8 years ago
Allofich 6e405aed8c Adjustments to RemoveItem behavior
(Fixes #3796)
8 years ago
David Cernat 9759764699 [Client] Clean up getting and resetting of WorldEvent 8 years ago
David Cernat d7a760490e [Client] Simplify sending of world packets, part 2 8 years ago
David Cernat 4abe295a80 [Client] Simplify sending of world packets by adding WorldEvent methods 8 years ago
David Cernat 8b8c01f389 [General] Make ID_OBJECT_PLACE take effect only when sent back by server 8 years ago
David Cernat 2bd81c3de0 [Client] Use mpNum for every WorldObject 8 years ago
David Cernat e5cf632e1d [Client] Stop creating new reference numbers for placed/spawned objects 8 years ago
David Cernat c10dd1b002 Merge pull request #188 from OpenMW/master
Add OpenMW commits up to 24 Mar 2017
8 years ago
Allofich 57aeec59d5 Change bounds behavior of stat script commands
Fixes (#3776)
8 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
8 years ago
MiroslavR af1fe64408 GetSoundPlaying called on an equipped item now also looks for sounds played by the equipping actor (Fixes #3781) 8 years ago
Koncord 690211ad99 [General] Extract BaseEvent & BasePlayer from packets to functions
Move Send and Read functions to BasePacket
8 years ago
David Cernat df051a777a Merge pull request #181 from OpenMW/master
Add OpenMW commits up to 4 Mar 2017
8 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.
8 years ago
Koncord cea1425db1 [Client] Remove redundant newlines & keep ~120 columns 8 years ago
David Cernat a2ef39c655 Merge pull request #178 from OpenMW/master
Add OpenMW commits up to 2 Mar 2017
8 years ago
scrawl 1692b7f38e Merge pull request #1209 from dhustkoder/master
Added ConstContainerStoreIterator (Task #3092)
8 years ago
Rafael Moura 6c2ce2b2a1 Porting more ContainerStoreIterator usage to const version #4
removed const_cast revision
8 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 8 years ago
David Cernat ed2176c984 [Client] Reuse 1 BaseEvent over and over instead of creating new ones 8 years ago
David Cernat a1988ac6ef Merge pull request #161 from OpenMW/master
Add OpenMW commits up to 21 Feb 2017
8 years ago
scrawl 3f27c8cc97 Always print context for script warnings to remove the need for verbose option
(Fixes #2813)
8 years ago
David Cernat b320910c5f [Client] Don't add/remove all spells from ingame scripts for LocalPlayer 8 years ago
scrawl 05ad0dca34 Use ActionTeleport in COE/COC commands 8 years ago
Rafael Moura 9963601484 Porting code to ConstContainerStoreIterator #1 8 years ago
David Cernat c8cbfbef62 [General] Sketch out server requests to players for container data 8 years ago
David Cernat ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
8 years ago
scrawl 249fe9077b Handle 'tcb' command as an alias for 'tcg' 8 years ago
David Cernat e703dd42aa [Client] Rename LocalEvent into WorldEvent 8 years ago
David Cernat cdd796aba1 [Client] Send ID_PLAYER_INVENTORY from two more locations 8 years ago
David Cernat ecc456fea9 [General] Include charge int in WorldObject & send it w/ ID_OBJECT_PLACE 8 years ago
Koncord f78c749981 [Client] Use "NULL" instead "nullptr"
nullptr keyword introduced in C++11
8 years ago
David Cernat 9f8f62b765 Merge pull request #137 from OpenMW/master
Add OpenMW commits up to 1 Feb
8 years ago
scrawl 34deb6e7b1 Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes 8 years ago
David Cernat 703f253712 [Client] Delete new LocalEvents after sending them 8 years ago
David Cernat da2f66d6ba Merge pull request #135 from OpenMW/master
Add OpenMW commits up to 29 Jan
8 years ago
MiroslavR d97e9cfe7e Fix InterpreterContext::updatePtr updating mLocals to the implicit ref's locals when interpreting a targeted global script (Fixes #3738)
The interpreter context of a targeted global script would point to the target's locals instead of the global script instance's locals when the target changed cell during script execution. Credit to scrawl for the solution.
8 years ago
David Cernat 9f1e491a75 [General] Make WorldEvents store information about multiple objects 8 years ago
David Cernat 624b85347a [Client] Create LocalEvent class and use it instead of WorldEvent 8 years ago
David Cernat ee86c9161d [Client] Set InterpreterContext's sendPackets to false in constructor 8 years ago
David Cernat e2c595fc5d Add preliminary structure for journal changes 8 years ago
David Cernat c77120df6d Merge pull request #129 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwworld/actiontake.cpp
8 years ago
scrawl 45fb4f04b1 Update reference of the interpreter context when an Activate results in a take action (Fixes #3727) 8 years ago
scrawl 70c5f64caa Fix mLocals not being updated in InterpreterContext::updatePtr 8 years ago
David Cernat 973db7c78a Merge pull request #113 from OpenMW/master
Add OpenMW commits up to 17 Dec
8 years ago
Koncord 804259b2c9 Change some printf to LOG_MESSAGE_SIMPLE
printf is not streamed to files
8 years ago