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
Jordan Milne
1117105039
fix compile error with boost includes
2013-01-11 00:37:04 -04:00
Jordan Milne
a030c03513
support the printscreen button properly
2013-01-10 23:53:19 -04:00
Jordan Milne
403b6756f5
remove dependency on boost::locale, use system mouse position in in-game menus
2013-01-10 23:29:51 -04:00
scrawl
c71656493d
Ingredient effects now correctly hide until the player has discovered them
2013-01-11 01:23:24 +01:00
Jordan Milne
eff26159d9
Merge branch 'master' into sdl_input
2013-01-10 18:03:35 -04:00
Jordan Milne
601d79ef3f
fix the mouse wheel in mygui
2013-01-10 17:59:49 -04:00
Jordan Milne
ed644259ce
Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling
2013-01-10 17:21:47 -04: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
scrawl
111e38ef25
Revert "fog now distance based instead of depth"
...
This reverts commit 7ee038fdd7
2013-01-09 20:18:26 +01:00
Chris Robinson
a14132b5a0
Merge remote-tracking branch 'zini/master' into animation2
2013-01-09 11:12:26 -08:00
scrawl
bc73c5b1ec
enable directional lighting for character previews
2013-01-09 20:08:59 +01:00
Tom Mason
5bfdb2449d
allowed dropObjectOnGround to be used on npcs, not just player
2013-01-09 18:53:14 +00:00
Chris Robinson
c4c8295e0b
Rename NIFLoader to Loader, and update some comments
2013-01-09 09:10:59 -08:00
Nathan Jeffords
6ca87e108f
updated loading screen to use the resource managers pattern matching when finding files
2013-01-09 08:54:03 -08:00
Nathan Jeffords
44031ec3d7
fleshed out BSAArchive and DirArchive.
...
Implemented both lists & finds, with pattern matching.
Conflicts:
components/bsa/bsa_archive.cpp
2013-01-09 08:53:27 -08:00
Chris Robinson
be74859f05
Avoid some unnecessary copying when calling addPartGroup
2013-01-09 08:03:28 -08:00
Marc Zinnschlag
6567bf38f8
Merge remote-tracking branch 'wheybags/master'
2013-01-09 17:01:47 +01:00
Chris Robinson
9fedaf18d6
Make some methods private
2013-01-09 07:55:55 -08:00
Chris Robinson
625a538f03
Combine part selection into a single loop
2013-01-09 07:43:10 -08:00
Jordan Milne
cb01df49c0
begin to support text input
2013-01-09 11:30:33 -04:00
Jordan Milne
5fa77da9d4
Merge branch 'master' into sdl_input
2013-01-09 10:56:15 -04:00
Chris Robinson
4b7cc1372f
Some cleanup
2013-01-09 06:32:31 -08:00
Emanuel Guevel
3e41a1118a
GetDisposition: return calculated disposition instead of base disposition
2013-01-09 15:14:17 +01:00
Tom Mason
375961fe5e
small fix
2013-01-09 13:27:12 +00:00
Tom Mason
b035a5aa4a
beast races cannot equip anything they oughtn't to be able to equip
2013-01-09 13:18:05 +00:00
Chris Robinson
a9bcbfd8d3
Use Node::_getFullTransform instead of building the matrix manually
2013-01-09 05:11:32 -08:00
Jordan Milne
53cff0ba68
use native relative mouse movements where available, have the cursor follow the hardware cursor in the main menu
2013-01-09 09:05:47 -04:00
Chris Robinson
015bb0bf1f
Use the calculated max time for the "all" animation
2013-01-09 04:30:32 -08:00
Chris Robinson
465fd9c8af
Offset animation times to start at 0
2013-01-09 04:21:56 -08:00
