mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
21,446 Commits
38 Branches
54 Tags
122 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'sol2-server-rewrite'
${ noResults }
Commit Graph

590 Commits (sol2-server-rewrite)

Author SHA1 Message Date
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
dteviot 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
scrawl 2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 10 years ago
Digmaster 84ff11d0ab check if v2 exists before attemping to copy it 10 years ago
Digmaster 464bbe4d6f if v2 doesn't exist, don't erroneously set keyboardUserExists to true. 10 years ago
Digmaster 5d77ebdc60 If v3 doesn't exist, copy from v2 10 years ago
scrawl 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
Digmaster df5513da7c uses v3 input bindings, not v2 10 years ago
Digmaster a192836582 (hopefully) correct gamecontrollerdb.txt behavior 10 years ago
scrawl 3ccf4642b4 Implement ToggleScripts 10 years ago
scrawl c27c20a859 Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	files/materials/water.shader
 10 years ago
scrawl dbd4abd6fe Fix ripples for D3D - added simpler effect (Fixes #1649) 10 years ago
scrawl 955505c167 Remove unused function 10 years ago
scrawl 27dc49a135 Rewrite game settings manager 
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
 10 years ago
Marc Zinnschlag 38a413a483 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 4e92f6ab48 Add commandline option to load a save game on startup 10 years ago
scrawl 157438460b Fix being able to activate objects when paralyzed 10 years ago
scrawl de12c96a46 Fix crash on exit if the window wasn't created (Fixes #2249) 10 years ago
Marc Zinnschlag ec1df719fe Merge remote-tracking branch 'mrcheko/master' 10 years ago
mrcheko 60a74d5eb8 increase robustness for gamma to persist in the system; 
use GMST strings for gamma interface
 10 years ago
scrawl 363d1f9207 Merge remote-tracking branch 'upstream/master' 10 years ago
mrcheko 04d95810d1 gamma/contrast system reworked 10 years ago
scrawl e73e975291 Fix player being able to activate objects when knocked out 10 years ago
Sebastian Wick 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
Sebastian Wick 639fbfad0b make borderless setting available to the UI 10 years ago
Marc Zinnschlag 057d0913d6 Merge branch 'scriptfixes' 10 years ago
Marc Zinnschlag a6d30bc2e3 consider --script-warn when running with --script-all-dialogue 10 years ago
Nik Dyonin 80c92789c2 Fix issue when killed NPC cannot be looted if it was in combat mode before killing. 10 years ago
Marc Zinnschlag 1f74d8cca5 Merge remote-tracking branch 'scrawl/scripttest' 10 years ago
scrawl ba65c6cc7f Add --script-all-dialogue switch to compile all dialogue scripts (Fixes #1659) 10 years ago
scrawl ed6face4aa Disable activation scripts for actors in combat 10 years ago
Digmaster c37881ead1 Joystick Support 10 years ago
scrawl 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
Jordan Ayers 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
scrawl 9c0649c11d Add basic framework to retrieve font colors from fallback settings (Feature #704) 10 years ago
scrawl 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
Marc Zinnschlag 19f469c7db Merge remote-tracking branch 'scrawl/master' 10 years ago
Marc Zinnschlag 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
scrawl 4426b03fa4 Remove some garbage 10 years ago
scrawl 0c273568f2 Increment version number for input configuration 
Old files are broken by keycode->scancode switch (319f4e0547)
 10 years ago
scrawl 36a90198e2 Add option to change screenshot image format 10 years ago
scrawl 2379c0ada7 Pause frame updates when the window is minimized (Fixes #1868) 10 years ago
Marc Zinnschlag a9df3b53fd restored --new-game switch 10 years ago
scrawl 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
scrawl 63cb91db2e Add --export-fonts command line option 11 years ago
Marc Zinnschlag 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
Marc Zinnschlag 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
Marc Zinnschlag d87630b41a blacklisting for scripts in OpenMW 11 years ago
scrawl 326c747508 Don't run scripts when in pause menu (Fixes #1495) 11 years ago
scrawl 797134aa51 Handle activation scripts in AiActivate (Fixes #1478) 11 years ago
scrawl 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
scrawl 3b3b53d665 Support animated main menus (menu_background.bik) 
Closes #1362
 11 years ago
scrawl 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
Marc Zinnschlag 6ac700a501 Merge remote-tracking branch 'potatoesmaster/getClass' 11 years ago
Marc Zinnschlag 244eb11651 Merge remote-tracking branch 'greye/widechar' 11 years ago
Emanuel Guevel 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
greye 8b94e31062 try to set relative path to resources 11 years ago
scrawl b39b572c5a Moved mStartupScript to World, so that it is executed for a New game 11 years ago
scrawl 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
scrawl d70306382e Don't create the player object until the game starts 
Fixes a crash introduced in e591d23 when using --skip-menu=0.
 11 years ago
scrawl 6eca5ac4bb Fixes #1296: Streamlined cellChanged detection 11 years ago
scrawl 4f852daf45 Don't play company logo when using --skip-menu 11 years ago
scrawl f2cd37edd0 Play company logo movie 11 years ago
scrawl 5906d795c0 Refactored video player (now a MyGUI widget) 11 years ago
scrawl 2e4ef93b28 Add proper main menu (background image, logo animation, title music) 11 years ago
Marek Kochanowicz 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
Marc Zinnschlag 7bc97fb8b8 reworked code for player positioning on startup and new game 11 years ago
Marc Zinnschlag 2de862126a moved resources group creation from Engine to bsa component 11 years ago
scrawl edb5a54092 Include some more required Ogre headers explicitely. 11 years ago
scrawl a99aa15d14 Fix a copy&paste mistake leaving start rotation uninitialized 11 years ago
Marc Zinnschlag 4ee43612f6 added new switch: --script-warn 11 years ago
scrawl 49e26415be Don't call loadGame() from within the MWMechanics::Actors update sequence 11 years ago
Marc Zinnschlag 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
Marc Zinnschlag 29c3a288e3 load and save of reference in cells (without CustomData state) 11 years ago
scrawl 28185e2017 Death/godmode fixes: Revive player *after* character update, since there might be fall damage. 11 years ago
scrawl 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
scrawl 9b9c39af7a Fix being able to activate magic bolts mid-flight 11 years ago
gus 828e5841d8 Windows SDL fix 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl 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
scrawl 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
scrawl 85ed21dbd2 Remove unused command line option 11 years ago
scrawl 33389b9b63 XDG compliant paths 11 years ago
mrcheko a854eb73db StateRunning check returns 11 years ago
mrcheko f50ff0b1c4 reworked http://bugs.openmw.org/issues/428 11 years ago
scrawl 0bc3a13c0f Break invisibility on Use or Activate 11 years ago
Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 11 years ago
scrawl afa71bb622 Throw an exception if a BSA is not found 11 years ago
scrawl bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 11 years ago
Marc Zinnschlag 35e8e23037 keep track of total play time per character 11 years ago
Marc Zinnschlag 616e3aa32f store content file list in saved games and reject saved games not matching the current game 11 years ago
Marc Zinnschlag 5e64888227 added basic save slot management and connected main menu save to save function (bypassing the save GUI for now) 11 years ago
Marc Zinnschlag 82c8495338 removed boolean running flag with state enum 11 years ago
Marc Zinnschlag c5f81e3508 don't run udpates if no game is running 11 years ago
Marc Zinnschlag ec5b2e9a7e added running flag; moved new game code to MWState 11 years ago
Marc Zinnschlag 31ec973c9c removed default value for --start 11 years ago
Marc Zinnschlag b3a7c8c098 removed --new-game switch 11 years ago
Marc Zinnschlag 7a4b604376 added --skip-menu switch 11 years ago
Marc Zinnschlag f19973450f moved exit game flag from Environment to StateManager 11 years ago
Marc Zinnschlag 79b7fa258b added new mwstate subsystem 11 years ago
scrawl 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
Marc Zinnschlag 418ccf705d Merge branch 'openmw-27' 
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
 11 years ago
Marc Zinnschlag f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 11 years ago
scrawl 3a827d9c12 Deleted Obliviontt.zip 11 years ago
scrawl 636d399c7f Refactored Ogre initialisation into a component 11 years ago
scrawl 4f35fd8184 Removed a workaround from Renderer, some cleanup 11 years ago
Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 11 years ago
greye 4cdb57e388 workaround segfault on --new-game switch 11 years ago
Lukasz Gromanowski 9c2145eda1 Issue #913: Merge --master and --plugin switches 
Merged master/plugin switches into content in openmw
and mwiniimporter.

Extension in content files is now required.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 11 years ago
scrawl d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 12 years ago
scrawl ebf9debb80 Enabled terrain self shadows, implemented getHeightAt, some optimizations 12 years ago