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

390 commits

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
 2020-11-01 23:17:59 +02:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace 
Use emplace_back instead of push_back
 2020-11-01 01:58:56 +03:00
Andrei Kortunov
065ed5138e Use emplace_back instead of push_back 2020-10-18 10:27:35 +04:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
David Cernat
68837aaf4a Add OpenMW commits up to 15 Oct 2020 
# Conflicts:
#   .travis.yml
#   CI/before_script.linux.sh
#   CMakeLists.txt
#   apps/openmw/mwgui/containeritemmodel.cpp
#   apps/openmw/mwgui/tradewindow.cpp
#   apps/openmw/mwphysics/actor.cpp
#   apps/openmw/mwworld/actionteleport.cpp
#   apps/openmw/mwworld/containerstore.cpp
 2020-10-15 19:51:39 +02:00
fredzio
d76cc5d0a9 Make the Object class manage its collision object and position. 2020-10-15 06:41:16 +02:00
David Cernat
5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020 
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
 2020-07-04 16:50:54 +03:00
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads 
Replace OpenThreads by std types
 2020-07-04 13:11:23 +02:00
Andrei Kortunov
27f1a3376c Add a separate stats watcher for GUI 2020-07-01 15:55:44 +04:00
elsid
40ad87bc4d
Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00
David Cernat
3b2eb6f62c Add OpenMW commits up to 22 Jun 2020 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
 2020-06-22 20:50:55 +03:00
Andrei Kortunov
d1a3cc98ff Get rid of ECLD and dependencies 2020-06-17 13:09:16 +04:00
bzzt lost a hitlab login
4238fbccdf view fix 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b27b76e325 avoid pagerebuild when reloading a same save 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
6fa12a6eb8 preload tweak 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
340d626589 static moving support 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
c7fda6d280 activegrid paging = 2xfps 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b4af2ac672 avoid blocking on pagerebuild 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
ffbed7ee38 loadingscreen 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
ce505a9bb3 crashfix + optimiziation 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt
d684f1a78f terrainbased objectpaging 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
elsid
c4cd3b2c4f
Add pathgrid to navmesh as off mesh connection 2020-06-12 21:04:02 +02:00
David Cernat
43e7df6df8 Add OpenMW commits up to 11 Mar 2020 2020-03-11 22:17:17 +02:00
Capostrophic
d44dcc3242 Revert infinite fall failsafe addition 2020-02-25 16:46:53 +03:00
David Cernat
85fb1d1a0b Add OpenMW commits up to 19 Feb 2020 
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
 2020-02-20 01:51:47 +02:00
Capostrophic
9db0bbf255 Make infinite failsafe logic more forgiving 2020-02-14 15:32:50 +03:00
Bret Curtis
3bbd32fe98
Merge pull request #2667 from Capostrophic/infinitefall 
Add an infinite fall failsafe (feature 1415)
 2020-02-13 09:23:05 +01:00
elsid
1e4565a15c
Avoid using temporary vector to get items owned by 2020-02-11 22:24:18 +01:00
Capostrophic
61b60c8a94 Add an infinite fall failsafe (feature 1415) 2020-02-11 18:26:58 +03:00
David Cernat
a58f09fd6c Add OpenMW commits up to 2 Jan 2020 
# Conflicts:
#	apps/openmw/mwmechanics/enchanting.cpp
#	apps/openmw/mwworld/scene.cpp
 2020-01-02 22:09:54 +02:00
Andrei Kortunov
24ce242941 Implement TestCells (feature #5219) 2019-12-22 11:13:42 +04:00
David Cernat
ca9cd90a4d Add OpenMW commits up to 20 Dec 2019 
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
 2019-12-20 15:43:50 +02:00
Assumeru
dfbe0021a5 Change rescaling to be more inline with vanilla (fixes #5214) (#2635) 
* move rescaling to loadData

* clamp on save
 2019-12-18 19:37:45 +03:00
David Cernat
9d6f3fdd09 Add OpenMW commits up to 1 Dec 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-12-01 23:52:42 +02:00
elsid
3cfd5fca4e
Rotate door object using direct rotation order once 
Instead of rotating using inverse and then applying the direct rotation.
To properly update object in navigator.
 2019-11-30 14:09:00 +01:00
David Cernat
0c98c5d09e Add OpenMW commits up to 19 Nov 2019 
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
 2019-11-19 17:16:48 +02:00
Andrei Kortunov
73f43ba750 Do not use screen fading during game loading if there is no current cell (bug #5211) 2019-11-18 22:24:19 +04:00
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
 2019-08-22 11:42:02 +03:00
David Cernat
5181c601c0 Add OpenMW commits up to 2 May 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-08-22 08:40:32 +03:00
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
 2019-08-21 23:54:39 +03:00
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
 2019-08-21 19:04:04 +03:00
David Cernat
3efffe92e3 Add OpenMW commits up to 5 Nov 2018 
# Conflicts:
#	CI/before_install.linux.sh
#	CMakeLists.txt
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/CMakeLists.txt
 2019-08-21 05:08:50 +03:00
David Cernat
fba07194cf Add OpenMW commits up to 29 Oct 2018 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 13:15:00 +03:00
David Cernat
84cab59057 Add OpenMW commits up to 19 Aug 2018 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
 2019-08-20 10:06:15 +03:00
Alexei Dobrohotov
216f908a07
Merge pull request #2286 from akortunov/map 
Do not re-render maps for all active cells during cell transitions
 2019-05-11 02:30:38 +03:00
Andrei Kortunov
14b756a692 Use a generic logging system for RecastNavigation 2019-04-08 20:31:21 +04:00
bzzt
ed4ce4609b Do not re-render maps for all active cells during cell transitions 2019-03-30 09:10:48 +04:00
elsid
518e34b403
Remove useless variables 2019-03-10 23:58:48 +03:00
Andrei Kortunov
d23a0ce2ae Use C++11-style loops in the game world instead of iterators 2019-03-07 12:39:57 +04:00
elsid
1218e4e15d
Use player half extents only to find path in exterior cells 2019-03-04 22:59:20 +03:00