1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 00:45:32 +00:00
Commit graph

6058 commits

Author SHA1 Message Date
Emanuel Guevel
82287445af DialogueWindow: do not execute onFrame() when not visible 2013-01-15 00:59:48 +01:00
Emanuel Guevel
f1f9173f24 Prevent closing dialogue window when an answer is expected 2013-01-15 00:53:32 +01:00
lazydev
aa514a53d9 Console font change to provide possibility to show cyrillic symbols 2013-01-15 02:22:14 +04:00
scrawl
6c6ce4a05c Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-01-14 00:10:57 +01:00
Tom Mason
6fc64e8a4e scripts run for items added to containers, and scripted items in player inv handled correctly 2013-01-13 19:49:56 +00:00
Marc Zinnschlag
33d1585a5e Merge remote-tracking branch 'chris/nifogre' 2013-01-13 18:23:41 +01:00
Tom Mason
7c8b3f1239 Merge remote-tracking branch 'real/master' 2013-01-13 17:07:18 +00:00
Tom Mason
c138e00aa2 objects scripts are now stopped when they are removed from a container 2013-01-13 17:05:12 +00:00
Chris Robinson
b23fcb260c Use the record index for finding the NiTriShape instead of the name 2013-01-13 08:00:04 -08:00
Chris Robinson
660d73fd88 Store the NIF index in the Record object 2013-01-13 06:56:58 -08:00
Marc Zinnschlag
654cd3ab9b Issue #479: Use magnitude specified when adding disease 2013-01-13 14:52:55 +01:00
Tom Mason
d4ca954d47 scripts on items in containers added to script list on cell change 2013-01-12 18:31:57 +00:00
Chris Robinson
94b24f07e1 Keep track of the state in the character controller, and don't remove dead actors from the map 2013-01-12 10:10:27 -08:00
Chris Robinson
4890d901a2 Store an MWWorld::Ptr in the character controller 2013-01-12 08:49:08 -08:00
Chris Robinson
35d17fdaf6 Associate a character controller with each MWWorld::Ptr 2013-01-12 07:12:12 -08:00
Marc Zinnschlag
f4ee8e2642 Issue #479: Added additional magnitude parameter to known spells 2013-01-12 13:10:20 +01:00
Marc Zinnschlag
ecdd89a4f3 Merge remote-tracking branch 'scrawl/nif_file' 2013-01-12 10:10:35 +01:00
scrawl
e4f140841e Make OpenMW work with Ogre 1.9 2013-01-12 08:23:15 +01:00
scrawl
2c3719a6f5 Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass. 2013-01-12 07:02:12 +01:00
scrawl
3f4d8c08e4 Merge branch 'nif_file' into graphics 2013-01-12 06:41:13 +01:00
scrawl
31e6d28b19 Close NIF file resource after loading it into memory 2013-01-12 06:37:43 +01:00
scrawl
30136eb449 Update settings UI 2013-01-12 06:36:48 +01:00
scrawl
52516ca4b4 Merge branch 'master' into graphics 2013-01-12 01:22:01 +01:00
scrawl
ed3c23ad9a Fixed crash on changing cell due to Utf8Encoder going out of scope 2013-01-12 01:18:36 +01:00
Marc Zinnschlag
101810d1e8 Merge remote-tracking branch 'scrawl/ingredients' 2013-01-11 11:12:07 +01:00
Marc Zinnschlag
db48017c36 Merge remote-tracking branch 'blunted2night/nif_cache_v6' 2013-01-11 11:07:45 +01:00
Michal Sciubidlo
85bdb49d1b Mix debug and release if necessary under non Windows systems. 2013-01-11 09:10:48 +01:00
Nathan Jeffords
d5ebd6654d cache loaded NIF files to eliminate reloads
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
2013-01-10 21:47:02 -08:00
Nathan Jeffords
0989b44b41 spread some const around NIF loading 2013-01-10 21:32:47 -08:00
Nathan Jeffords
9d4f8c6722 changed bullet_nif_loader to not modifiy NIF file
The code in bullet_nif_loader was modifing the loaded NIF file as part of
processing. Currently this is OK since the NIF file will be thrown away
immediately, but it causes problems when trying to share loaded NIF files.
2013-01-10 21:32:32 -08:00
Nathan Jeffords
d469415e59 factored out two function from OMW::Engine::go
The initialization code inside Engine::go is now in two function it
calls prior to running the main loop.
2013-01-10 21:32:24 -08:00
scrawl
c71656493d Ingredient effects now correctly hide until the player has discovered them 2013-01-11 01:23:24 +01:00
Chris Robinson
97f8c73d91 Remove some useless parameters
SceneNode::setVisibility merely passes the value to its attached object, of
which there are none at the point it would be called. Additionally, the method
is always called with enabled=true anyway.
2013-01-10 11:09:33 -08:00
scrawl
6ef85c46fd Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-01-10 19:35:40 +01:00
Chris Robinson
771a5f7316 Add the beginnings of a character controller 2013-01-10 08:35:24 -08:00
Chris Robinson
e8ac3976b5 Fix some subentity assumptions 2013-01-10 06:35:06 -08:00
Chris Robinson
7f2d71554e Use the correct offset when building static geometry from an entity 2013-01-10 04:16:18 -08:00
Marc Zinnschlag
274ff530dc Merge remote-tracking branch 'wheybags/master' 2013-01-10 11:53:42 +01:00
Chris Robinson
23ac1c2de5 Merge remote-tracking branch 'zini/master' into animation2
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
2013-01-09 20:52:12 -08:00
scrawl
55769aaf91 Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled 2013-01-10 01:46:00 +01:00
Marc Zinnschlag
6e0b86c6f9 Merge remote-tracking branch 'potatoesmaster/getdisposition' 2013-01-10 01:29:02 +01:00
Tom Mason
8486a51535 fixed drop amounts thanks to zinnschlag 2013-01-09 22:55:28 +00:00
scrawl
35015ef110 Change default settings to use no object shaders and per vertex lighting, as some lights in MW look clearly broken with per pixel lighting enabled (e.g. fireplace in census office, ghostfence) 2013-01-09 23:11:15 +01:00
scrawl
455ec0996d Shaders & textures are now loaded upon loading the NIF, instead of when the object becomes visible in the camera frustum. Should improve responsiveness. 2013-01-09 22:27:58 +01:00
Tom Mason
3517635cfd added Drop and DropSoulGem functions 2013-01-09 21:16:45 +00:00
Marc Zinnschlag
4defb1a476 Merge remote-tracking branch 'trombonecot/lowerstring'
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
2013-01-09 22:13:59 +01:00
scrawl
d3c0851aa7 Changed light attenuation back to linear in all cases, this seems to be what MW does. 2013-01-09 22:08:42 +01:00
scrawl
b8c6f6640b Fixing water <-> waterfall blending issues (Sort of... the second part will follow later) 2013-01-09 21:56:26 +01:00
scrawl
bd8d793fec Removing gamma correction due to caused inconsistencies. 2013-01-09 21:41:40 +01:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00