Bret Curtis
99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont
...
Use the DejaVuLGCSansMono.ttf for profiler output
7 years ago
Andrei Kortunov
70b6d4983d
Use the DejaVuLGCSansMono.ttf in profilier output
7 years ago
David Cernat
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
7 years ago
Nikolay Kasyanov
5fcb091127
Replace FIXME with a detailed explanation of the issue
7 years ago
Nikolay Kasyanov
9c78364c45
Revert "Merge pull request #1771 from Xenkhan/master"
...
This reverts commit 9667dd051c
, reversing
changes made to f52e06fc19
.
7 years ago
Bret Curtis
a55583a395
Merge branch 'master' into master
7 years ago
Xenkhan
405a0caf29
Remove unneeded whitespace
7 years ago
Xenkhan
5a4817c147
Get rid of reinterpret_cast<>
7 years ago
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression
...
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
7 years ago
Xenkhan
24ddb66af9
Retrieve SDL window settings instead of using magic numbers
7 years ago
Nikolay Kasyanov
359f87ab9f
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
7 years ago
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360
7 years ago
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
7 years ago
scrawl
f6ca7295a6
Revert "Merge pull request #1595"
...
This reverts commit 7ef7b1a7b1
, reversing
changes made to 9e7e4de0ab
.
7 years ago
scrawl
7ef7b1a7b1
Merge pull request #1595
7 years ago
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
Andrei Kortunov
b277b83810
Display the 'Screenshot saved' message after the screenshot saving (bug #4191 )
7 years ago
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
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
300ca905fc
[Client] Don't pause game when minimizing window, despite MyGUI issues
7 years ago
David Cernat
28e1947f23
Merge pull request #339 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/engine.cpp
7 years ago
scrawl
36f4f0ef85
Don't increase simulationTime while the game is minimized ( Fixes #4211 )
7 years ago
Miloslav Číž
8f32114025
segfault fix
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
f67dbc8aa0
Remove redundant update function
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
scrawl
8c6a8ca48d
Respect the framelimit in all cases ( Fixes #3531 )
...
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
7 years ago
spycrab
632d39ca76
Allow starting at an (unnamed) exterior cell using --start (Feature #3941 )
8 years ago
David Cernat
b8b3856c73
Merge pull request #244 from OpenMW/master
...
Add OpenMW commits up to 19 Jul 2017
8 years ago
scrawl
a629d48df6
Update the facedObject after the camera is updated
8 years ago
David Cernat
aeb1ec3394
[Client] Delimit and clarify changes made by tes3mp to engine and main
8 years ago
David Cernat
708d3723eb
[Client] Fix client script messagebox buttons that had always broken in tes3mp
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
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
David Cernat
fec82dc033
Merge pull request #202 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017
8 years ago
scrawl
1ffb9e1bf3
Remove renderWorldMap()
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
9199446edd
[Client] Add Files::Collections to Main::init() arguments
8 years ago
David Cernat
a58601fb2b
[Client] Delineate tes3mp-only code more clearly, part 1
8 years ago
David Cernat
38ccc2671c
Merge pull request #164 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
8 years ago
scrawl
8f79fa3d72
Add resource statistics panel opened with F4
8 years ago
scrawl
b40ca9b60a
Set the window rectangle on the Viewer's EventQueue
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
cdffbc05f7
Merge pull request #159 from OpenMW/master
...
Add OpenMW commits up to 19 Feb 2017
8 years ago
scrawl
481c440698
Print OSG version on startup
8 years ago
David Cernat
2ed9ae5739
Merge pull request #149 from OpenMW/master
...
Add OpenMW commits up to 14 Feb 2017
8 years ago
scrawl
72c6b11cf8
Move global map render to the worker thread
8 years ago
scrawl
026a05718f
Construct the WorkQueue in Engine
8 years ago
David Cernat
ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
8 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
8 years ago
David Cernat
63974af131
Merge pull request #139 from OpenMW/master
...
Add OpenMW commits up to 3 Feb 2017
8 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
8 years ago
scrawl
c5f8ff6e0e
Add names to several nodes for debugging purposes
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
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
9 years ago
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
Koncord
1e29409dd5
Add OpenMW-mp target
9 years ago
scrawl
f99cd15f00
Vanilla-compatible activate / onActivate ( Fixes #1629 )
...
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
9 years ago
scrawl
e05d975020
Change the way that texture filtering settings are applied at runtime
9 years ago
scrawl
1cda2bf796
Preload sky & water from the main menu
9 years ago
scrawl
9e5225bb6f
Do not unref a Texture's image data after applying it
9 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.
9 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.
9 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
Chris Robinson
646092ce3a
Add warnings when loading unknown texture options
9 years ago
Chris Robinson
76bde5ee13
Separate and expand texture filtering options
9 years ago
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 .
9 years ago
scrawl
d894d54e41
Improve path conversions
9 years ago
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.
9 years ago
scrawl
05498ad592
Refactor: InputManager no longer depends on Engine
9 years ago
scrawl
13c7235b6b
Remove old FPS setting code
9 years ago
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...
9 years ago
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.
9 years ago
scrawl
d11952c48a
Stop rendering when the window is minimized
9 years ago
slothlife
4fd00a75d5
Merge advanceTime and advanceTimeByFrame
9 years ago
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
9 years ago
Marc Zinnschlag
a52b947efe
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
9 years ago
scrawl
af3b0cd883
Improve some error messages
10 years ago
dteviot
ff5ef7055e
extracted function CreatureStats::isParalyzed()
10 years ago
Jordan Ayers
be7bd9529d
Classes shouldn't use MWBase::Environment to access their own members.
10 years ago
scrawl
b01abe4d19
Stop title music when the game starts ( Fixes #2468 )
10 years ago
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
slothlife
f8f0380413
Fix for loading window icon on Windows
10 years ago
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.
10 years ago
scrawl
9fc2c2e8ee
Don't advertise an alpha channel in GraphicsContext::traits (Bug #2677 )
10 years ago
scrawl
195e1a8410
Fix the Viewer's FrameStamp not being set correctly during Engine::frame
10 years ago
scrawl
7407bbdac9
Add a function for SDL error handling
10 years ago
scrawl
800bd511f6
Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649 )
10 years ago
scrawl
700000cbca
Error handling fix
10 years ago
scrawl
403ce30a35
Graceful handling for failing to create SDL window
10 years ago
scrawl
e642f20a65
Restore screenshot key functionality
10 years ago
scrawl
9ee63dc3f4
Change stats viewer key to f3
10 years ago
scrawl
3dcb167066
Map rendering
10 years ago
scrawl
da24e298ee
Fix -Wreorder warnings
10 years ago
scrawl
9b8e2e9db3
Port MWRender::Camera
10 years ago
scrawl
737c2114dc
Change viewer stats keybinding to F9
10 years ago
scrawl
b7fa645530
Don't destroy a NULL window
10 years ago
scrawl
24bb2e152c
Apply texture filter setting changes
10 years ago
scrawl
e3b1707bbd
Pause simulationTime when the GUI is up
10 years ago
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
scrawl
39fb46601a
Readded input & event handling
10 years ago
scrawl
298b3ed2ef
Create the GraphicsWindowSDL2 directly
10 years ago
scrawl
0498e6e5f0
Readded window icon
10 years ago
scrawl
36e0cfbc9d
Cleanup
10 years ago
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.
10 years ago
scrawl
c843cfc8e2
Physics stub in preparation for rewrite
10 years ago
scrawl
c8eb77c557
Move StatsHandler construction to allow profiling of loading screen
10 years ago
scrawl
77f733362c
Add stats graphs for Script, Mechanics and Physics timings
10 years ago
scrawl
c1edc30ad7
Dead code removal
10 years ago
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
10 years ago
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).
10 years ago
scrawl
283b252142
Stub InputManager
10 years ago
scrawl
1a5407af98
Reduce texture memory usage in OpenMW
10 years ago
scrawl
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
10 years ago
scrawl
b0804734e5
Port VideoWidget
10 years ago
scrawl
a59940a2c7
Move MyGUI platform to components
10 years ago
scrawl
62847f0489
Use node masks to separate Scene and GUI
10 years ago
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
10 years ago
scrawl
0ff7b2ff11
MechanicsManager, frame update
10 years ago
scrawl
15164e20f7
Cleanup fix
10 years ago
scrawl
42d6c6140c
Add mygui backend by chris
10 years ago
scrawl
8c810e3620
Move rng to components
10 years ago
scrawl
26766b8e0a
Dead code removal
10 years ago
scrawl
9c4b2ea61a
CreatureAnimation compiles
10 years ago
scrawl
083c41c950
Environment map for enchanted objects
10 years ago
scrawl
13a1ba0aab
Moon rendering
10 years ago
scrawl
5dd1ab24fe
More efficient StateSetController, beginnings of sky rendering
10 years ago
scrawl
8c7c89a4aa
Port SoundManager
10 years ago
scrawl
c92592493e
OpenMW: create a window and render the starting cell(s)
10 years ago
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
10 years ago
scrawl
457c135097
Remove old workaround
10 years ago