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

605 commits

Author SHA1 Message Date
scrawl
f6ca7295a6
Revert "Merge pull request #1595" 
This reverts commit 7ef7b1a7b1, reversing
changes made to 9e7e4de0ab.
 2018-01-09 13:47:57 +00:00
scrawl
7ef7b1a7b1
Merge pull request #1595 2018-01-09 00:42:27 +00:00
Thunderforge
bd072b131b Moving controller file out of the controllers subdirectory 2018-01-02 20:58:43 -06:00
Andrei Kortunov
b277b83810 Display the 'Screenshot saved' message after the screenshot saving (bug #4191) 2018-01-02 14:52:42 +04:00
Thunderforge
3f7143556a Providing different mappings depending on the version of SDL installed 2018-01-01 22:16:54 -06:00
scrawl
36f4f0ef85 Don't increase simulationTime while the game is minimized (Fixes #4211) 2017-11-16 18:48:49 +00:00
Miloslav Číž
8f32114025 segfault fix 2017-11-09 18:26:27 +01:00
scrawl
f67dbc8aa0 Remove redundant update function 2017-09-24 19:08:15 +02:00
scrawl
8c6a8ca48d Respect the framelimit in all cases (Fixes #3531) 
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
 2017-08-30 21:26:30 +00:00
spycrab
632d39ca76 Allow starting at an (unnamed) exterior cell using --start (Feature #3941) 2017-08-06 22:31:07 +02:00
scrawl
a629d48df6 Update the facedObject after the camera is updated 2017-07-19 13:05:51 +02:00
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
 2017-06-09 19:08:53 +02:00
scrawl
1ffb9e1bf3 Remove renderWorldMap() 2017-04-21 00:50:22 +02:00
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.
 2017-03-04 21:48:31 +01:00
scrawl
8f79fa3d72 Add resource statistics panel opened with F4 2017-02-22 14:28:45 +01:00
scrawl
b40ca9b60a Set the window rectangle on the Viewer's EventQueue 2017-02-22 01:49:54 +01:00
scrawl
3f27c8cc97 Always print context for script warnings to remove the need for verbose option 
(Fixes #2813)
 2017-02-21 04:32:59 +01:00
scrawl
481c440698 Print OSG version on startup 2017-02-19 13:26:45 +01:00
scrawl
72c6b11cf8 Move global map render to the worker thread 2017-02-14 07:58:16 +01:00
scrawl
026a05718f Construct the WorkQueue in Engine 2017-02-14 07:58:16 +01:00
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
 2017-02-09 03:16:36 +01:00
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
 2017-02-02 22:16:59 +01:00
scrawl
c5f8ff6e0e Add names to several nodes for debugging purposes 2017-02-02 21:49:52 +01:00
scrawl
34deb6e7b1 Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes 2017-02-01 06:00:14 +01:00
MiroslavR
c34d85ffc2 Implement water sounds (Closes #451) 2016-11-28 21:34:58 +01:00
scrawl
9d2e0124dc Revert "Fix the cell changed flag no longer being reset after the player dies" 
This reverts commit d7acec74fd.
 2016-10-13 17:44:03 +02:00
scrawl
d7acec74fd Fix the cell changed flag no longer being reset after the player dies 2016-10-13 14:38:35 +02:00
scrawl
f99cd15f00 Vanilla-compatible activate / onActivate (Fixes #1629) 
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
 2016-02-26 13:08:35 +01:00
scrawl
e05d975020 Change the way that texture filtering settings are applied at runtime 2016-02-18 19:37:55 +01:00
scrawl
1cda2bf796 Preload sky & water from the main menu 2016-02-09 01:28:13 +01:00
scrawl
9e5225bb6f Do not unref a Texture's image data after applying it 2016-02-05 23:21:54 +01:00
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.
 2016-02-05 21:03:10 +01:00
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.
 2016-02-03 16:16:20 +01:00
scrawl
7f7e8c63bf Correct path to gamecontrollerdb.txt (Fixes #3112) 2015-12-31 00:37:47 +01:00
Chris Robinson
f1faeeae3a Use separate config options for min and mag texture filters 2015-12-13 17:05:19 -08:00
Chris Robinson
5c0a847eaf Combine some duplicate code 2015-12-13 16:51:27 -08:00
Chris Robinson
b830a413d3 Rename the texture filter options 
To avoid compatibility issues with upgrading from or downgrading to older
builds.
 2015-12-13 16:02:09 -08:00
Chris Robinson
646092ce3a Add warnings when loading unknown texture options 2015-12-13 15:20:59 -08:00
Chris Robinson
76bde5ee13 Separate and expand texture filtering options 2015-12-13 11:25:01 -08:00
scrawl
05f1fbf593 WindowManager: explicitely pass the ESMStore 
Fixes potential crash when the loading screen layout tries to retrieve a GMST value via #{GMST} syntax before the World has been created.

Possibly related to Bug #2854.
 2015-12-09 01:09:09 +01:00
scrawl
d894d54e41 Improve path conversions 2015-11-26 17:15:28 +01:00
cfcohen
67c4b17581 Commit files that I thought wre in the previous commit. :-[ I'm 
accustomed to the hg behavior of commiting all modified files by
default.
 2015-11-25 13:17:03 -05:00
scrawl
05498ad592 Refactor: InputManager no longer depends on Engine 2015-11-14 03:01:24 +01:00
scrawl
13c7235b6b Remove old FPS setting code 2015-11-07 00:13:13 +01:00
scrawl
e13eb625d3 New water WIP 
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader

Still to do: see comments...
 2015-10-29 00:25:23 +01:00
scrawl
481f23d955 Implement framerate limit setting 
The framerate limit can be used to reduce strain on the CPU and GPU, in a way similar to VSync, but without the increased input lag that is typical with VSync.
 2015-09-07 16:05:51 +02:00
scrawl
d11952c48a Stop rendering when the window is minimized 2015-09-04 03:44:14 +02:00
slothlife
4fd00a75d5 Merge advanceTime and advanceTimeByFrame 2015-08-27 14:53:52 -05:00
slothlife
54fa5273dc Refactor weather transitions to act more like MW 
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
 2015-08-26 22:59:21 -05:00
Marc Zinnschlag
a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-08-23 12:11:30 +02:00
scrawl
af3b0cd883 Improve some error messages 2015-08-21 00:31:43 +02:00
dteviot
ff5ef7055e extracted function CreatureStats::isParalyzed() 2015-08-20 18:12:37 +12:00
Jordan Ayers
be7bd9529d Classes shouldn't use MWBase::Environment to access their own members. 2015-08-16 16:56:44 -05:00
scrawl
b01abe4d19 Stop title music when the game starts (Fixes #2468) 2015-07-19 02:08:24 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2015-07-18 12:22:37 +02:00
slothlife
f8f0380413 Fix for loading window icon on Windows 2015-07-17 21:41:53 -05:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in 
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
 2015-07-18 03:09:04 +02:00
scrawl
9fc2c2e8ee Don't advertise an alpha channel in GraphicsContext::traits (Bug #2677) 2015-06-14 16:32:34 +02:00
scrawl
195e1a8410 Fix the Viewer's FrameStamp not being set correctly during Engine::frame 2015-06-14 15:28:22 +02:00
scrawl
7407bbdac9 Add a function for SDL error handling 2015-06-12 01:08:58 +02:00
scrawl
800bd511f6 Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649) 2015-06-12 00:12:12 +02:00
scrawl
700000cbca Error handling fix 2015-06-05 02:57:50 +02:00
scrawl
403ce30a35 Graceful handling for failing to create SDL window 2015-06-05 02:53:10 +02:00
scrawl
e642f20a65 Restore screenshot key functionality 2015-06-03 17:25:18 +02:00
scrawl
9ee63dc3f4 Change stats viewer key to f3 2015-05-28 16:28:48 +02:00
scrawl
3dcb167066 Map rendering 2015-05-26 16:40:44 +02:00
scrawl
da24e298ee Fix -Wreorder warnings 2015-05-23 22:44:00 +02:00
scrawl
9b8e2e9db3 Port MWRender::Camera 2015-05-22 00:29:27 +02:00
scrawl
737c2114dc Change viewer stats keybinding to F9 2015-05-15 19:43:48 +02:00
scrawl
b7fa645530 Don't destroy a NULL window 2015-05-15 19:34:18 +02:00
scrawl
24bb2e152c Apply texture filter setting changes 2015-05-14 21:42:04 +02:00
scrawl
e3b1707bbd Pause simulationTime when the GUI is up 2015-05-14 02:26:19 +02:00
scrawl
9ea416b852 Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
scrawl
39fb46601a Readded input & event handling 2015-05-13 16:50:47 +02:00
scrawl
298b3ed2ef Create the GraphicsWindowSDL2 directly 2015-05-13 15:08:47 +02:00
scrawl
0498e6e5f0 Readded window icon 2015-05-13 15:03:21 +02:00
scrawl
36e0cfbc9d Cleanup 2015-05-13 03:36:20 +02:00
scrawl
375b736e74 Use SDL to create the window 
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.

Thanks to KittyCat for the GraphicsWindowSDL2 code.
 2015-05-13 02:53:09 +02:00
scrawl
c843cfc8e2 Physics stub in preparation for rewrite 2015-05-10 00:28:51 +02:00
scrawl
c8eb77c557 Move StatsHandler construction to allow profiling of loading screen 2015-05-08 16:22:42 +02:00
scrawl
77f733362c Add stats graphs for Script, Mechanics and Physics timings 2015-05-07 21:57:02 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 2015-05-04 02:41:50 +02:00
scrawl
9de575ad42 Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen 
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
 2015-05-03 18:16:54 +02:00
scrawl
283b252142 Stub InputManager 2015-05-03 17:24:35 +02:00
scrawl
1a5407af98 Reduce texture memory usage in OpenMW 2015-05-02 19:36:36 +02:00
scrawl
8817f44d63 Remove advanced FPS counter (obsoleted by the OSG stats viewer) 2015-05-02 17:48:24 +02:00
scrawl
b0804734e5 Port VideoWidget 2015-05-01 03:03:44 +02:00
scrawl
a59940a2c7 Move MyGUI platform to components 2015-05-01 01:44:21 +02:00
scrawl
62847f0489 Use node masks to separate Scene and GUI 2015-05-01 01:44:21 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
scrawl
0ff7b2ff11 MechanicsManager, frame update 2015-04-25 15:19:17 +02:00
scrawl
15164e20f7 Cleanup fix 2015-04-24 23:30:30 +02:00
scrawl
42d6c6140c Add mygui backend by chris 2015-04-24 21:55:30 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
26766b8e0a Dead code removal 2015-04-21 23:36:36 +02:00
scrawl
9c4b2ea61a CreatureAnimation compiles 2015-04-19 03:05:47 +02:00
scrawl
083c41c950 Environment map for enchanted objects 2015-04-17 01:23:37 +02:00
scrawl
13a1ba0aab Moon rendering 2015-04-15 18:50:50 +02:00
scrawl
5dd1ab24fe More efficient StateSetController, beginnings of sky rendering 2015-04-14 15:58:16 +02:00