mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity
14,552 Commits
105 Branches
63 Tags
131 MiB
master
esm4-texture
i-have-no-land-and-i-must-scream
animationblending
fix-osga-rotate-wildly
BindlessTest
ini_importer_tests
revert-c3c8fa1e
qt6_macos
macos_ci_fix
openmw-48
revert-6246b479
backport_gl_clamp_removal
linux_only_ci
macos_ci
simplify_debugging
cli11_mwiniimporter
cxxopts_mwiniimporter
cxxopts_mwiniimporter_ci_debug
remove_cruft
use_std_locale
use_qt_lockfile
replace_boost
boost_removal
7344-support-launching-the-example-suite
depth-refraction
update_gitlab_rules
shihan.42_7113-move-from-std-atoi-to-std-from_char
7220-lua-add-a-general-purpose-lexical-parser
iwyu_full
7098-improve-post-process-behavior-with-transparent-objects
unbreak_focal
focus_on_focal
coverity_retry
coverity_clang_test
make_linux_ci_do_zoomies
crashfix_debugdraw
remove_forgotten_code
update_coverity_image
post_malone
cleanup
check_span
concepts_and_span
LTO-timing
precompile_headers
wolfgang_html_fun_for_books
just_say_no_to_geode
combined_windows_build
CPP20
fix/shrink_builds
fix_osx_build_maybe
openmw-fix_osx_build_maybe
ccache_for_windows
C++20
ptmikheev-master-patch-38354
ptmikheev-master-patch-42253
psi29a-master-patch-54550
librecast_all_the_things
cpp17_on_mac
make_full_use_of_c++17_on_mac
lua_on_mac
coverity_use_clang
gh_sync
switch-to-ppa
openmw-47
fix-static-urls
android-ndk22
macos-builds-only-for-openmw
openmw-0.47.0
conditional_push_builds
macos-build
get-testy
additional-cxxflags
pipeline-only-on-pull_requests
enable-github-pipeline
bosvensson1/robert
cherry-pick-2c0f29ea
cherry-pick-2bee171c
dont-compose-content
cherry-pick-5688b7b4
cherry-pick-f6619658
libera
travis_clang
deadcode
improve-bullet-precision-check
cherry-pick-74612b12
cherry-pick-f1d19035
cherry-pick-d595c7ad
symlink-ci
brute_force_lights
psi29a-patch-1
cherry-pick-c431f31c
travis-testing
recast_test_fix_c17
bzzt_8_shadows_in_refraction
cherry-pick-ff2d7695
cleanup_2
macos-runner-beta-fencing
lz4_prep
async-msvc2017-fix
see-cache
openmw-46
openmw-45
openmw-44
openmw-36
openmw-0.44.0
openmw-0.43.0
openmw-0.41.0
openmw-0.40.0
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
debian/0.29.0-1
upstream/0.29.0
openmw-0.29.0
upstream/0.28.0
openmw-0.28.0
openmw-0.27.0
upstream/0.27.0
upstream/0.26.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.47.0-RC3
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
openmw-0.42.0
openmw-0.45.0
openmw-0.46.0
openmw-0.47.0
openmw-0.48.0
openmw-48-rc10
openmw-48-rc11
openmw-48-rc12
openmw-48-rc12.1
openmw-48-rc6
openmw-48-rc7
openmw-48-rc8
openmw-48-rc9
stable
upstream/0.27.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cbf9f83b85'
${ noResults }
Commit Graph

133 Commits (cbf9f83b855e382375c17c2fc64eec582e31714a)

Author SHA1 Message Date
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.
 10 years ago
scrawl c783b50a83 Fix config file priority in the launcher to match OpenMW 10 years ago
scrawl 3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 10 years ago
scrawl cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 10 years ago
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
 10 years ago
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
 10 years ago
scrawl b7cd62e4de Revert "Remove user preference setting option." 
This reverts commit d3b7cf44d3.
 10 years ago
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
 10 years ago
cc9cii d3b7cf44d3 Remove user preference setting option. 10 years ago
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
 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
Nikolay Kasyanov 7d321e0fb7 Fix #2557 
Don’t show main dialog right away if wizard is selected.
 10 years ago
scrawl ccab8cc9a1 Register Player in the PhysicsSystem 10 years ago
Rohit Nirmal 997347b01e Silence -Wreorder warnings. 10 years ago
Marc Zinnschlag 093c577895 Merge remote-tracking branch 'dteviot/Bug2344' 10 years ago
scrawl 5eadffd0c4 Make launcher's version label selectable so it can be copy-pasted into issue reports 10 years ago
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.
 10 years ago
scrawl 57a259c526 Remove references to no longer used font 10 years ago
dteviot 05b89be8bf Launcher sets content list to match values in openmw.cfg (Fixes #811) 
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
 10 years ago
scrawl 1e06f69d9e Remove the "browse to existing installation" button, now replaced by the wizard 
Clean up some debug spam
 10 years ago
pvdk fda25f385a Fixed segfault when launcher tries to reload settings on pages not yet there 11 years ago
pvdk 0cc7c06262 Ensure the launcher is not shown when the wizard is run 11 years ago
pvdk 6348af586e Fixed some problems with the launcher and the wizard 11 years ago
pvdk a390dde818 Fixed importing configurations of existing installations 11 years ago
pvdk 5af12d193a Cleaned up old wizard stuff from launcher 11 years ago
pvdk 38d825b004 Merge remote-tracking branch 'upstream/master' into wizard 
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
 11 years ago
Kevin Poitra beba58268c Fix a typo within the launcher. Fixes bug #1058. 11 years ago
greye cd990a665a create QString from utf-8 when expected 11 years ago
pvdk aa07a33906 Fixed most of the memory leaks and started working on correctly exiting the thread 11 years ago
pvdk 30c3c3e245 Working on importing content lists in the launcher 11 years ago
pvdk 21c406316f Working on the Settings tab: start the importer/wizard 11 years ago
pvdk bf6103a3a4 Merge branch 'wizardtab' into wizard 
Conflicts:
	files/ui/mainwindow.ui
 11 years ago
pvdk 8fe837ae6e Merge remote-tracking branch 'upstream/master' into wizard 11 years ago
pvdk 3792b301e9 Wizard now runs the ini-importer to import settings from Morrowind.ini 11 years ago
pvdk b43325119a Some changes to the version retrieval: ignore shallow clones 11 years ago
pvdk 4e03e9cf87 Changed development version info text and the tooltip now works on all platforms 11 years ago
pvdk 802448b217 Added a settings page to the launcher 11 years ago
pvdk 19bef4fce8 Distinguish between release and development builds 11 years ago
pvdk c354cd52be Added compile date and time to the version info in the launcher 11 years ago
pvdk fa186f5ec1 Added version information to the launcher 11 years ago
scrawl 33389b9b63 XDG compliant paths 11 years ago
pvdk da9b67b6d2 Fix for Bug #922: Launcher writing merged openmw.cfg files 11 years ago
Marc Zinnschlag 3ac58b387b fixed wording of an error message 11 years ago
graffy76 8d12e2b99d fixed merge conflicts 
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/launcher/settings/gamesettings.hpp
	components/contentselector/model/contentmodel.cpp
 11 years ago
Lukasz Gromanowski d51c9b64dd Issue #913: Merge --master and --plugin switches 
Launcher part of master/plugin switches merge.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 11 years ago
graffy76 1a23cccce3 Implemented Launcher namespace 11 years ago
graffy76 f9591ddda6 Reimplemented constentselector view class 11 years ago
graffy76 217a4d75b4 Implemented profile function in launcher datafiles page 
Implemented dependency sorting to ensure dependent files appear latest
in the list.
 11 years ago
graffy76 00c78a4aa1 Implementing ContentSelector class in DataFilesPage 
Moved AdjusterWidget / FileWidget to ContentSelectorView
 11 years ago
Tom Mason 06ff40eda7 only use unshield on not windows 12 years ago