mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 18:19:55 +00:00
Code Issues Releases Wiki Activity
24721 commits 38 branches 54 tags 122 MiB
Commit graph

166 commits

Author SHA1 Message Date
David Cernat
cc25612b8d Add OpenMW commits up to 18 Sep 2019 
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
 2019-09-18 23:46:08 +03:00
Capostrophic
9788a776b9 Avoid Qt "opening user openmw.cfg twice" warning 2019-09-10 22:56:04 +03:00
David Cernat
a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts 
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2018-08-20 14:08:44 +03:00
Andrei Kortunov
2d4ec86b8d Provide launcher icons 2018-07-28 13:18:38 +04:00
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
 2018-07-04 01:52:29 +03:00
Thunderforge
dfa9968565 Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged 2018-06-08 19:18:23 -05:00
Thunderforge
62c4eb8d6a Explicitly flagging loaded cells changed as queued 2018-06-08 19:16:24 -05:00
Thunderforge
e282ece3d1 Fixing bug with autocomplete not loading correctly during startup 2018-06-03 16:58:18 -05:00
Thunderforge
26dfef7970 Changing where we are loading cells to prevent Qt access issue 2018-05-27 17:15:36 -05:00
Thunderforge
d58cce9c72 Adding WIP code to dynamically change the autocomplete fields 2018-05-22 20:50:31 -05:00
Thunderforge
fb27f34a32 Add autocomplete to the "Start default character at" field 2018-04-07 21:27:36 -05:00
Thunderforge
d42791e260 Moving testing options to Advanced page 2018-03-15 22:11:54 -05:00
David Cernat
a7e3261b0b
Merge pull request #383 from OpenMW/master 
Add OpenMW commits up to 11 Feb 2018
 2018-02-11 06:57:54 +02:00
Thunderforge
8837046d9c Adding panel for advanced settings.cfg options 2018-01-28 22:49:49 -06:00
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
 2017-08-31 15:14:13 +03:00
Siimacore
c920d083e4 Correcting https://bugs.openmw.org/issues/3906. 2017-08-03 23:15:26 +02:00
David Cernat
df67ae4689 Merge pull request #229 from OpenMW/master 
Add OpenMW commits up to 20 Jun 2017
 2017-06-20 04:16:51 +03:00
scrawl
41fb17f39b Revert "Correcting https://bugs.openmw.org/issues/3906" 
This reverts commit b0abed00e5.
 2017-06-20 00:36:06 +02:00
David Cernat
fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
 2017-06-18 18:16:10 +03:00
Siimacore
b0abed00e5 Correcting https://bugs.openmw.org/issues/3906 2017-06-10 21:36:35 +02:00
David Cernat
0fe2d743a7 Rename tes3mp-netlauncher into tes3mp-browser 2017-01-19 12:14:25 +02:00
Koncord
f7dc30387c Run tes3mp-netlauncher instead openmw in the OpenMW Launcher 2017-01-12 08:55:21 +08:00
Allofich
3420121c3f Fix shadowing warnings 2016-11-13 23:20:51 +09:00
Nikolay Kasyanov
5d4734c02e Use local path from configuration manager to load openmw.cfg in launcher 2016-11-01 21:27:35 +01:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
scrawl
177a6f4a68 Launcher: ensure to clear previous settings when reloading settings 2015-11-27 20:52:29 +01:00
scrawl
ace4cfc0a8 Fix 'duplicate setting' errors when running installation wizard 2015-11-27 20:32:45 +01:00
scrawl
2ffcc2a2b4 Fix incorrect path encoding handling in debug message 2015-11-26 17:34:22 +01:00
scrawl
d894d54e41 Improve path conversions 2015-11-26 17:15:28 +01:00
scrawl
325d208b4a Fix incorrect error message 2015-11-26 17:13:13 +01:00
cfcohen
046538984c Fix duplicate filename in what() message. Use newly create cfgError 
utility function consistently throughout code.
 2015-11-26 01:49:14 -05:00
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.
 2015-11-25 13:17:03 -05:00
scrawl
5602cd9b7b Fix the launcher's version label for builds with no git commit info 2015-08-06 02:54:47 +02:00
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.
 2015-07-18 03:09:04 +02:00
scrawl
c783b50a83 Fix config file priority in the launcher to match OpenMW 2015-07-18 01:38:35 +02:00
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
scrawl
cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 2015-06-14 16:32:13 +02:00
cc9cii
c22c9c271d Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535. 
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
 2015-06-14 14:51:01 +10:00
scrawl
de98d991b4 Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535." 
Breaks the saving of content= entry order.

This reverts commit 15fe5d88e2.

Conflicts:
	components/config/gamesettings.cpp
 2015-06-13 23:50:12 +02:00
scrawl
b7cd62e4de Revert "Remove user preference setting option." 
This reverts commit d3b7cf44d3.
 2015-06-13 23:49:27 +02:00
scrawl
e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-06-07 15:23:54 +02:00
cc9cii
d3b7cf44d3 Remove user preference setting option. 2015-06-07 13:29:45 +10:00
cc9cii
15fe5d88e2 Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535. 
- controlled via a checkbox in launcher settings
 2015-06-06 20:35:55 +10:00
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
 2015-05-23 20:33:44 +02:00
Nikolay Kasyanov
7d321e0fb7 Fix #2557 
Don’t show main dialog right away if wizard is selected.
 2015-05-16 13:18:04 +03:00
scrawl
ccab8cc9a1 Register Player in the PhysicsSystem 2015-05-12 17:40:42 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
Marc Zinnschlag
093c577895 Merge remote-tracking branch 'dteviot/Bug2344' 2015-02-26 19:05:30 +01:00
scrawl
5eadffd0c4 Make launcher's version label selectable so it can be copy-pasted into issue reports 2015-02-22 00:13:03 +01:00
dteviot
accc078e0e Morrowind.ini import progress bar. (Fixes #2344) 
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
 2015-02-22 08:46:12 +13:00