Jordan Milne
043e29c620
Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)
2013-01-13 21:32:45 -04:00
scrawl
6c6ce4a05c
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-01-14 00:10:57 +01:00
Jordan Milne
d26e33eb26
Merge branch 'master' into sdl_input
2013-01-13 17:06:39 -04: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
Jordan Milne
2639bc4383
Another temp fix for windows
2013-01-12 18:53:00 -04:00
Jordan Milne
b6ec64485c
fix includes for Windows
2013-01-12 17:52:26 -04:00
Jordan Milne
eb08f407d3
Oops, remove resource leak in the input wrapper.
2013-01-12 15:38:22 -04: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
Jordan Milne
5a6589af01
extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start
2013-01-12 11:57:29 -04: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
Jordan Milne
b746e7842f
Merge pull request #1 from scrawl/sdl_input
...
fix const cast, fix comment
2013-01-12 00:47:06 -08: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
scrawl
d71b583855
fix const cast, fix comment
2013-01-11 22:25:34 +01:00
Jordan Milne
651a654985
clean up our cursors during destruction
2013-01-11 10:09:26 -04:00
Jordan Milne
eeacb04fe2
Fully working hardware cursors (if you compile SDL2 with XCursor support)
2013-01-11 09:32:29 -04:00
Jordan Milne
3fb920a66f
Merge branch 'master' into sdl_input
2013-01-11 08:29:01 -04:00
Jordan Milne
f9b064d1bc
add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully
2013-01-11 08:27:59 -04: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
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
