Commit Graph

568 Commits (fa3baac0f33aac3a066b3df4360ca2a9a02f27df)

Author SHA1 Message Date
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
7 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
7 years ago
David Cernat fec82dc033 Merge pull request #202 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017
7 years ago
scrawl 1ffb9e1bf3 Remove renderWorldMap() 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
Koncord 9199446edd [Client] Add Files::Collections to Main::init() arguments 7 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 7 years ago
David Cernat 38ccc2671c Merge pull request #164 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
scrawl 8f79fa3d72 Add resource statistics panel opened with F4 7 years ago
scrawl b40ca9b60a Set the window rectangle on the Viewer's EventQueue 7 years ago
David Cernat a1988ac6ef Merge pull request #161 from OpenMW/master
Add OpenMW commits up to 21 Feb 2017
7 years ago
scrawl 3f27c8cc97 Always print context for script warnings to remove the need for verbose option
(Fixes #2813)
7 years ago
David Cernat cdffbc05f7 Merge pull request #159 from OpenMW/master
Add OpenMW commits up to 19 Feb 2017
7 years ago
scrawl 481c440698 Print OSG version on startup 7 years ago
David Cernat 2ed9ae5739 Merge pull request #149 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017
7 years ago
scrawl 72c6b11cf8 Move global map render to the worker thread 7 years ago
scrawl 026a05718f Construct the WorkQueue in Engine 7 years ago
David Cernat ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
7 years ago
scrawl 066aa2e60e Always run preloadCommonAssets even when the menu is skipped
Move to before the content files are loaded so we can do preloading in parallel with content file loading
7 years ago
David Cernat 63974af131 Merge pull request #139 from OpenMW/master
Add OpenMW commits up to 3 Feb 2017
7 years ago
scrawl 6d8c414071 Set osgViewer ReleaseContextAtEndOfFrameHint to false for better performance when in SingleThreaded mode
The flag is normally set to off by default when using Viewer::run() - however since we're using our own frame loop, we have to unset the flag ourselves
7 years ago
scrawl c5f8ff6e0e Add names to several nodes for debugging purposes 7 years ago
David Cernat 9f8f62b765 Merge pull request #137 from OpenMW/master
Add OpenMW commits up to 1 Feb
7 years ago
scrawl 34deb6e7b1 Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes 7 years ago
David Cernat 973db7c78a Merge pull request #113 from OpenMW/master
Add OpenMW commits up to 17 Dec
8 years ago
Koncord 536715cf46 Cleanup tes3mp headers 8 years ago
Koncord 753dc50131 Fix crash if connection has failed 8 years ago
MiroslavR c34d85ffc2 Implement water sounds (Closes #451) 8 years ago
David Cernat fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 8 years ago
David Cernat 7f98cddfdf Don't send animation packets from blacklisted scripts 8 years ago
David Cernat 75f6d82f08 Add a way of filtering out ingame scripts for upcoming script packets 8 years ago
David Cernat aaf4cc0d7e Prevent being in a menu from disabling script execution or actor damage 8 years ago
scrawl 9d2e0124dc Revert "Fix the cell changed flag no longer being reset after the player dies"
This reverts commit d7acec74fd.
8 years ago
scrawl d7acec74fd Fix the cell changed flag no longer being reset after the player dies 8 years ago
Koncord fa0a55c2a9 Fix use of freed memory 8 years ago
Koncord 96e2d749c7 New auth protocol 8 years ago
Aesylwinn b4a000913c Merge remote-tracking branch 'yar/master' into Even
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
8 years ago
Koncord 1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
8 years ago
Koncord 1e29409dd5 Add OpenMW-mp target 8 years ago
scrawl f99cd15f00 Vanilla-compatible activate / onActivate (Fixes #1629)
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
8 years ago
scrawl e05d975020 Change the way that texture filtering settings are applied at runtime 8 years ago
scrawl 1cda2bf796 Preload sky & water from the main menu 8 years ago
scrawl 9e5225bb6f Do not unref a Texture's image data after applying it 8 years ago
scrawl 5b972ee777 Move texture filtering settings to SceneManager
Practical benefits:

- Filter settings are now applied to native OSG format models. These models do not use TextureManager::getTexture2D since the model itself specifies a Texture.
- The GUI render manager will be able to use its own separate textures, making it easier to turn off filtering for them.
8 years ago
scrawl cc3563359e Refactor local script iteration (Fixes #2806, Fixes #3108)
This should be much safer. Don't use recursion. Don't fail if mIgnore happens to be in the list twice. Don't rely on preconditions / assertions.
8 years ago
scrawl 7f7e8c63bf Correct path to gamecontrollerdb.txt (Fixes #3112) 9 years ago
Chris Robinson f1faeeae3a Use separate config options for min and mag texture filters 9 years ago
Chris Robinson 5c0a847eaf Combine some duplicate code 9 years ago
Chris Robinson b830a413d3 Rename the texture filter options
To avoid compatibility issues with upgrading from or downgrading to older
builds.
9 years ago