Jordan Milne
403b6756f5
remove dependency on boost::locale, use system mouse position in in-game menus
2013-01-10 23:29:51 -04: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
Marc Zinnschlag
274ff530dc
Merge remote-tracking branch 'wheybags/master'
2013-01-10 11:53:42 +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
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
eduard
2dc0064cc2
more string lowercase
2013-01-09 20:51:52 +01:00
Tom Mason
5bfdb2449d
allowed dropObjectOnGround to be used on npcs, not just player
2013-01-09 18:53:14 +00: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
Marc Zinnschlag
6567bf38f8
Merge remote-tracking branch 'wheybags/master'
2013-01-09 17:01:47 +01: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
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
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
Marc Zinnschlag
d1e51ebf42
silenced some warnings
2013-01-09 12:25:45 +01:00
Marc Zinnschlag
649ae645f3
Merge remote-tracking branch 'blunted2night/bug_495_v2'
2013-01-09 12:12:41 +01:00
Marc Zinnschlag
ddcb742a00
Merge remote-tracking branch 'blunted2night/issue_460'
2013-01-09 12:08:10 +01:00
Jordan Milne
02ccb75894
Wrap the mouse to the window (except in debug mode)
...
Grab the mouse when not in the main menu (except in debug mode)
Always hide the cursor when it's over the window
Allow warping the mouse around
Handle ^C properly
2013-01-09 06:10:05 -04:00
Jordan Milne
1bf36c686c
add ability to check if a window is on the stack (to see if we're in the main menu)
2013-01-09 06:09:47 -04:00
Nathan Jeffords
67491f6c49
reworked DirArchive to improve performance
...
Replaced old file index with a simple map. The map works by storing the
file's relative path with path seperators normalized, and in lower case if
not in strict mode. Incoming searches are normalized in the same way then
the name is searched in the map. The value in the map is the original full
path to the file which is then used to created a ConstrainedDataStream. In
addition to changing the index, the commonly used Archive methods are
implemented so that they don't fall back on the default FileSystemArchive
implementations.
2013-01-08 22:51:05 -08:00
Nathan Jeffords
43cd88a24e
include members of BSAArchives in Ogres resource indices
2013-01-08 22:51:05 -08:00
Jordan Milne
857bb42297
Create a separate scenemanager for each CharacterPreview instance
2013-01-09 01:44:15 -04:00
Jordan Milne
f85679db93
Merge branch 'master' into sdl_input
2013-01-09 00:04:55 -04:00
Nathan Jeffords
719663d86e
added option to override the activation distance
...
The command line option '--activate-dist <int>' can be used to override
the in game activation distance.
2013-01-08 20:00:06 -08:00
Tom Mason
62a2ba1cc6
beast races cannot equip shoes/boots
2013-01-09 03:03:14 +00:00
Tom Mason
135f0870f7
in actionequip, was ignoring actor param, and always using player
2013-01-09 02:16:17 +00:00
Jordan Milne
6b49b8ab47
MyGUI doesn't care for SDL's mouse button ordering, send it what it expects
2013-01-08 22:14:30 -04:00
Jordan Milne
00a2a5c358
remove some more of my mess
2013-01-08 21:04:36 -04:00
Jordan Milne
3b1d285cf3
fix compile errors, work with unmodified SDL
2013-01-08 21:01:58 -04:00
Nathan Jeffords
39d27b87c9
fixed build error with Audiere coded enabled
2013-01-08 09:14:56 -08:00
scrawl
e18cf452d4
Updated shiny again. Some recent changes were accidently overwritten by eduard on 12/30/2012
2013-01-08 13:24:40 +01:00
Jordan Milne
6449f68d61
Merge branch 'master' into sdl_input
2013-01-08 06:24:31 -04:00
Jordan Milne
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
2013-01-08 06:19:05 -04:00
Marc Zinnschlag
c6ff58d5b5
Merge remote-tracking branch 'scrawl/videoplayback'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-08 11:17:19 +01:00
Nathan Jeffords
b3932e3dea
added a separate activation distance for NPCs
2013-01-07 23:40:17 -08:00
Nathan Jeffords
b9fbd6ae4b
Factored faced object lookups into MWRender::World
...
* Renamed MWWorld::World::getFacedHandle to getFacedObject.
* Changed it to return an object pointer
* Updated clients to use return object directly.
2013-01-07 23:38:08 -08:00
Nathan Jeffords
05dad29005
update MWWord::World to track distances while performing occlusion queries.
...
This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.
2013-01-07 23:11:15 -08:00
Nathan Jeffords
0108be2e4f
updated MWWorld::PhysicsSystem::getFacedXXX functions
...
* changed the names and return values to be consistent
* made the distance to search a parameter
* change the distance returned to world units instead of percentage of query distance
2013-01-07 23:00:00 -08:00
Nathan Jeffords
86f691d3d5
split MWWord::World::update into multiple functions
2013-01-07 22:48:24 -08:00
Tom Mason
9ee823d8f8
fixed typo in vmformat.txt
2013-01-07 21:09:03 +00:00
Tom Mason
4c5ed43cc9
added removesoulgem, and fixed addsoulgem
2013-01-07 21:08:04 +00:00
Tom Mason
c2901fe6cc
added addsoulgem scripting function
2013-01-07 18:16:50 +00:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
c2b75e28e9
Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback
2013-01-07 13:20:50 +01:00
