mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
28,397 Commits
38 Branches
54 Tags
122 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 'master'
${ noResults }
Commit Graph

233 Commits (master)

Author SHA1 Message Date
lazydev 7cd1e87fe8 Merge branch 'master' of git://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
 12 years ago
lazydev cd5d95ed22 1. Dialogs in Russian version now works. 
2. Destination names it travel window are now translated
 12 years ago
Tom Mason ad9b86058b replaced explicit text with GMST entries, thanks to zinnschlag 12 years ago
Tom Mason 716fbbbd74 messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory 12 years ago
scrawl 8e857587d7 fix a text coloring bug 12 years ago
scrawl f218ef2675 fix separator 12 years ago
scrawl 1d7e92b6b3 dialogue fixes 12 years ago
scrawl 92bba18218 removed useless member 12 years ago
scrawl 33b4b29fbc persuasion mechanics, added reputation 12 years ago
scrawl ace9ee9c83 persuasion dialog 12 years ago
scrawl d53a7ade1e method names, disposition uint->int 12 years ago
scrawl b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 12 years ago
scrawl bf4e855260 fixed creatures 12 years ago
Marc Zinnschlag 918316168f Merge remote-tracking branch 'greye/store' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp
 12 years ago
gugus 2841d831a6 Disposition is now updated everyframe 12 years ago
greye 4637503680 applying new interface vol.6, inconsistent 12 years ago
scrawl 646e689239 clear name edits when opening alchemy / spell creation 12 years ago
gugus 9ebe9cb40c Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes 12 years ago
greye 2057f5619e move ESMStore to MWWorld 12 years ago
Marc Zinnschlag 6f7a621b6f disabled enchanting unfinished enchantment GUI for now 12 years ago
scrawl 125315ebe7 remove a cout 12 years ago
scrawl c64eb96952 Merge branch 'Travel_Dialogue' into training_travel 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt
 12 years ago
scrawl 1a2034b4dd training window 12 years ago
gugus 4f5c4bf89a Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwgui/dialogue.hpp
	apps/openmw/mwgui/mode.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
 12 years ago
scrawl ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation 
Conflicts:
	apps/openmw/mwgui/dialogue.cpp
 12 years ago
gugus 3060fbee60 TravelGUI, not completly finished. 12 years ago
scrawl 9d7c35ae48 and go 12 years ago
scrawl 9f2668b45b Task #400 Review GMST access 12 years ago
Marc Zinnschlag 273ac0a97f Merge branch 'spellbuying' 12 years ago
scrawl 35dd49f948 fixed some "using namespace" in headers 12 years ago
Adam Hogan 08410b9062 Renamed SpellBuyingWindow, took some suggestions from scrawl 12 years ago
Adam Hogan ebf80943a9 Added spell buying window 13 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 0d3a7d482e Merge remote branch 'modred11/master' 13 years ago
guidoj 0549e949ba Mostly removal of unnecessary #include's and a little clean up 13 years ago
Carl Maxwell e4d046f69c Prepending m to the name of every member variable. 
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
    npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
 13 years ago
scrawl d27863bf8e rename layout files to .layout to get them recognized by layout editor 13 years ago
scrawl 0aa01b93e2 don't put blue color on actions that are in the topic list, but are not topics (e.g. Barter) 13 years ago
scrawl c85c794c86 fixed some cppcheck issues 13 years ago
scrawl 8e96871acd remove something unused 13 years ago
scrawl f1d3978897 Issue #290: Auto-Close MW-reference related GUI windows 13 years ago
scrawl 7ebbc099b3 allow stacking gui modes 13 years ago
scrawl 4fb30544d4 more gui files cleanup 13 years ago
scrawl 50a8eb05d9 transfering items between player and merchant works and shows a red frame for bought/sold items. 13 years ago
scrawl 6ae642aa06 complete trade window layout 13 years ago
scrawl 5da4da820e beginnings of trade window layout. 13 years ago
scrawl 0dc5e5919b show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works. 13 years ago
scrawl 630241c8e2 load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum. 13 years ago
scrawl c4aae96d94 implemented "goodbye" script function that force-cancels dialogue 13 years ago
scrawl de995e3a69 adjust topic list on window resize 13 years ago
scrawl 499dd26398 dialogue window topic list word-wrapping 13 years ago
Marc Zinnschlag 53e77d4196 Merge remote branch 'scrawl/tooltips' into next 13 years ago
scrawl f733382f74 tooltip now contains info about item enchantment 13 years ago
scrawl eca18f3e1d dialogue topic and choice sorting independent of case 13 years ago
Marc Zinnschlag 35f478071e Issue #255: deleted the old environment class and using the new one instead 13 years ago
scrawl 8231cab599 correct case for dialogue topics 13 years ago
scrawl d3f31c3498 dialogue window enhancements 13 years ago
scrawl d1508f5a59 List -> ListBox 13 years ago
scrawl 161d519206 fixed the dialogue history topic selection 13 years ago
scrawl b0b41a9199 should now compile warning free 13 years ago
scrawl deeb21a131 switched to the new multi-delegates system 13 years ago
Marc Zinnschlag f2a47d421b some cleanup 13 years ago
gugus 2707391535 fix for questions 13 years ago
gugus f87bd65ae1 Merge branch 'DialogueSystem' of github.com:scrawl/openmw into DialogueSystem 13 years ago
gugus 846196d048 fixed a crash 13 years ago
scrawl 21143f006b fix several warnings 13 years ago
gugus 042d87f77f a lot of clean up 13 years ago
gugus 56a84b6a1a choices works. The only thing remaining is the script arguments problems. 
Need a lot of clean up too.
 13 years ago
gugus 07d8d654cd one step toward function filters and end choices. 13 years ago
gugus 6f7752633a there was no extension in the compiler context. Corrected. But Choice doesn't work. 13 years ago
gugus 232e478768 Fix for prefix/suffix stuff 13 years ago
gugus bc72b2d535 fixed text color 13 years ago
gugus 4658ec276f increased the max size of the text of the dialogue 13 years ago
gugus 94ab65f8bb fixe a compiling error? 13 years ago
gugus c65c160e7b finished connecting the dialogue GUI and the dialogue manager 13 years ago
gugus abe38e5f87 Started to weire the dialogue manager and the dialogue GUI 13 years ago
gugus 5cbd256e1c "full" question support. Now needs to be linked with the dialogue Manager. 13 years ago
gugus debec44b51 better colors (not perfect yet), and some basic question support (not finished yet). 13 years ago
gugus f7cf5f9bef improved the dialogue GUI. Questions are still missing. 13 years ago
Jan-Peter Nilsson 54fc64cb6a Decrease number of classes that need to know about other components 14 years ago
Jan-Peter Nilsson d9d626cc95 Make DialogueWindow use the new WindowBase 14 years ago
Jan-Peter Nilsson be5562cb2c Added dialouge window 14 years ago