ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
8 years ago
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
63974af131
Merge pull request #139 from OpenMW/master
...
Add OpenMW commits up to 3 Feb 2017
8 years ago
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
c5f8ff6e0e
Add names to several nodes for debugging purposes
8 years ago
9f8f62b765
Merge pull request #137 from OpenMW/master
...
Add OpenMW commits up to 1 Feb
8 years ago
34deb6e7b1
Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes
8 years ago
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
8 years ago
536715cf46
Cleanup tes3mp headers
8 years ago
753dc50131
Fix crash if connection has failed
8 years ago
c34d85ffc2
Implement water sounds ( Closes #451 )
8 years ago
fa9d6e810e
Use lowerCamelCase in tes3mp client function names like OpenMW does
8 years ago
7f98cddfdf
Don't send animation packets from blacklisted scripts
8 years ago
75f6d82f08
Add a way of filtering out ingame scripts for upcoming script packets
8 years ago
aaf4cc0d7e
Prevent being in a menu from disabling script execution or actor damage
8 years ago
9d2e0124dc
Revert "Fix the cell changed flag no longer being reset after the player dies"
...
This reverts commit d7acec74fd
8 years ago
d7acec74fd
Fix the cell changed flag no longer being reset after the player dies
8 years ago
fa0a55c2a9
Fix use of freed memory
8 years ago
96e2d749c7
New auth protocol
8 years ago
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
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
1e29409dd5
Add OpenMW-mp target
9 years ago
f99cd15f00
Vanilla-compatible activate / onActivate ( Fixes #1629 )
...
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
9 years ago
e05d975020
Change the way that texture filtering settings are applied at runtime
9 years ago
1cda2bf796
Preload sky & water from the main menu
9 years ago
9e5225bb6f
Do not unref a Texture's image data after applying it
9 years ago
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
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
7f7e8c63bf
Correct path to gamecontrollerdb.txt ( Fixes #3112 )
9 years ago
f1faeeae3a
Use separate config options for min and mag texture filters
9 years ago
5c0a847eaf
Combine some duplicate code
9 years ago
b830a413d3
Rename the texture filter options
...
To avoid compatibility issues with upgrading from or downgrading to older
builds.
9 years ago
646092ce3a
Add warnings when loading unknown texture options
9 years ago
76bde5ee13
Separate and expand texture filtering options
9 years ago
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
d894d54e41
Improve path conversions
9 years ago
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
05498ad592
Refactor: InputManager no longer depends on Engine
9 years ago
13c7235b6b
Remove old FPS setting code
9 years ago
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
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
d11952c48a
Stop rendering when the window is minimized
9 years ago
4fd00a75d5
Merge advanceTime and advanceTimeByFrame
9 years ago
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
a52b947efe
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
9 years ago
af3b0cd883
Improve some error messages
10 years ago
ff5ef7055e
extracted function CreatureStats::isParalyzed()
10 years ago
be7bd9529d
Classes shouldn't use MWBase::Environment to access their own members.
10 years ago
b01abe4d19
Stop title music when the game starts ( Fixes #2468 )
10 years ago
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
f8f0380413
Fix for loading window icon on Windows
10 years ago
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
9fc2c2e8ee
Don't advertise an alpha channel in GraphicsContext::traits (Bug #2677 )
10 years ago
195e1a8410
Fix the Viewer's FrameStamp not being set correctly during Engine::frame
10 years ago
7407bbdac9
Add a function for SDL error handling
10 years ago
800bd511f6
Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649 )
10 years ago
700000cbca
Error handling fix
10 years ago
403ce30a35
Graceful handling for failing to create SDL window
10 years ago
e642f20a65
Restore screenshot key functionality
10 years ago
9ee63dc3f4
Change stats viewer key to f3
10 years ago
3dcb167066
Map rendering
10 years ago
da24e298ee
Fix -Wreorder warnings
10 years ago
9b8e2e9db3
Port MWRender::Camera
10 years ago
737c2114dc
Change viewer stats keybinding to F9
10 years ago
b7fa645530
Don't destroy a NULL window
10 years ago
24bb2e152c
Apply texture filter setting changes
10 years ago
e3b1707bbd
Pause simulationTime when the GUI is up
10 years ago
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
39fb46601a
Readded input & event handling
10 years ago
298b3ed2ef
Create the GraphicsWindowSDL2 directly
10 years ago
0498e6e5f0
Readded window icon
10 years ago
36e0cfbc9d
Cleanup
10 years ago
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
c843cfc8e2
Physics stub in preparation for rewrite
10 years ago
c8eb77c557
Move StatsHandler construction to allow profiling of loading screen
10 years ago
77f733362c
Add stats graphs for Script, Mechanics and Physics timings
10 years ago
c1edc30ad7
Dead code removal
10 years ago
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
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
283b252142
Stub InputManager
10 years ago
1a5407af98
Reduce texture memory usage in OpenMW
10 years ago
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
10 years ago
b0804734e5
Port VideoWidget
10 years ago
a59940a2c7
Move MyGUI platform to components
10 years ago
62847f0489
Use node masks to separate Scene and GUI
10 years ago
997347b01e
Silence -Wreorder warnings.
10 years ago
0ff7b2ff11
MechanicsManager, frame update
10 years ago
15164e20f7
Cleanup fix
10 years ago
42d6c6140c
Add mygui backend by chris
10 years ago
8c810e3620
Move rng to components
10 years ago
26766b8e0a
Dead code removal
10 years ago
9c4b2ea61a
CreatureAnimation compiles
10 years ago
083c41c950
Environment map for enchanted objects
10 years ago
13a1ba0aab
Moon rendering
10 years ago
5dd1ab24fe
More efficient StateSetController, beginnings of sky rendering
10 years ago
8c7c89a4aa
Port SoundManager
10 years ago
c92592493e
OpenMW: create a window and render the starting cell(s)
10 years ago
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
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
457c135097
Remove old workaround
10 years ago
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
10 years ago
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
84ff11d0ab
check if v2 exists before attemping to copy it
10 years ago
464bbe4d6f
if v2 doesn't exist, don't erroneously set keyboardUserExists to true.
10 years ago
5d77ebdc60
If v3 doesn't exist, copy from v2
10 years ago
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
10 years ago
df5513da7c
uses v3 input bindings, not v2
10 years ago
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
10 years ago
3ccf4642b4
Implement ToggleScripts
10 years ago
c27c20a859
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
files/materials/water.shader
10 years ago
dbd4abd6fe
Fix ripples for D3D - added simpler effect ( Fixes #1649 )
10 years ago
955505c167
Remove unused function
10 years ago
27dc49a135
Rewrite game settings manager
...
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
10 years ago
38a413a483
Merge remote-tracking branch 'scrawl/master'
10 years ago
4e92f6ab48
Add commandline option to load a save game on startup
10 years ago
157438460b
Fix being able to activate objects when paralyzed
10 years ago
de12c96a46
Fix crash on exit if the window wasn't created ( Fixes #2249 )
10 years ago
ec1df719fe
Merge remote-tracking branch 'mrcheko/master'
10 years ago
60a74d5eb8
increase robustness for gamma to persist in the system;
...
use GMST strings for gamma interface
10 years ago
363d1f9207
Merge remote-tracking branch 'upstream/master'
10 years ago
04d95810d1
gamma/contrast system reworked
10 years ago
e73e975291
Fix player being able to activate objects when knocked out
10 years ago
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
10 years ago
639fbfad0b
make borderless setting available to the UI
10 years ago
057d0913d6
Merge branch 'scriptfixes'
10 years ago
a6d30bc2e3
consider --script-warn when running with --script-all-dialogue
10 years ago
80c92789c2
Fix issue when killed NPC cannot be looted if it was in combat mode before killing.
10 years ago
1f74d8cca5
Merge remote-tracking branch 'scrawl/scripttest'
10 years ago
ba65c6cc7f
Add --script-all-dialogue switch to compile all dialogue scripts ( Fixes #1659 )
10 years ago
ed6face4aa
Disable activation scripts for actors in combat
10 years ago
c37881ead1
Joystick Support
10 years ago
d36dfbe779
Apply the frame time cap to Ogre's ControllerManager ( Fixes #2154 )
...
This fixes particle systems getting out of whack due to a particularly long frame time, e.g. after a loading screen.
10 years ago
aac2de270e
Cleanup: Don't call <environment obj>.get().
...
mEnvironment.get() is redundant. Switch the call to resemble the
surrounding environment get() calls, instead.
10 years ago
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
10 years ago
54dac1460c
Run global scripts after running local scripts
...
Turns out to be a compatibility problem with Calvus Horatius contract scripts. The local script needs to be run first, otherwise the cleanup when he quits as result of negative profit does not work properly.
10 years ago
19f469c7db
Merge remote-tracking branch 'scrawl/master'
10 years ago
d1d861e1be
Merge branch 'run'
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
10 years ago
4426b03fa4
Remove some garbage
10 years ago
0c273568f2
Increment version number for input configuration
...
Old files are broken by keycode->scancode switch (319f4e0547
10 years ago
36a90198e2
Add option to change screenshot image format
10 years ago
2379c0ada7
Pause frame updates when the window is minimized ( Fixes #1868 )
10 years ago
a9df3b53fd
restored --new-game switch
10 years ago
2b407a9995
Refactor NIF cache
...
- Remove broken cache locking mechanism
This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.
- Decouple cache from NIFFile (now a new nifcache component)
- Add API for future background loading
- Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
11 years ago
63cb91db2e
Add --export-fonts command line option
11 years ago
d0654f3ade
move starting of startup scripts from engine startup to new game start; also restart all startup scripts on saved game load
11 years ago
a3c4000198
moved call to Globalscripts::addStartup out of the constructor because at the time of construction the environment may not be set up yet to perform this operation
11 years ago
d87630b41a
blacklisting for scripts in OpenMW
11 years ago
326c747508
Don't run scripts when in pause menu ( Fixes #1495 )
11 years ago
797134aa51
Handle activation scripts in AiActivate ( Fixes #1478 )
11 years ago
41ab7329a8
Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202
...
Note: breaks compatibility with input.xml, so the filename was changed.
11 years ago
3b3b53d665
Support animated main menus (menu_background.bik)
...
Closes #1362
11 years ago
e68600eda2
Make Activate instruction work properly even when onActivate was not called in the same frame.
...
There are two major differences to the old implementation:
- Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
- The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.
Fixes #1166 and #1346 .
11 years ago
6ac700a501
Merge remote-tracking branch 'potatoesmaster/getClass'
11 years ago
244eb11651
Merge remote-tracking branch 'greye/widechar'
11 years ago
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
11 years ago
8b94e31062
try to set relative path to resources
11 years ago
b39b572c5a
Moved mStartupScript to World, so that it is executed for a New game
11 years ago
9fe505c8fa
Only run --script-run commands when bypassing the menu
...
Running them while no game is started yet is dangerous, and also leaves bits and pieces of state (e.g. in LocalScripts for scripted items added to inventory) that will not get cleaned up properly when a game is loaded (since when no game was previously running, no cleanup is performed). As a result, dangling MWWorld::Ptrs were left in LocalScripts.
11 years ago
d70306382e
Don't create the player object until the game starts
...
Fixes a crash introduced in e591d23
11 years ago
6eca5ac4bb
Fixes #1296 : Streamlined cellChanged detection
11 years ago
4f852daf45
Don't play company logo when using --skip-menu
11 years ago
f2cd37edd0
Play company logo movie
11 years ago
5906d795c0
Refactored video player (now a MyGUI widget)
11 years ago
2e4ef93b28
Add proper main menu (background image, logo animation, title music)
11 years ago
6416ae90d2
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
11 years ago
7bc97fb8b8
reworked code for player positioning on startup and new game
11 years ago
2de862126a
moved resources group creation from Engine to bsa component
11 years ago
edb5a54092
Include some more required Ogre headers explicitely.
11 years ago
a99aa15d14
Fix a copy&paste mistake leaving start rotation uninitialized
11 years ago
4ee43612f6
added new switch: --script-warn
11 years ago
49e26415be
Don't call loadGame() from within the MWMechanics::Actors update sequence
11 years ago
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
11 years ago
29c3a288e3
load and save of reference in cells (without CustomData state)
11 years ago
28185e2017
Death/godmode fixes: Revive player *after* character update, since there might be fall damage.
11 years ago
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
11 years ago
9b9c39af7a
Fix being able to activate magic bolts mid-flight
11 years ago
828e5841d8
Windows SDL fix
11 years ago
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
11 years ago
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
11 years ago
b8e9343764
Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes
11 years ago
85ed21dbd2
Remove unused command line option
11 years ago
33389b9b63
XDG compliant paths
11 years ago
a854eb73db
StateRunning check returns
11 years ago
f50ff0b1c4
reworked http://bugs.openmw.org/issues/428
11 years ago
0bc3a13c0f
Break invisibility on Use or Activate
11 years ago
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
11 years ago
afa71bb622
Throw an exception if a BSA is not found
11 years ago
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
11 years ago
35e8e23037
keep track of total play time per character
11 years ago
616e3aa32f
store content file list in saved games and reject saved games not matching the current game
11 years ago
5e64888227
added basic save slot management and connected main menu save to save function (bypassing the save GUI for now)
11 years ago
82c8495338
removed boolean running flag with state enum
11 years ago
c5f81e3508
don't run udpates if no game is running
11 years ago
ec5b2e9a7e
added running flag; moved new game code to MWState
11 years ago
31ec973c9c
removed default value for --start
11 years ago
b3a7c8c098
removed --new-game switch
11 years ago
7a4b604376
added --skip-menu switch
11 years ago
f19973450f
moved exit game flag from Environment to StateManager
11 years ago
79b7fa258b
added new mwstate subsystem
11 years ago
992a8e9c36
Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.
11 years ago
David Cernat
scrawl
Koncord
MiroslavR
Aesylwinn
Chris Robinson
cfcohen
slothlife
Marc Zinnschlag
dteviot
Jordan Ayers
Rohit Nirmal
dteviot
Digmaster
mrcheko
Sebastian Wick
Nik Dyonin
Emanuel Guevel
greye
Marek Kochanowicz
gus