Commit Graph

4865 Commits (0b7d11d38d99033a09bed6b22c75378f692653a5)
 

Author SHA1 Message Date
Marc Zinnschlag 9201baebf9 template fix 12 years ago
Marc Zinnschlag c3cd6e8a8a new attempt at the editor 12 years ago
scrawl c8562d8442 toggleCollisionBoxes actually does something useful now 12 years ago
Marc Zinnschlag 4517613063 updated credits.txt 12 years ago
Marc Zinnschlag 5d45bcd03a Merge remote-tracking branch 'trombonecot/master'
Conflicts:
	apps/openmw/mwclass/light.cpp
12 years ago
eduard 4e4d15f8ac Failed action 12 years ago
scrawl 693eeabeca shiny: fix GLSL texture units when shaders were disabled 12 years ago
eduard 82ea547ce4 Failed action 12 years ago
scrawl 8ef3edd416 Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 12 years ago
scrawl f5355e3e92 512x512 map, slightly faster 12 years ago
Marc Zinnschlag 948a4b723d updated credits.txt 12 years ago
Marc Zinnschlag a092deaee8 various fixes 12 years ago
Marc Zinnschlag 3dc013ceae Merge remote-tracking branch 'gohan/Gohan' 12 years ago
scrawl dc67a547b0 global map explored overlay 12 years ago
marcin 51027c541e Feature #391 Dummy AI package classes 12 years ago
Marc Zinnschlag 9193f3b0ae implemented getCommon/BlightDisease script instructions 12 years ago
Marc Zinnschlag 89c7936534 fixed dialogue script error reporting 12 years ago
Marc Zinnschlag fd5671e6db fixed argument lists for setpcfacrep and modpcfacrep 12 years ago
marcin bed0280ba1 Feature #391 Dummy AI package classes 12 years ago
marcin 99ddc63e2c Feature #391 Dummy AI package classes 12 years ago
marcin 96dd399457 Feature #391 Dummy AI package classes 12 years ago
marcin 515419ae0b Feature #391 Dummy AI package classes 12 years ago
marcin 4b939c7521 Feature #391 Dummy AI package classes 12 years ago
Marc Zinnschlag 82d62eb95a Merge branch 'script' 12 years ago
Marc Zinnschlag 9669eed083 Issue #219: added last missing function filters 12 years ago
scrawl aefde3f5bc Merge branch 'master' into globalmap 12 years ago
marcin e6c8e1f0d7 Feature #391 Dummy AI package classes 12 years ago
marcin 698afbec3e Feature #391 Dummy AI package classes 12 years ago
marcin ea64a02f91 Merge branch 'Gohan' of https://github.com/Gohan1989/openmw 12 years ago
marcin c26d17c74b Feature #391 AiPackage classes 12 years ago
marcin 850606cc30 Feature #391 AiPackage classes 12 years ago
scrawl 5f7d349126 several missing includes 12 years ago
Marc Zinnschlag b046687f46 added PCFacRep script instructions 12 years ago
Marc Zinnschlag 2a1727d4c5 improved error reporting for dialogue scripts (enabled via --script-verbose) 12 years ago
Marc Zinnschlag c621a9f7e4 added missing disposition script instructions 12 years ago
Marc Zinnschlag 8aa1fd921b fixed some stats related script instructions 12 years ago
Marc Zinnschlag 3f20206f8e Merge remote-tracking branch 'scrawl/no_submodule' 12 years ago
Marc Zinnschlag cbb0fd5792 Merge branch 'dialogue' 12 years ago
scrawl 32bf40e407 Merge branch 'master' into no_submodule 12 years ago
Marc Zinnschlag 409d15576b Merge remote-tracking branch 'greye/player-model' 12 years ago
Marc Zinnschlag e2ccec99f0 Issue #219: added another missing PC stats filter 12 years ago
Marc Zinnschlag 586ac3f5c6 Issue #219: added some more stats filters; fixed two filters 12 years ago
Marc Zinnschlag 77ba8c5117 Issue #219: implemented rank requirement filter 12 years ago
scrawl 8e847fdc6e fix speechcraft skill increasing when persuade didn't succeed 12 years ago
scrawl 11a8d5d70a Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 12 years ago
scrawl 7c22690116 Merge branch 'next' into globalmap 12 years ago
greye 623e00531d fix reentering race selection 12 years ago
greye 0d33d005a5 head/hair selection 12 years ago
greye 50867e8d87 fix gender selection update, main model visibility and couple of crashes 12 years ago
Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
12 years ago