mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
8,025 Commits
38 Branches
54 Tags
121 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
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
openmw-0.29.0
openmw-0.28.0
openmw-0.27.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.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ba365ff49e'
${ noResults }
Commit Graph

8025 Commits (ba365ff49ed9be07af0244389077c3fc71b36d7a)
 

Author SHA1 Message Date
graffy76 ba365ff49e Fixed merge conflicts with saving branch 11 years ago
graffy76 9ce4a04a2d merge from saving 
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
 11 years ago
graffy76 1a23cccce3 Implemented Launcher namespace 11 years ago
graffy76 16d87ea1d1 Merge branch 'master' into esxSelector 11 years ago
graffy76 2ca7f24731 Fixed filedialog new / edit content path issue 11 years ago
graffy76 b48f066f33 Reimplemented content selector for filedialog and datafilespage classes 11 years ago
graffy76 ba3589bc76 Revert "Implemented ContentSelector as a singleton "charm" modifier for" 
This reverts commit 24b167b755.

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp
 11 years ago
graffy76 f9591ddda6 Reimplemented constentselector view class 11 years ago
Marc Zinnschlag 3146af34d6 some fixes for the merged filter branch 11 years ago
Marc Zinnschlag fdba029566 Merge remote-tracking branch 'sirherrbatka/filters' into saving 11 years ago
Marek Kochanowicz ce2c558257 Missed a file. 11 years ago
Marek Kochanowicz 70602c2c36 Removed changes in the unimplemented copy ctor. 11 years ago
Marek Kochanowicz 5e1bdd605b Corrected formatting in document.hpp 11 years ago
Marc Zinnschlag 743c6ea5b1 save dialogue records 11 years ago
Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 11 years ago
Marek Kochanowicz b23df42817 Removed old comment. Changed to set resources path correctly. 11 years ago
Marc Zinnschlag 3b85d97087 handle deleted dialogue records 11 years ago
Marc Zinnschlag dc12648a3e add fixed dialogue records when creating a new omwgame file 11 years ago
Marc Zinnschlag c0e5501431 disallow the deletion of non-topic, non-journal dialogue records 11 years ago
Marc Zinnschlag 0be157efea set dialogue type for newly created dialogue records 11 years ago
Marc Zinnschlag 75c5316ad7 added dialogue type column to topics table 11 years ago
Marek Kochanowicz b138533bf3 renamed defaultfilter.omwaddon.project to defaultfilters. 11 years ago
Marc Zinnschlag adf3a41a83 added topic and journal tables 11 years ago
Marc Zinnschlag ebf7732912 some cleanup 11 years ago
Marek Kochanowicz 96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 11 years ago
Marek Kochanowicz 6b293961b4 This appears to work. 11 years ago
Marek Kochanowicz 155662860c Added configrue file in cmake. Hopefully it will copy defaultfilters file. 11 years ago
Marek Kochanowicz cafea438bd Added missing light filter. 11 years ago
Marek Kochanowicz 762cbf6278 Changed gauntlets filter. It showes now both gauntlets and bracers. 11 years ago
Marek Kochanowicz 184456892b Added check to load custom filters set when present. 11 years ago
Marek Kochanowicz 4e26a61db3 Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path. 11 years ago
Marek Kochanowicz a7002e8a09 Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work. 11 years ago
scrawl 3a3f2a37c8 Add cut, copy & paste of text 11 years ago
Marc Zinnschlag 74f7071b82 Merge remote-tracking branch 'jeaye/gitignore' 11 years ago
jeaye 04735a6734 Extend .gitignore 
Organize .gitignore to make it easier to add to

Ignore only binaries, not directories

Removed some invalid ignores (.cfg, .desktop, etc)

Better globbing
 11 years ago
Marc Zinnschlag 8c139783b7 silenced a warning 11 years ago
Marc Zinnschlag 19bd0f90b9 Merge remote-tracking branch 'rainChu/torches' 11 years ago
Alex "rainChu" Haddad 65818155d8 Fixed punctuation consistency 11 years ago
Alex "rainChu" Haddad e11da5c0a3 Added a constructor to Light CustomData 11 years ago
Marc Zinnschlag 8995cd8543 reverted gitignore changes 11 years ago
Marek Kochanowicz 3000386443 failed attempt on switch adding. 11 years ago
jeaye 5f4e2d2cf2 Organize .gitignore to make it easier to add to 11 years ago
jeaye 8d8ba0257e Added common untracked files to .gitignore 11 years ago
Alex "rainChu" Haddad 2643214ca6 Lights extinguish underwater 11 years ago
Alex "rainChu" Haddad 30ee3c5cf6 Equipped torches and lights run out of fuel 11 years ago
Emanuel Guevel ba4b8a37e2 Remember pressed message box button longer 
Remember which button was pressed until a new interactive message box is
displayed or until the pressed button number is read.

Before that, it was not possible to get the pressed button after the
message box was hidden/destroyed.
 11 years ago
Marc Zinnschlag db7ea30483 allow float values in cell for value tests 11 years ago
Marc Zinnschlag 679754b305 corrected an error message 11 years ago
Marc Zinnschlag 9b0766b678 minor fix in ValueNode::toString 11 years ago
Marc Zinnschlag 4905f1c8ab make testing empty cells against an empty string yield true 11 years ago