mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity
13,911 Commits
106 Branches
63 Tags
132 MiB
master
dependabot/pip/docs/jinja2-3.1.5
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 'a2294117cd'
${ noResults }
Commit Graph

13911 Commits (a2294117cdcd209edf993898d1af6abf180753aa)
 

Author SHA1 Message Date
Marc Zinnschlag a2294117cd replaced context-sensitive implementation of allowing digits at the beginning of names with a more general implementation (Fixes #1730) 
(cherry picked from commit 4d94f38f4b)
 9 years ago
cc9cii ae1439f223 Fix typo. 
(cherry picked from commit 1365b8edd1)
 9 years ago
cc9cii 148ccb79e8 Set default creature scale to 1. Partially resolves bug #2880. (no creature verifier yet) 
(cherry picked from commit 192f01e3ac)
 9 years ago
cc9cii 2f76a1510e Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879. 
(cherry picked from commit 45aee1b508)

Conflicts:
	apps/opencs/model/world/refidadapterimp.hpp
 9 years ago
cc9cii f7eb502493 Add missing fields for editing creatures. 
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)

(cherry picked from commit 5a5e1a3b22)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
 9 years ago
cc9cii 41f2ffdebb Rationalise the use of ColumnIds 
(cherry picked from commit c4a900ca2c)

Conflicts:
	apps/opencs/model/world/refidcollection.cpp
 9 years ago
cc9cii 496cdcb51b Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique. 
(cherry picked from commit 258b2ba29a)
 9 years ago
scrawl 7c347a5908 CONTRIBUTING.md: clarify "if applicable" 
(cherry picked from commit 5fde914959)
 9 years ago
scrawl c40e68cc5b Add CONTRIBUTING.md 
(cherry picked from commit 6c6fc662ef)
 9 years ago
scrawl c0f21bfb77 Add some comments to ESM::Land 
(cherry picked from commit 5252dbcf1f)

Conflicts:
	components/esm/loadland.hpp
 9 years ago
Sebastian Wick 03ee1ec8cb adjust FindMyGUI.cmake to correctly handle REQUIRED and QUIETLY 
(cherry picked from commit b68f64ed97)
 9 years ago
Marc Zinnschlag 5031d1fbcb disable on-demand loading of land data (for now, maybe) 
(cherry picked from commit 5be176ee85)
 9 years ago
Marc Zinnschlag 453c3ee760 fixed an indexing error 
(cherry picked from commit 23fde87816)
 9 years ago
Marc Zinnschlag 4aa6d7d1d1 various minor fixes 
(cherry picked from commit 584a7a66b9)
 9 years ago
Marc Zinnschlag dcf1f1515a handle missing land texture records properly during merge 
(cherry picked from commit 09ec60fe2a)
 9 years ago
Marc Zinnschlag 1784701b47 fixed a texture indexing bug (only affects the editor) 
(cherry picked from commit 73f6efddcc)
 9 years ago
Marc Zinnschlag 25952369ae merge land tables 
(cherry picked from commit a8dc1c1198)
 9 years ago
Marc Zinnschlag ce34daa64b removed indirection in OpenMW-CS land record 
(cherry picked from commit 85f6bb892b)

Conflicts:
	apps/opencs/view/render/cell.cpp
 9 years ago
Marc Zinnschlag c4b34a077e refactored loading of land data 
(cherry picked from commit 69b9eadb52)

Conflicts:
	apps/openmw/mwworld/scene.cpp
	components/esmterrain/storage.cpp
 9 years ago
cc9cii 4f24c6a7c8 more const-ness fixes 9 years ago
Marc Zinnschlag 44020df65f made return type of ESMTerrain::Storage::getLand const 
(cherry picked from commit febf611c82)
 9 years ago
Marc Zinnschlag 8cb1f4ffe9 additional safety check for land texture listing merge stage 
(cherry picked from commit 69045d7ec9)
 9 years ago
Marc Zinnschlag 35c4af9476 added copy constructor and assignment operator for Land record struct 
(cherry picked from commit b0641934d4)
 9 years ago
Marc Zinnschlag a2d4957d2a merge land texture tables 
(cherry picked from commit 890bbb6b11)
 9 years ago
Marc Zinnschlag e5038cbece fixed merge stage order; added proper initialisation 
(cherry picked from commit b7983d08ba)
 9 years ago
Marc Zinnschlag 73ab89bf70 merge references tables 
(cherry picked from commit a97a632aa7)
 9 years ago
Marc Zinnschlag 62daecadf5 fixed record state issues after merge 
(cherry picked from commit 845cafd61c)
 9 years ago
Marc Zinnschlag 9230c62884 merge referenceables table 
(cherry picked from commit f95950e8d8)
 9 years ago
Marc Zinnschlag 81188a3456 silenced a warning 
(cherry picked from commit 9cf793c0b5)

Conflicts:
	apps/opencs/model/doc/document.cpp
 9 years ago
Marc Zinnschlag 72aa998261 simplifying merge stage 
(cherry picked from commit 40753aa9a3)
 9 years ago
Marc Zinnschlag e33314ad81 made merge operation more fluent 
(cherry picked from commit 16dda281ce)
 9 years ago
Marc Zinnschlag 98cac624a9 added info tables and pathgrid table to merge operation 
(cherry picked from commit 103073150e)
 9 years ago
Marc Zinnschlag 024a5405e0 flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first) 
(cherry picked from commit c92898a5bc)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 9 years ago
Marc Zinnschlag 973c65bc82 merge id collections 
(cherry picked from commit 3902513e65)
 9 years ago
Marc Zinnschlag 55dfe48ef7 copy meta data from game file when merging 
(cherry picked from commit 47dd9505a9)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/data.cpp
 9 years ago
Marc Zinnschlag 3eef192e4d create merged document and open a view for it (document is still empty at this point) 
(cherry picked from commit 1b663f01af)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/documentmanager.cpp
 9 years ago
Marc Zinnschlag 0b8e04d6a8 forgot to connect merge operation signals 
(cherry picked from commit d8655f2ff8)
 9 years ago
Marc Zinnschlag 9423603e94 inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan) 
(cherry picked from commit e2377396a7)
 9 years ago
Marc Zinnschlag e4381c3ec8 added merge operation (doesn't do anything yet) 
(cherry picked from commit 904ad94952)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 9 years ago
Marc Zinnschlag c2ed475950 disable merge menu item when a merge is already in progress 
(cherry picked from commit 708cacdec4)
 9 years ago
Marc Zinnschlag a5a0990d3c improved adjuster widget problem reporting 
(cherry picked from commit 4fd3097c1c)
 9 years ago
Marc Zinnschlag ef1e01639e added UI for merge tool (merge tool itself is still missing) 
(cherry picked from commit b83f9445a9)

Conflicts:
	apps/opencs/editor.cpp
	apps/opencs/editor.hpp
 9 years ago
Marc Zinnschlag 6fb658daa4 replaced State_Compiling (not requried anymore) with State_Merging 
(cherry picked from commit 6a9218ee07)
 9 years ago
scrawl 52dfc0e9c7 Use the correct format specifier for ess-imported savegames 
(cherry picked from commit 2065e0fa2d)
 9 years ago
scrawl 65bd5d8492 Refuse loading save games of unknown format 
(cherry picked from commit 20d03c7e39)
 9 years ago
scrawl 05fd4e123e Use the format field instead of version field 
(cherry picked from commit a081d402c5)
 9 years ago
scrawl b9ba1067bf Savegame loading optimization 
(cherry picked from commit 4637750601)
 9 years ago
scrawl 843afc5e24 Increment save file version and mark it as used, will be used in next commit 
(cherry picked from commit 4eaaa5e855)
 9 years ago
cc9cii 904f9871cc Merge pull request #9 from cc9cii/master-cherry-pick-2 
Master cherry pick 2
 9 years ago
Stanislav Bas ca14d6a8a8 Add missing includes to columnimp.hpp 9 years ago