openmw-tes3mp

Commit Graph

Author	SHA1	Message	Date
David Cernat	7f435ceeac	Add OpenMW commits up to 1 Nov 2020 # Conflicts: # CMakeLists.txt # apps/openmw/main.cpp # apps/openmw/mwclass/container.hpp # apps/openmw/mwclass/creature.hpp # apps/openmw/mwclass/npc.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.hpp # apps/openmw/mwdialogue/journalimp.hpp # apps/openmw/mwgui/container.cpp # apps/openmw/mwgui/dialogue.hpp # apps/openmw/mwgui/mainmenu.cpp # apps/openmw/mwgui/windowmanagerimp.hpp # apps/openmw/mwmechanics/aiactivate.hpp # apps/openmw/mwmechanics/mechanicsmanagerimp.hpp # apps/openmw/mwscript/containerextensions.cpp # apps/openmw/mwscript/interpretercontext.hpp # components/CMakeLists.txt	4 years ago
Andrei Kortunov	065ed5138e	Use emplace_back instead of push_back	4 years ago
David Cernat	e5b1843089	Add OpenMW commits up to 11 Jun 2020 # Conflicts: # apps/openmw/mwbase/world.hpp # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwmechanics/activespells.cpp # apps/openmw/mwmechanics/aiactivate.cpp # apps/openmw/mwmechanics/aiactivate.hpp # apps/openmw/mwmechanics/creaturestats.cpp # apps/openmw/mwscript/aiextensions.cpp # apps/openmw/mwscript/statsextensions.cpp # apps/openmw/mwworld/worldimp.cpp # apps/openmw/mwworld/worldimp.hpp	5 years ago
Andrei Kortunov	5468fcb29f	Store attributes and skills values as floats (bug #4021 )	5 years ago
Andrei Kortunov	3dce225f28	Implement vanilla-style corprus handling (bug #3714 , bug #4623 )	5 years ago
David Cernat	b57c0bcafe	Add OpenMW commits up to 6 June 2019 # Conflicts: # apps/openmw/mwgui/hud.cpp # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwgui/waitdialog.cpp # apps/openmw/mwinput/inputmanagerimp.cpp # apps/openmw/mwworld/worldimp.hpp	5 years ago
David Cernat	f671c0bddc	Add OpenMW commits up to 1 Apr 2019 # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/engine.cpp # apps/openmw/mwdialogue/dialoguemanagerimp.cpp # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwgui/trainingwindow.cpp # apps/openmw/mwgui/travelwindow.cpp # apps/openmw/mwgui/waitdialog.cpp	5 years ago
David Cernat	8729c3c5e3	Add OpenMW commits up to 9 Mar 2019 # Conflicts: # .travis.yml # CI/before_script.linux.sh # README.md # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwscript/animationextensions.cpp # apps/openmw/mwscript/guiextensions.cpp # apps/openmw/mwscript/miscextensions.cpp # apps/openmw/mwscript/soundextensions.cpp	5 years ago
David Cernat	889bcec7f8	Add OpenMW commits up to 1 Sep 2018 # Conflicts: # apps/openmw/mwbase/world.hpp # apps/openmw/mwclass/creature.cpp # apps/openmw/mwclass/npc.cpp # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/difficultyscaling.cpp # apps/openmw/mwscript/transformationextensions.cpp # apps/openmw/mwworld/worldimp.hpp	5 years ago
Andrei Kortunov	e679190f31	Introduce a custom format() function to get rid of boost::format() and hackish replace()	6 years ago
Bret Curtis	886c77bced	Merge pull request #2145 from akortunov/rest Update jail state once instead of for every single hour	6 years ago
Andrei Kortunov	8df8bd3f37	Use C++11-style loops in the GUI instead of iterators	6 years ago
Capostrophic	216e1ab16f	Always include <memory> for smart pointers in MWGui	6 years ago
Andrei Kortunov	fcdb0c16bf	Update jail state once instead of for every single hour	6 years ago
Capostrophic	7ef6fa9f61	Remove deprecated GMST get* functions	6 years ago
David Cernat	031a80ed5a	[Client] Don't advance time when waiting, traveling, training or jailed	7 years ago
David Cernat	03266d7648	[Client] Prevent guards from arresting players who are currently jailed	7 years ago
David Cernat	e164e6305e	Merge pull request #313 from OpenMW/master while resolving conflicts # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp	7 years ago
scrawl	548af6dbfb	Fix jail screen fading	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	0e57f1317b	Remove redundant setVisible(false)	7 years ago
David Cernat	ccb15cc09e	[Client] When players die, make guards willing to arrest them again	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
Jake Westrip	63343b6241	Ensure jail does not decrease a skill past zero	8 years ago
David Cernat	ad9fa0631a	[General] Rename jailText to jailEndText and add jailProgressText in PlayerJail	8 years ago
David Cernat	083b46394d	[General] Add ignoreJailSkillIncreases to PlayerJail packets	8 years ago
David Cernat	5962570c48	[General] Add jailText to PlayerJail packets	8 years ago
David Cernat	3280f0c5ee	[General] Implement PlayerJail packet Rework server's DeathFunctions into MechanicsFunctions Remove connection between PlayerResurrect and jailing	8 years ago
David Cernat	1d504a665f	[General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets	8 years ago
David Cernat	60574ae667	[General] Implement jail time as a death penalty	8 years ago
MiroslavR	80f2ae0ca7	Apply magic effects while waiting/sleeping	9 years ago
dteviot	77a1d947cc	extracted MWMechanics::getPlayer()	10 years ago
scrawl	22f01b1232	Merge branch 'master' of https://github.com/OpenMW/openmw into osg Conflicts: apps/launcher/graphicspage.cpp apps/opencs/editor.cpp apps/opencs/model/doc/document.cpp apps/opencs/view/render/cell.cpp apps/opencs/view/render/mousestate.cpp apps/opencs/view/render/textoverlay.cpp apps/opencs/view/render/worldspacewidget.cpp apps/openmw/mwclass/creature.cpp apps/openmw/mwclass/npc.cpp apps/openmw/mwgui/inventorywindow.cpp apps/openmw/mwgui/loadingscreen.cpp apps/openmw/mwgui/mapwindow.cpp apps/openmw/mwgui/pickpocketitemmodel.cpp apps/openmw/mwgui/waitdialog.cpp apps/openmw/mwmechanics/combat.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwrender/globalmap.cpp apps/openmw/mwworld/physicssystem.cpp apps/openmw/mwworld/refdata.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp components/sdlutil/sdlinputwrapper.cpp extern/shiny/Main/Factory.cpp extern/shiny/Main/MaterialInstance.cpp extern/shiny/Main/Platform.cpp extern/shiny/Main/ShaderSet.cpp	10 years ago
Rohit Nirmal	396fba7fa9	Silence -Wreorder warnings, and remove -Wno-reorder.	10 years ago
scrawl	8c810e3620	Move rng to components	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
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
MiroslavR	47c053444f	Make the jail progress last one second	10 years ago
MiroslavR	1230cf49bf	Properly center jail progress widget, fix a bug with it not disappearing if the console is open	10 years ago
MiroslavR	1d9e973573	Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714 )	10 years ago

40 Commits (master)