mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-24 19:23:56 +00:00
Code Issues Releases Wiki Activity
5162 commits 108 branches 66 tags 133 MiB
Commit graph

3611 commits

Author SHA1 Message Date
scrawl
16c2ea3a75 terrain colourmap 2012-07-14 11:13:38 +02:00
Chris Robinson
939d0d2fc5 Return a list of meshes and the skeleton from NIFLoader::load 2012-07-13 20:01:15 -07:00
Marc Zinnschlag
573d7e7e45 Issue #314: fix to potion use function (was mixing up potion with potion user) 2012-07-13 15:51:57 +02:00
Marc Zinnschlag
782d417d5b Issue #314: potion usage 2012-07-13 13:09:22 +02:00
Marc Zinnschlag
182017b8e9 Issue #314: Moved ingredients and potions to a different type of record list 2012-07-13 13:08:48 +02:00
Carl Maxwell
e4d046f69c Prepending m to the name of every member variable. 
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
    npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
 2012-07-13 03:51:58 -07:00
scrawl
d2fbb11475 temp commit 2012-07-13 11:26:36 +02:00
Marc Zinnschlag
29b4a5e5f7 Issue #314: added apply actions 2012-07-13 09:41:38 +02:00
Marc Zinnschlag
84d846cf07 Issue #314: implemented apply and skillUsageSucceeded functions for MWClass::Npc 2012-07-13 09:16:27 +02:00
scrawl
7731e9a6fa finished cleaning up sky 2012-07-13 09:13:12 +02:00
Marc Zinnschlag
805b81bf6e Issue #314: added skillUsageSucceeded function to Class 2012-07-13 09:03:17 +02:00
Marc Zinnschlag
7a2d613043 Issue #314: extended Class::apply function to cover the actor 2012-07-13 08:50:46 +02:00
scrawl
b8384162b6 merge 2012-07-13 06:16:55 +02:00
Chris Robinson
ecdd4ee23f Load NiMorphData and NiKeyframeData using proper key lists 2012-07-12 20:56:47 -07:00
Chris Robinson
386ac56bda Remove the NIF loader and code to manually transform the vertices 
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
 2012-07-12 20:12:18 -07:00
scrawl
ad7383be43 sky 2012-07-11 09:08:55 +02:00
scrawl
e0a99f104b settings tab "shadows" 2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc shader mode button in settingswindow 2012-07-11 03:19:51 +02:00
scrawl
865bfc6f47 sync mrt_output setting 2012-07-11 02:31:03 +02:00
Marc Zinnschlag
ec9ebe6b58 Merge branch 'skillgain' into potions 
Conflicts:
	apps/openmw/mwmechanics/activespells.cpp
 2012-07-10 14:08:30 +02:00
Marc Zinnschlag
f11bf49a90 cmake fix; silenced some warnings 2012-07-10 13:23:41 +02:00
gugus
164a5c8fe4 rotation now also work with the physic representation 2012-07-10 12:10:50 +02:00
gugus
70c74ede05 changed rotation order 2012-07-10 11:53:12 +02:00
gugus
410b693555 setAngle improvement 2012-07-10 11:15:46 +02:00
scrawl
3537af051d removed the old shader helper 2012-07-10 00:17:52 +02:00
scrawl
5d1e6b6bf6 remove cg profile check 2012-07-10 00:09:47 +02:00
scrawl
1a9f59d5d4 shadows 2012-07-10 00:07:33 +02:00
Marc Zinnschlag
0d8150f4bd Issue #324: added useSkill function to NpcStats (adjust skill level according to use) 2012-07-09 21:15:52 +02:00
Marc Zinnschlag
a207c86fd1 Issue #324: added some range checks 2012-07-09 21:14:11 +02:00
Marc Zinnschlag
67c1c5ce18 Issue #324: adjusted setSkill script instructions according to the recent research 2012-07-09 20:42:45 +02:00
Marc Zinnschlag
25a5657d80 Issue #324: Modified the interface for modified stats 2012-07-09 20:34:12 +02:00
scrawl
07fd9986ef accidently removed the map. 2012-07-09 20:14:07 +02:00
scrawl
b803d0e949 converted shadow caster shader 2012-07-09 19:46:36 +02:00
gugus
557e114992 clean-up + getScale/Angle script instructions 2012-07-09 19:28:44 +02:00
scrawl
81d30ff63a temp commit 2012-07-09 19:20:41 +02:00
gugus
0a67f60a6e Clean-up 2012-07-09 18:47:59 +02:00
gugus
e6716c25c3 little correction. 2012-07-09 15:41:19 +02:00
gugus
feec67094f Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwworld/physicssystem.cpp
 2012-07-09 15:23:26 +02:00
gugus
03f7740474 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/worldimp.hpp
 2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d merge 2012-07-07 15:27:04 -04:00
Marc Zinnschlag
fe86ce5a2c DrawState workaround 2012-07-07 20:53:19 +02:00
Marc Zinnschlag
6277e39216 Merge branch 'master' into skillgain 2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson
113457d934 Fixed some windows issues and got rid of a few tiny warnings while at it. 2012-07-07 01:14:18 +02:00
Marc Zinnschlag
0f41cc499d Issue #324: Added skill gain calculation function 2012-07-06 21:07:04 +02:00
Marc Zinnschlag
10723a149b Issue #324: Change a forward declartion to avoid potential problems with pesky MSVC 2012-07-06 18:25:16 +02:00
Marc Zinnschlag
d30ba14a17 Issue #324: Finished turning NpcStats into a proper class 2012-07-06 18:23:48 +02:00
Marc Zinnschlag
771863e73b Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue 2012-07-06 15:50:26 +02:00
scrawl
a095572205 fixed some textures, started with sky 2012-07-06 10:31:48 +02:00
scrawl
33c48b9481 update 2012-07-06 04:28:08 +02:00
scrawl
1a5203749f fix "error in framelistener" when trying to pick up lights that can't be picked up 2012-07-05 17:13:23 +02:00
scrawl
4ea6530772 hello world. 2012-07-04 00:26:57 +02:00
scrawl
a1e48b0feb builds now 2012-07-03 22:48:16 +02:00
scrawl
78efc31641 different default coordinates for container window to prevent it from going invsible when changing resolution (bug #308), fixed some windows not centering when resolution change 2012-07-03 16:51:29 +02:00
scrawl
085891879c fixed another resolution change bug introduced recently 2012-07-03 16:44:20 +02:00
Marc Zinnschlag
205ed0ce5b post merge fix 2012-07-03 15:53:42 +02:00
Marc Zinnschlag
cc7c6aa0ad Merge branch 'decouple' 2012-07-03 15:47:57 +02:00
Marc Zinnschlag
c85aaafac2 more include cleanup (most removing Ogre.h) 2012-07-03 15:32:38 +02:00
Marc Zinnschlag
87667ab57e Issue #107: Ptr related include cleanup 2012-07-03 13:55:53 +02:00
Marc Zinnschlag
5a7b95bf7a Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp 2012-07-03 13:15:20 +02:00
Marc Zinnschlag
4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 2012-07-03 12:30:50 +02:00
scrawl
d27863bf8e rename layout files to .layout to get them recognized by layout editor 2012-07-03 11:34:20 +02:00
Marc Zinnschlag
035c1c4b6e added World interface class; cleanup of World interface 2012-07-03 01:06:38 +02:00
Marc Zinnschlag
efb95e2f83 Issue #317: check if spell actually exist in AddSpell 2012-07-02 14:25:46 +02:00
Pieter van der Kloet
2db6e4f4cf Second try: added aspect ratios to the resolution combobox 2012-06-29 19:13:12 +02:00
Marc Zinnschlag
7fcd41c69d Issue #107: Detemplateised CellStore; some include cleanup 2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 2012-06-29 16:48:50 +02:00
Marc Zinnschlag
fc063472d0 Revert "Added aspect ratio info to the list of resolutions" 
This reverts commit be5e047106.
 2012-06-29 14:41:19 +02:00
Chris Robinson
897622a511 Merge remote branch 'zini/master' into sound 2012-06-28 15:01:41 -07:00
Marc Zinnschlag
e5cdc988a6 Merge remote branch 'pvdk/launcher' 2012-06-28 10:14:03 +02:00
Pieter van der Kloet
dded604eca Improved launcher images made by serpentine 2012-06-28 05:16:26 +02:00
Pieter van der Kloet
be5e047106 Added aspect ratio info to the list of resolutions 2012-06-28 02:06:42 +02:00
Marc Zinnschlag
70ac1c818d Merge remote branch 'scrawl/settingswindow' 2012-06-27 09:02:29 +02:00
scrawl
b73b39f3c6 launcher bugfix, settings was not written when "Play" was selected 2012-06-27 00:55:25 +02:00
Chris Robinson
2f8056dfab Merge remote branch 'zini/master' into sound 2012-06-26 14:59:01 -07:00
scrawl
232fe0be8c fix for the directx crash 2012-06-26 18:03:52 +02:00
scrawl
c37b14f5f7 Merge pull request #5 from pvdk/master 
Sorting of graphics values
 2012-06-26 06:47:39 -07:00
scrawl
30e86e1b9d settings window resolution sorting, aspect ratio 2012-06-26 15:41:13 +02:00
Pieter van der Kloet
e5159a1950 Modified sorting of the values in the Graphics Page 2012-06-26 15:37:40 +02:00
Pieter van der Kloet
77ac8760d1 Cleaned up the GUI of the Graphics page 2012-06-26 03:07:54 +02:00
Pieter van der Kloet
6fe471c1c6 Resolutions are now sorted descendingly and removed some debug stuff 2012-06-26 02:41:54 +02:00
Marc Zinnschlag
83c3972a89 Issue #314: added return value to addSpell function 2012-06-24 16:23:43 +02:00
Marc Zinnschlag
aa827442e8 Issue #314: Generalised ActiveSpells class so that it can handle lasting effects from potions too 2012-06-24 11:39:21 +02:00
scrawl
797c2c538d fix some settings bugs 2012-06-23 12:25:28 +02:00
Marc Zinnschlag
2b68e4d489 Merge remote branch 'scrawl/trianglebatchcount' 2012-06-22 14:30:00 +02:00
scrawl
63ce143a04 fix triangle / batch counts with compositors 2012-06-22 12:56:04 +02:00
scrawl
98f13ebcc0 Merge branch 'misc' of github.com:scrawl/openmw into misc 2012-06-21 12:15:43 +02:00
Marc Zinnschlag
ad251065f4 removed more cout spam 2012-06-21 12:00:56 +02:00
Marc Zinnschlag
89ac0fa232 Issue #312: Implemented ID-search caching to speed up some badly written scripts 2012-06-21 11:43:18 +02:00
Pieter van der Kloet
6a2bcddef5 Changed the way the launcher exits and polished the error handling code 2012-06-20 23:25:22 +02:00
Jason Hooks
5c51674070 update 2012-06-20 13:14:27 -04:00
Marc Zinnschlag
1b368506d4 Merge remote branch 'pvdk/filedialog' 2012-06-20 16:05:20 +02:00
Pieter van der Kloet
d162445e68 Got rid of some unwanted warnings and did some cleanup on the launcher 2012-06-20 13:35:05 +02:00
Marc Zinnschlag
95d9c99d0d Merge remote branch 'pvdk/filedialog' 2012-06-20 09:28:43 +02:00
Pieter van der Kloet
e21442f6cc Fix for Bug #306: launcher now creates the config dir and returns proper error codes 2012-06-20 02:28:49 +02:00
Jason Hooks
86d8a07fc7 Switching back to old scaling 2012-06-19 13:28:06 -04:00
Marc Zinnschlag
1f0efa9f7d Merge remote branch 'scrawl/guifixes' 2012-06-19 19:06:18 +02:00
scrawl
15e959868c make some of the gui mode changes a bit safer 2012-06-19 17:07:00 +02:00
Marc Zinnschlag
590dfe8d63 fixed the container fill problem on cell load 2012-06-19 16:42:10 +02:00
Marc Zinnschlag
511d0c0e1c Merge remote branch 'scrawl/rendererselection' 2012-06-19 16:04:48 +02:00
scrawl
61ec56debc don't add duplicate resolutions 2012-06-19 16:02:28 +02:00
scrawl
c9e76d3e90 remove extra tokens at the end of the resolution string, if present 2012-06-19 15:57:58 +02:00
scrawl
ff278ab4ec chargen generate class: fix result not being shown in review dialog 2012-06-19 15:25:04 +02:00
scrawl
0aa01b93e2 don't put blue color on actions that are in the topic list, but are not topics (e.g. Barter) 2012-06-19 15:24:52 +02:00
Marc Zinnschlag
9a6f012578 Merge branch 'script' 2012-06-19 11:07:47 +02:00
Jason Hooks
4d55ecfdbe Deleting scaled shapes; scaleObject() 2012-06-18 13:03:00 -04:00
Marc Zinnschlag
09057daac5 Merge remote branch 'scrawl/containerunlocking' 2012-06-18 09:57:22 +02:00
Jason Hooks
33fe80723c btScaledBvhTriangleMeshShapes 2012-06-17 20:56:10 -04:00
scrawl
de3daf3dc1 allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind 2012-06-18 00:21:55 +02:00
Marc Zinnschlag
4a726f272b Merge remote branch 'pvdk/filedialog' 2012-06-17 09:58:39 +02:00
Marc Zinnschlag
badb20e5df Merge remote branch 'scrawl/rendererselection' 2012-06-17 09:54:18 +02:00
Pieter van der Kloet
f81e127701 Created custom directory dialog which only accepts Data Files dirs 2012-06-17 06:48:32 +02:00
scrawl
b831c3313d render system was not written on launcher exit 2012-06-17 00:47:45 +02:00
Marc Zinnschlag
3c42a71dae removed some cout spam 2012-06-16 16:42:35 +02:00
Marc Zinnschlag
e2a77037eb fixed a type in a script instruction 2012-06-16 16:38:54 +02:00
Marc Zinnschlag
8283f5f135 added setHello/Fight/Flee/Alarm instructions 2012-06-16 16:31:32 +02:00
Marc Zinnschlag
ea29b74bb4 added per NPC/creature basic AI-settings (hello, fight, flee, alarm) 2012-06-16 16:17:42 +02:00
Marc Zinnschlag
7454713a9b addet provisional implementation of AiWander (doesn't do anything yet) 2012-06-16 16:06:15 +02:00
Marc Zinnschlag
b16157a618 documentation fix 2012-06-16 15:49:39 +02:00
Marc Zinnschlag
3167ae9473 added force/clearforce instructions for run and sneak 2012-06-16 15:49:03 +02:00
Marc Zinnschlag
0795730a19 Merge branch 'xdoty' into script 2012-06-16 14:57:13 +02:00
Marc Zinnschlag
10b27e582b Issue #181: various fixed to member variable access 2012-06-16 13:51:13 +02:00
Marc Zinnschlag
6c5b21fa42 Issue #181: Member variable access in expressions; error reporting fix for the previous commit 2012-06-16 13:06:23 +02:00
Marc Zinnschlag
6a89d76321 Issue #181: Improved script error reporting for local and global scripts 2012-06-16 11:52:35 +02:00
gugus
5397b9dba6 Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling 2012-06-16 11:38:07 +02:00
gugus
974585d357 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 2012-06-15 14:53:58 +02:00
gugus
01fefca0a3 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-15 14:53:19 +02:00
scrawl
584ae30213 don't show diseases and curses in the spell list 2012-06-15 10:09:46 +02:00
Marc Zinnschlag
0f71439991 Merge remote branch 'garvek/master' 2012-06-15 08:22:56 +02:00
Jason Hooks
897a331244 NPC activation 2012-06-13 12:21:51 -04:00
Jason Hooks
20288de685 Post merge 2012-06-11 15:39:57 -04:00
Jason Hooks
b14c132a31 Merging in the latest master 2012-06-11 13:25:06 -04:00
Alexander "Ace" Olofsson
f675d8d039 Merge branch 'master' 2012-06-11 19:09:10 +02:00
Jason Hooks
595b0729da Few things changed 2012-06-10 21:08:58 -04:00
Pieter van der Kloet
0bcec32c70 Changed launcher logo to the new one done by Necrod 2012-06-11 02:50:29 +02:00
Mark Siewert
bef4bef5d2 - Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied. 
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
 2012-06-10 11:14:46 +02:00
Jason Hooks
fb0a52809d Changing transformation processing 2012-06-09 15:19:15 -04:00
scrawl
447158e9d6 shutdown crash fix 2012-06-09 19:15:11 +02:00
Sylvain THESNIERES
fc3a3fc173 MSVC build compliance: 
- static const float member is not ISO
- callback do not match DLL signature
 2012-06-08 19:55:39 +02:00
Marc Zinnschlag
eb0be10e80 Merge branch 'script' into xdoty 2012-06-07 13:00:01 +02:00
Marc Zinnschlag
ff84fbbfa7 Added DontSaveObject script instruction 
We are ignoring it for now and unless users protest we will probably keep it that way.
 2012-06-07 12:36:51 +02:00
Marc Zinnschlag
72fca40090 Issue #181: member variable access in interpreter context 2012-06-07 11:59:45 +02:00
scrawl
42e44ac1b5 fixed some leaks 2012-06-06 21:08:20 +02:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
scrawl
dfac5f26c3 fixed some issues: 
- probes were not showing up in inventory category "misc"
- lights, probes, lockpicks were not equippable
- weapons could not be picked up
 2012-06-04 21:48:20 +02:00
scrawl
ea8e3ca1c8 fix item duplication bug when picking up object with the mouse and immediately dropping again 2012-06-04 21:09:51 +02:00
scrawl
1ecc6f97ed alchemy effect fix 2012-06-04 20:56:13 +02:00
scrawl
d56defd4f4 set input focus to console after selecting objects in console mode 2012-06-03 21:19:48 +02:00
scrawl
8e96871acd remove something unused 2012-06-03 18:40:10 +02:00
gugus
0012d7eb58 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-03 12:53:23 +02:00
scrawl
b8464d4ce5 allow picking up objects from the gameworld with the mouse in inventory mode 2012-06-02 14:19:02 +02:00
scrawl
b886aea298 change console skin to MW_Window and set the selected object refID as window title 2012-06-02 12:31:23 +02:00
scrawl
0ba0b2122e set the implicit object for script excution by clicking on it 2012-06-02 12:25:24 +02:00
scrawl
36d26e0681 set the camera orientation after using teleport doors 2012-05-30 15:52:39 +02:00
Marc Zinnschlag
2bbbff2b75 Merge remote branch 'scrawl/spellwindow' 2012-05-30 10:22:56 +02:00
scrawl
2c90654401 fix a typo that caused a crash when trying to disable an already disabled object 2012-05-30 09:21:41 +02:00
scrawl
72bb7a2d2c fix a typo 2012-05-30 08:04:07 +02:00
Jason Hooks
fb4e7f02b9 code correction 2012-05-29 22:03:00 -04:00
scrawl
c5a685d11f addition to last commit: show the selected weapon/spell names as inventory/spell window caption 2012-05-29 18:59:11 +02:00
scrawl
298ae4f7f8 HUD icons for selected weapon / selected spell / selected enchanted item 2012-05-29 18:33:01 +02:00
gugus
a711a3ebe1 Various fixes 2012-05-29 16:45:43 +02:00
gugus
f83ffecae5 SetAngle and SetScale script instruction 2012-05-29 15:57:13 +02:00
scrawl
8b7baa808e fixed the hud icon positioning issues 2012-05-29 15:36:48 +02:00
scrawl
48ba293e88 added the success formula, and spell deleting (shift+click) 2012-05-29 15:13:44 +02:00
scrawl
30461438f6 still left: spell success formula 2012-05-29 12:35:03 +02:00
scrawl
5412d6ed9e fixed a typo that prevented spells from getting added 2012-05-29 10:47:48 +02:00
gugus
d8051095d6 rotation are updated in the physis system 2012-05-29 10:36:12 +02:00
gugus
26d6c9453c more work on rotation 2012-05-29 10:15:29 +02:00
scrawl
c7268233df spell window layout & opening/closing/pinning logic 2012-05-29 09:02:22 +02:00
scrawl
1b561ce91f Merge branch 'master' into next 2012-05-29 06:56:23 +02:00
scrawl
69e6bc6588 add water settings to settings window 2012-05-29 06:45:44 +02:00
scrawl
5d03e86613 added field of view and texture filtering to settings window 2012-05-29 04:54:54 +02:00
scrawl
6945afe95b alchemy window layout 2012-05-29 02:57:19 +02:00
scrawl
8c7cb6909d addition to c7010623fb : apparently talking _is_ allowed during the starting sequence, it is only disabled via scripts for certain actors 2012-05-29 01:59:16 +02:00
scrawl
f75266e4ba fixed race dialog bug 2012-05-29 01:47:49 +02:00
gugus
77084b27c0 some work for rotation/scaling 2012-05-28 16:01:35 +02:00
scrawl
0a17d6d710 more resolution switching fixes 2012-05-28 12:34:29 +02:00
Marc Zinnschlag
76b23ae864 Merge remote branch 'scrawl/buildplayerfix' 2012-05-28 11:44:43 +02:00
scrawl
a54623bcd2 reset attributes when building player 2012-05-28 11:37:56 +02:00
scrawl
e1ee45a6d6 Issue #297: Make the stats review dialog show correct values for attributes/skills/health/magicka/fatigue 2012-05-28 10:50:00 +02:00
scrawl
6014a90002 added tooltip delay option 2012-05-28 09:46:05 +02:00
scrawl
14f4f09f83 proper resolution switching (reposition GUI & adjust mouse clipping region) 2012-05-28 09:19:25 +02:00
scrawl
3daf1ebc3f small map tweak 2012-05-28 05:03:50 +02:00
scrawl
19c428e86c delete fix 2012-05-28 02:04:00 +02:00
scrawl
8f667580bb ogre 1.8 final release compability fixes 2012-05-27 23:12:45 +02:00
scrawl
f6a6684685 when the resolution changes, adjust camera aspect ratio and recreate compositors 2012-05-27 21:39:18 +02:00
scrawl
10cfe0f5bc Issue #295: Class creation dialogs tooltips; plus tons of other improvements 2012-05-27 06:39:10 +02:00
scrawl
f1d3978897 Issue #290: Auto-Close MW-reference related GUI windows 2012-05-27 01:14:33 +02:00
scrawl
a7e6a142f9 blend fog of war into adjacent cells 2012-05-27 00:39:33 +02:00
scrawl
63213b36bf Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind 2012-05-26 23:06:15 +02:00
scrawl
313a8e55b7 - Issue #296: Clicking on HUD elements shows/hides the respective window 
- Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore
 2012-05-26 21:09:21 +02:00
scrawl
3cba884f59 Issue #294: show/hide HUD elements based on allowed windows 2012-05-26 05:46:46 +02:00
scrawl
738e107b52 Merge branch 'master' into next 2012-05-26 05:31:32 +02:00
scrawl
c7010623fb Issue #294: disallowed inventory prevents Talk, Open and Take actions 2012-05-25 18:45:17 +02:00
gugus
51b6d5cae0 Scale *should* work. (no script instruction yet) 2012-05-25 18:23:06 +02:00
Marc Zinnschlag
173820d29b Merge branch 'enable' 2012-05-25 18:19:12 +02:00
scrawl
750259973e potion creating works, most of the values are bogus 2012-05-25 18:00:13 +02:00
Marc Zinnschlag
6fe53aa320 Issue #277: containers in cells were not filled up on cell load when the cell was preloaded before 2012-05-25 17:55:00 +02:00
Marc Zinnschlag
0131c53005 Issue #176: removed enable/disable functions from MWWorld::Class 2012-05-25 17:28:27 +02:00
Marc Zinnschlag
36885b2e40 Issue #176: removed enable/disable functions from Creature, Npc and Light 2012-05-25 17:04:33 +02:00
scrawl
63b3b82657 don't allow more than 4 potion effects 2012-05-25 16:23:49 +02:00
scrawl
1df1b521a4 show the list of potion effects 2012-05-25 16:20:57 +02:00
scrawl
6eb15f7680 auto-select the alchemy tools with highest quality 2012-05-25 15:24:33 +02:00
scrawl
3ba24aee0d Merge branch 'alchemy' into next 2012-05-25 13:37:40 +02:00
scrawl
9b623a79ff Merge branch 'master' into alchemy 2012-05-25 13:14:27 +02:00
scrawl
09c870ad68 first alchemy window layout (not pretty) 2012-05-25 12:58:28 +02:00
scrawl
51b8a76a68 merged by branches together, starting with alchemy window 
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
 2012-05-24 15:57:23 +02:00
scrawl
c2b818373e adjust tooltip skin, now is never transparent 2012-05-24 15:11:45 +02:00
scrawl
a3a22e9096 ingredient tooltip shows possible effects 2012-05-24 14:47:57 +02:00
Chris Robinson
05fd8f0211 Update the actual sounds and music volume when settings change 2012-05-24 05:30:22 -07:00
Marc Zinnschlag
684208dfc9 Issue #176: when deleting objects, don't go through disable to remove actors from the mechanics manager 2012-05-24 13:26:07 +02:00
Marc Zinnschlag
c0ee382c72 Issue #176: made actor deregistration more robust 2012-05-24 13:21:52 +02:00
scrawl
57d834b14b fixed an issue with interactive messagebox 2012-05-24 12:05:43 +02:00
scrawl
6ea7bdb224 vsync & fps buttons, sound volume apply fix 2012-05-24 11:50:48 +02:00
scrawl
cbe89f7e32 copy&paste mistake 2012-05-24 08:56:45 +02:00
scrawl
189b044392 small correction 2012-05-24 04:37:41 +02:00
scrawl
9b94edd561 audio tab with volume sliders 2012-05-24 04:34:53 +02:00
scrawl
cb35f4d208 some unrelated gui cleanup 2012-05-24 03:50:02 +02:00
scrawl
a1907e7b88 cleaning up mwgui/widgets part 1 2012-05-24 03:48:02 +02:00
scrawl
7ebbc099b3 allow stacking gui modes 2012-05-23 12:23:35 +02:00
scrawl
689cf7ce05 ConfirmationDialog 2012-05-23 05:28:25 +02:00
Jason Hooks
0066ef9b54 Some cleanup 2012-05-22 21:40:24 -04:00
scrawl
656a8f1be9 working menu transparency slider 2012-05-23 01:32:36 +02:00
scrawl
313294c522 settings window (hotkey F2) which does nothing. Yay! 2012-05-22 21:40:42 +02:00
scrawl
b25d62a7e2 rename antialiasing mode "MSAA 0" to "none" to avoid confusion. 2012-05-22 20:52:38 +02:00
scrawl
ad46049ee0 got the launcher working with the new settings system. 2012-05-22 20:37:18 +02:00
scrawl
355268dae1 make the launcher build and run again, but it doesn't change settings 2012-05-22 19:36:50 +02:00
scrawl
343bbaf0fd integrated video settings in the settings file, the launcher is now useless 2012-05-22 03:36:03 +02:00
Marc Zinnschlag
7938566004 Merge remote branch 'scrawl/graphics' 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-05-21 11:24:36 +02:00
Marc Zinnschlag
76d733d2b3 Merge remote branch 'scrawl/inventoryGUI' 2012-05-21 11:17:11 +02:00
gugus
dac98b2213 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 2012-05-21 11:02:10 +02:00
scrawl
bda90b77bc oops, forgot something 2012-05-21 10:59:06 +02:00
gugus
ca9224ed7f starting scale function 2012-05-21 10:58:04 +02:00
scrawl
157dd81524 removed script instruction, will be in the settings window later 2012-05-21 10:57:49 +02:00
scrawl
5f6e8224f4 skill progress 2012-05-21 10:48:25 +02:00
Marc Zinnschlag
3e85151c9d Merge remote branch 'scrawl/inventoryGUI' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-05-21 10:13:27 +02:00
scrawl
8f2c8bbea4 Merge branch 'master' into graphics 2012-05-21 09:50:46 +02:00
scrawl
789dfe1c88 fix a bug with water reflection plane height 2012-05-21 09:50:02 +02:00
scrawl
40c52c5d09 max faction rank crashfix 2012-05-21 05:19:20 +02:00
scrawl
1079bb2677 finished tooltips for everything in the stats window, some gui refactoring 2012-05-21 05:14:07 +02:00
scrawl
76d71f86bc fixed a faction case folding issue 2012-05-21 03:10:55 +02:00
scrawl
4a009fc2bb faction tooltip (doesn't handle player having max. rank) 2012-05-21 02:58:06 +02:00
scrawl
8ce4727424 skill tooltips 2012-05-21 01:58:11 +02:00
scrawl
6518eb7794 some cleanup 2012-05-20 22:55:14 +02:00
scrawl
1c7110fbf5 birthsign tooltip 2012-05-20 22:45:30 +02:00
scrawl
8d52ee27dc attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files 2012-05-20 22:06:54 +02:00
Marc Zinnschlag
420cd53be0 Merge branch 'effects' 2012-05-19 17:41:47 +02:00
Marc Zinnschlag
be46f5a59c various fixes 2012-05-19 17:39:24 +02:00
scrawl
876b369ca5 minor tooltip fix 2012-05-19 16:28:10 +02:00
scrawl
92d9e070fb small tweak to getPlayerGold() method 2012-05-19 16:10:13 +02:00
scrawl
2a4c55f1ab use Class::getInventoryStore instead of casting ContainerStore. 2012-05-19 16:04:34 +02:00
scrawl
4fb30544d4 more gui files cleanup 2012-05-19 16:00:00 +02:00
scrawl
7a4de0ed1d changed more gui stuff to use the new tag system 2012-05-19 15:32:32 +02:00
Marc Zinnschlag
0dc412d44c Merge remote branch 'scrawl/refid_case' 2012-05-19 15:07:12 +02:00
Marc Zinnschlag
9f1919a230 Issue #256: added active spell management (completely untested) 2012-05-19 15:01:07 +02:00
scrawl
7ef0ad4e39 show faction & birthsign in the stats window 2012-05-19 14:55:09 +02:00
Marc Zinnschlag
635a89c35c Issue #256: RNG fix 2012-05-19 14:43:02 +02:00
scrawl
24ce88de2a working mygui tag replacement system for GMST strings 2012-05-19 14:19:21 +02:00
scrawl
ee884634b9 fixed item refID handling in the dialogue manager and container script extensions. 2012-05-19 13:19:26 +02:00
Marc Zinnschlag
74ae3605e0 Issue #256: added getTimeStamp function to World 2012-05-19 09:31:45 +02:00
scrawl
9ca579ba63 slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly 2012-05-19 00:36:01 +02:00
scrawl
1006411c02 small fix for mygui log being spammed with errors 2012-05-19 00:06:11 +02:00
scrawl
41466fc5fc gold label fix, and don't allow selling gold 2012-05-18 23:00:31 +02:00
scrawl
656b08f620 removed the workaround for the ContainerStore bug. 2012-05-18 22:32:06 +02:00
scrawl
8a0c859c16 Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI 2012-05-18 22:27:48 +02:00
scrawl
f28f36f262 added sounds to trade window 2012-05-18 22:27:27 +02:00
Marc Zinnschlag
498530fad7 container iterator fix 2012-05-18 22:24:19 +02:00
scrawl
c30b9e4bb9 add/remove gold from the player at the end of the transaction. 2012-05-18 22:21:44 +02:00
scrawl
c004f5d570 adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications 2012-05-18 22:06:25 +02:00
Marc Zinnschlag
a4343bfa18 Issue #256: added TimeStamp class 2012-05-18 22:04:22 +02:00
scrawl
db49e2c046 bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things 2012-05-18 20:53:24 +02:00
scrawl
fb47681fbd fix a bug, some cleanup 2012-05-18 17:58:33 +02:00
scrawl
342a244e31 NPC now doesn't buy items of types that he shouldn't accept. 2012-05-18 17:36:20 +02:00
scrawl
50a8eb05d9 transfering items between player and merchant works and shows a red frame for bought/sold items. 2012-05-18 17:27:55 +02:00
scrawl
e2400ca7b2 only show items in the trade window that the NPC actually trades (services enum) 2012-05-18 15:51:33 +02:00
Marc Zinnschlag
124ea77612 Issue #256: consider equipped items when calculating magic effects 2012-05-18 15:48:55 +02:00
Marc Zinnschlag
372efaafd7 Issue #256: changed implementation of MagicEffects::operator+= 2012-05-18 15:27:41 +02:00
Marc Zinnschlag
40c58c1bb7 Issue #256: fixed a capitalisation mistake 2012-05-18 15:26:08 +02:00
Marc Zinnschlag
5236bcb557 Issue #256: added operator+= for MagicEffects 2012-05-18 15:12:11 +02:00
Marc Zinnschlag
79055e281d Issue #256: Force update after building the player character 2012-05-18 13:54:07 +02:00
Marc Zinnschlag
e1997b7f04 Issue #256: added MagicEffects::add overload for EffectLists 2012-05-18 13:17:35 +02:00
scrawl
adf0550292 fixed a wrong label. 2012-05-18 00:14:31 +02:00
scrawl
52e5e14654 use GMST sDefaultCellname for the map window when cell has no region or name. 2012-05-17 23:42:09 +02:00
scrawl
3cacc8feec add re-stocking items to containers (though restocking isn't implemented) 2012-05-17 23:22:41 +02:00
scrawl
9a3fd96a0c display the merchant gold. 2012-05-17 22:24:47 +02:00
scrawl
41efea4c1d in the trade window, don't show items that the merchant has equipped. 2012-05-17 21:56:16 +02:00
scrawl
6ae642aa06 complete trade window layout 2012-05-17 21:15:48 +02:00
scrawl
c9aa0ca1f4 don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region 2012-05-17 19:54:09 +02:00
scrawl
4213b4370f trade window shows up and shows the vendor's inventory items. 2012-05-17 19:53:04 +02:00
scrawl
1f85475536 Merge branch 'master' into inventoryGUI 2012-05-17 19:03:41 +02:00
scrawl
375c198ebd WeatherManager: fix for cells that have no region. 2012-05-17 18:21:05 +02:00
scrawl
0afda15ce9 fix for cells that have no region. 2012-05-17 18:14:33 +02:00
scrawl
ae77e7b0d8 don't try to retrieve land data from non-predefined cells. 2012-05-17 18:11:34 +02:00
scrawl
5da4da820e beginnings of trade window layout. 2012-05-17 17:15:44 +02:00
Marc Zinnschlag
6b74fec8ed don't do a half finished cell change, when trying to switch to an interior cell that does not exist 2012-05-17 17:13:41 +02:00
scrawl
0dc5e5919b show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works. 2012-05-17 14:54:03 +02:00
scrawl
66abfd17ab check the container's "Organic" flag before trying to place items inside. 2012-05-17 14:13:35 +02:00
scrawl
0c1d06d9f7 added some trade window stuff, which does nothing yet. 2012-05-17 13:36:25 +02:00
Marc Zinnschlag
e56ff9283d Issue #256: moved magic effects update from MechanicsManager to Actors 2012-05-17 13:21:49 +02:00
Marc Zinnschlag
1fddbf9a40 Issue #256: moved dynamic stats update from MechanicsManager to Actors 2012-05-17 13:15:31 +02:00
scrawl
630241c8e2 load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum. 2012-05-17 13:12:38 +02:00
scrawl
c5185cf2e4 drop item on avatar from external container bugfix 2012-05-17 12:09:53 +02:00
scrawl
fca9f1fc5f gold dropping works without crash, but the code needs clean up. 2012-05-16 22:56:54 +02:00
scrawl
178ad876d7 fix for objects other than Miscellaneous. 2012-05-16 22:17:13 +02:00
scrawl
5875ce5128 select the correct gold base object (still crashing) 2012-05-16 22:13:56 +02:00
scrawl
f73d3ad33f fix to the "drop object on ground" feature. still crashes for gold. 2012-05-16 21:27:02 +02:00
scrawl
6d34e61dbd don't stack gold if it has a script (not used in MW, but some mods might) 2012-05-16 19:18:50 +02:00
scrawl
4b5d6ce311 allow stacking gold 2012-05-16 17:22:25 +02:00
scrawl
0f1e09d2c1 make Class::use method return an equip action for equippable items, add sound for equipping 2012-05-16 16:08:55 +02:00
scrawl
9c4243782e sorting items 2012-05-16 15:17:55 +02:00
scrawl
9a01e18b29 fix some MessageBox code that was using deleted pointers sometimes 2012-05-16 15:00:20 +02:00
scrawl
398a7dc65c crash fix (hopefully) 2012-05-16 14:32:48 +02:00
scrawl
6a0cb32b7e removed unnecessary code 2012-05-16 14:30:02 +02:00
scrawl
c5d685c780 added an assert 2012-05-16 14:28:57 +02:00
scrawl
f8c20ef77f don't allow putting items into a container if the weight is exceeded. 2012-05-16 00:20:24 +02:00
scrawl
2fa7ce0c19 equipping works also when the item wasn't in player inventory before. 2012-05-16 00:02:05 +02:00
scrawl
477f1b42ab fixed another item dropping bug 2012-05-15 23:28:04 +02:00
scrawl
0f811edb47 fixed a bug with dropping items on the ground 2012-05-15 22:54:28 +02:00
scrawl
5a43fe3e5f remove debug prints 2012-05-15 22:48:14 +02:00
scrawl
3f4ce32727 implemented player encumbrance bar 2012-05-15 22:45:46 +02:00
scrawl
e9ea1fba4e fixed typo getCapacity method 2012-05-15 22:31:52 +02:00
scrawl
d3a53ae0b8 removed the _freeSlot method which is now unneeded 2012-05-15 22:01:09 +02:00
scrawl
0063387979 Merge branch 'master' into inventoryGUI 2012-05-15 21:48:05 +02:00
scrawl
175623bf22 change the drag&drop to not use a seperate containerstore 2012-05-15 21:44:57 +02:00
Marc Zinnschlag
fdfddc8be7 some todo comment cleanup 2012-05-15 21:34:32 +02:00
Marc Zinnschlag
7e00fea18b added getEncumbrance function 2012-05-15 21:34:00 +02:00
Marc Zinnschlag
c6493fb133 added getCapacity function 2012-05-15 21:17:00 +02:00
scrawl
ca4fa21d64 removed the attempt to unify activation and use scripts which was incorrect 2012-05-15 20:51:19 +02:00
scrawl
71de10cb7e equipping items works, but only if you have more than one of the item that you're equipping 2012-05-15 20:33:34 +02:00
scrawl
765881a61d equipping items in the inventorywindow (there is no visual indication yet) 2012-05-15 18:20:32 +02:00
scrawl
ab6336b745 using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now) 2012-05-15 18:05:53 +02:00
scrawl
b18ee198b4 use a raycast to determine where to place object, if distance is too far 
drop it on the ground
 2012-05-15 16:47:23 +02:00
scrawl
7fbee0d488 use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift 2012-05-15 13:00:26 +02:00
scrawl
24a0fecd37 implemented item count selection dialog 2012-05-15 12:51:51 +02:00
scrawl
320cc7d020 implemented ctrl and shift-keys for item drag&drop (take all, take 1) 2012-05-15 11:02:50 +02:00
scrawl
933a40de14 better floating object label positioning. 2012-05-14 21:37:43 +02:00
scrawl
d3e162ec83 dropping items works 2012-05-14 17:41:17 +02:00
scrawl
6c9f75b322 some unfinished work for dropping objects into the gameworld 2012-05-13 18:35:56 +02:00
scrawl
967fb13fca remove the old inventory code, split HUD, map and mainmenu into seperate implementation files 2012-05-13 18:14:03 +02:00
scrawl
f300a5621c Merge branch 'master' into inventoryGUI 2012-05-13 17:45:57 +02:00
Marc Zinnschlag
2bf12a4839 Merge remote branch 'scrawl/itemstacking' 2012-05-13 17:22:18 +02:00
scrawl
82b9f835b1 make sure iterator is not end() before trying to get the equipped item 2012-05-13 16:54:18 +02:00
scrawl
a47d29c184 fix the inventory window overlapping with over windows in default layout 2012-05-13 16:41:00 +02:00
scrawl
8c458fc5ce Merge branch 'master' into gui 2012-05-13 16:20:35 +02:00
scrawl
471f6467ec Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-05-13 16:18:22 +02:00
scrawl
e9a1ef4269 Merge branch 'master' into inventoryGUI 2012-05-13 16:16:54 +02:00
Marc Zinnschlag
73d19f9185 Merge remote branch 'scrawl/itemstacking' 2012-05-13 16:06:30 +02:00
scrawl
d341d2113c fixed some issues 2012-05-13 14:58:38 +02:00
scrawl
ee7e482cba implemented un-stacking 2012-05-13 11:52:17 +02:00
scrawl
3a93df8db4 dynamic inventory layout like morrowind 2012-05-13 11:25:35 +02:00
scrawl
d266b4fe87 hide the cursor during drag&drop and don't allow hotkeys that change guimode 2012-05-13 10:18:17 +02:00
scrawl
f31853d30b mouse wheel works when mouse is over an item 2012-05-13 01:27:17 +02:00
scrawl
16522ddc59 InventoryStore re-stacking unequipped items 2012-05-12 23:09:03 +02:00
scrawl
78b06d0ebf inventory window pinning 2012-05-12 22:44:12 +02:00
scrawl
822e5fbe1e add indication which filter is selected 2012-05-12 22:00:15 +02:00
scrawl
902309a554 working filters 2012-05-12 21:44:33 +02:00
scrawl
0114bf948c revised filters 2012-05-12 21:28:04 +02:00
scrawl
8e6c943400 "take all"-button sound (first item) 2012-05-12 20:39:21 +02:00
scrawl
fd18c95c5f implemented filters (no gui yet) 2012-05-12 20:35:50 +02:00
scrawl
24e54a81bd don't show icons in the inventory tooltips, exactly like MW does 2012-05-12 20:28:12 +02:00
scrawl
e6e50f4ad4 fix items getting cut off 2012-05-12 20:14:19 +02:00
scrawl
f3c88adc0b items can now also be dropped on another item (and will be placed in 
container)
 2012-05-12 20:06:44 +02:00
scrawl
54c23c7422 show the background texture for enchanted items in inventory/container 2012-05-12 19:48:01 +02:00
scrawl
19e8e84f9a more cleanup, removed the redundant ItemWidget and use widget userdata 2012-05-12 18:50:19 +02:00
scrawl
6ee4e8fb5a Merge branch 'itemstacking' into inventoryGUI 
Conflicts:
	apps/openmw/mwclass/armor.hpp
	apps/openmw/mwclass/clothing.hpp
	apps/openmw/mwclass/weapon.hpp
	apps/openmw/mwworld/class.hpp
 2012-05-12 18:32:06 +02:00
scrawl
e714b77df8 small fix 2012-05-12 18:28:14 +02:00
scrawl
1abf70692c added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug 2012-05-12 18:24:47 +02:00
scrawl
9f2595183b type 2012-05-12 16:30:27 +02:00
scrawl
5b0251b09f item stacking 2012-05-12 16:17:03 +02:00
scrawl
a31a9e51d3 add the sound for item drag&drop 2012-05-12 14:29:49 +02:00
scrawl
722af60337 implemented the "Take all" button 2012-05-12 14:01:59 +02:00
scrawl
296dbce298 Merge branch 'master' into graphics 2012-05-12 13:47:56 +02:00
scrawl
d64fccec6f display the item count in the tooltip 2012-05-12 13:46:03 +02:00
scrawl
7723044df0 added the item tooltips 2012-05-12 13:30:34 +02:00
scrawl
ed6ff0a94a cleanup 3 2012-05-12 13:12:37 +02:00
scrawl
3a6fde5039 cleanup 2 2012-05-11 16:58:07 +02:00
scrawl
a1b86acc38 Merge branch 'master' into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	files/mygui/core.xml
 2012-05-11 16:41:27 +02:00
scrawl
007a202deb cleanup 1 2012-05-11 16:34:36 +02:00
scrawl
2d3cc014c9 Merge branch 'inventoryGUI' of https://github.com/gugus/openmw into inventoryGUI 
Conflicts:
	apps/openmw/mwgui/container.cpp
	apps/openmw/mwgui/container.hpp
 2012-05-11 16:27:24 +02:00
gugus
cfb7aa4343 Drag and drop works. There is a bug with item count when doing d&d. Clean-up time :p 2012-05-11 12:50:30 +02:00
gugus
9dd65dce30 Finished merging. 2012-05-11 11:52:07 +02:00
gugus
8e8f80807e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/armor.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/clothing.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwclass/lockpick.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/probe.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwclass/weapon.cpp
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	apps/openmw/mwworld/class.cpp
 2012-05-11 10:40:40 +02:00
Chris Robinson
bcd371d37b Merge remote branch 'zini/master' into sound 2012-05-11 01:15:37 -07:00
scrawl
83e434e2e9 small fix 2012-05-11 09:35:18 +02:00
scrawl
1f1edea6af make it possible to use scroll wheel when mouse is over a skill in the stats window; set the correct track size for the scrollbar 2012-05-11 08:45:03 +02:00
scrawl
65ccfba191 resize both the left and the right pane of the stats window 2012-05-11 08:15:22 +02:00
scrawl
c4aae96d94 implemented "goodbye" script function that force-cancels dialogue 2012-05-11 07:18:41 +02:00
Marc Zinnschlag
37095b62c6 removed another include 2012-05-10 12:51:40 +02:00
Marc Zinnschlag
e906614170 Merge remote branch 'scrawl/gui' 2012-05-10 12:46:11 +02:00
scrawl
3d9e89c837 removed unnecessary include 2012-05-10 12:44:01 +02:00
Marc Zinnschlag
bee03b5180 Merge remote branch 'scrawl/gui' 2012-05-10 12:08:49 +02:00
scrawl
4ce50c503b a few tweaks 2012-05-10 11:29:28 +02:00
scrawl
de995e3a69 adjust topic list on window resize 2012-05-10 11:19:22 +02:00
scrawl
8a9e05a96b display text on the book window 2012-05-10 11:03:27 +02:00
scrawl
d69501b061 change daedric font to .zip resource 2012-05-09 02:16:10 +02:00
scrawl
e5e8663bb4 parse <div> <font> and <p> 2012-05-09 02:11:44 +02:00
scrawl
8e7ab09a25 scroll window image tags working 2012-05-09 01:34:32 +02:00
gugus
e9134717d6 the GUI part of drag and drop is working 2012-05-08 12:59:47 +02:00
scrawl
cd351ba3af simple scroll text parsing (tags are ignored until now) 2012-05-08 00:39:52 +02:00
scrawl
2b584300d6 throw an exception when no default settings file is found, which indicates a packaging error 2012-05-07 23:16:29 +02:00
scrawl
3c69d26571 journal close sound 2012-05-07 19:42:04 +02:00
gugus
60ad6f01d4 another step towards drand and drop. 2012-05-06 11:04:07 +02:00
scrawl
d91129ed49 Merge branch 'master' into gui 2012-05-04 23:54:37 +02:00
scrawl
499dd26398 dialogue window topic list word-wrapping 2012-05-04 23:53:50 +02:00
Marc Zinnschlag
c227e4127c Merge remote branch 'scrawl/tooltips' 2012-05-04 22:44:07 +02:00
scrawl
12453d4e9d Merge branch 'master' into gui 2012-05-04 22:20:52 +02:00
scrawl
a4d6d1baff added a utility for creating texture atlas at runtime 2012-05-04 18:09:45 +02:00
Marc Zinnschlag
e26f39e563 fixed exception handling during subsystem setup 2012-05-04 17:20:57 +02:00
scrawl
4ddd24fdfc Merge branch 'master' into tooltips 2012-05-04 07:38:27 +02:00
scrawl
ee883446b5 Merge branch 'master' into graphics 2012-05-04 07:38:11 +02:00
scrawl
ad5753ba91 Merge branch 'master' of https://github.com/zinnschlag/openmw into gui 2012-05-04 07:34:38 +02:00
Chris Robinson
3cace264ed Merge remote branch 'zini/master' into sound 2012-05-03 16:27:00 -07:00
Marc Zinnschlag
1149e282b8 Merge remote branch 'scrawl/physicsaedra2' 2012-05-03 14:59:36 +02:00
Marc Zinnschlag
e9f1c266bf Merge remote branch 'scrawl/creaturedialogue' 2012-05-03 09:15:56 +02:00
scrawl
b653f047ac removed a file that wasn't supposed to be there 2012-05-03 09:15:56 +02:00
scrawl
5028a83d11 fix stats window layout resizing 2012-05-03 07:03:04 +02:00
scrawl
dc378fc6cf allow talking with creatures 2012-05-03 06:07:41 +02:00
scrawl
02dad448fe make the wireframe mode not affect sky 2012-05-03 05:38:43 +02:00
scrawl
9fc1138a87 opening, closing and taking books/scrolls works 2012-05-03 05:26:05 +02:00
scrawl
0e6b82284f book & scroll windows 2012-05-03 03:33:33 +02:00
scrawl
c0e12d0e56 class dialog fix 2012-05-03 01:11:49 +02:00
scrawl
387792bb57 Merge branch 'master' of https://github.com/zinnschlag/openmw into physicsaedra2 2012-05-03 00:42:24 +02:00
Chris Robinson
1627206d56 Remove an unused method 
Best not to design something we don't yet know what's needed from it.
 2012-05-02 13:59:03 -07:00
Chris Robinson
144d52cf49 Add voices to the chargen class questions 2012-05-01 20:30:31 -07:00
scrawl
dd8c66b479 notification when screenshot was taken 2012-05-01 21:54:30 +02:00
scrawl
e4b057be30 translated journal notification 2012-05-01 21:49:00 +02:00
scrawl
7f15385dc5 unrelated cleanup 2012-05-01 20:58:09 +02:00
scrawl
6acb777c5a minimum framerate fix 2012-05-01 20:51:32 +02:00
Chris Robinson
b3caf82714 Avoid using vector<>::data(), which requires C++11 2012-05-01 10:12:45 -07:00
scrawl
86b6184f43 pMove in a seperate loop with fixed timestep to prevent frame-dependent movement 2012-04-30 23:55:22 +02:00
scrawl
bd132074af some formatting tweaks 2012-04-30 22:37:23 +02:00
scrawl
48e3c43823 added the bloodmoon/tribunal spells 2012-04-30 21:36:45 +02:00
scrawl
9e6531a6c6 fix for dark corners bug on some cards 2012-04-30 21:22:26 +02:00
scrawl
6d21fe3115 fixed mygui leaking some stuff resulting in lower fps after looking at tooltips and low-quality text 2012-04-30 21:07:25 +02:00
scrawl
4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-30 18:46:51 +02:00
scrawl
aaa81397ed Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-30 18:24:05 +02:00
scrawl
cc365c5bcb Merge branch 'master' into tooltips 2012-04-30 18:23:27 +02:00
scrawl
fc06dc72c9 small fix 2012-04-30 18:20:44 +02:00
scrawl
ea275a8aa8 extended the list of spells with no magnitude / no duration 2012-04-30 18:11:34 +02:00
gugus
5f8c08b18b some work for dropping objects. 2012-04-30 13:01:18 +02:00
Marc Zinnschlag
53e77d4196 Merge remote branch 'scrawl/tooltips' into next 2012-04-30 10:21:21 +02:00
scrawl
2f0a69160c small fix 2012-04-30 02:10:55 +02:00
scrawl
22f524f8d5 potion effects in tooltip 2012-04-30 01:53:22 +02:00
scrawl
b82c39c8be renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be 
reused for potion effects
 2012-04-30 01:08:10 +02:00
scrawl
f733382f74 tooltip now contains info about item enchantment 2012-04-30 00:57:41 +02:00
scrawl
eca18f3e1d dialogue topic and choice sorting independent of case 2012-04-29 18:13:03 +02:00
scrawl
50d79a8815 Merge branch 'next' into tooltips 2012-04-29 17:30:34 +02:00
Alexander "Ace" Olofsson
b1af18e98d Merged next 2012-04-29 09:28:07 +02:00
Alexander "Ace" Olofsson
0c9dfcc017 Some changes 2012-04-29 09:26:03 +02:00
scrawl
9cf6f27f96 small fix 2012-04-29 03:38:00 +02:00
scrawl
11ebae3be2 toggleCompositors command useful for debugging 2012-04-29 03:33:10 +02:00
scrawl
af3ccd85e3 determine shield weight (tested with some light/medium/heavy shields) 2012-04-28 21:23:24 +02:00
Marc Zinnschlag
d1d21c8a0e compile fix 2012-04-28 21:21:40 +02:00
scrawl
5d4d35a02c Merge branch 'master' into graphics 2012-04-28 20:43:53 +02:00
scrawl
4ce83badc9 flickering lights 2012-04-28 20:42:53 +02:00
gugus
5603cb312c Objects can now be selected and follow mouse movements. 2012-04-27 20:54:39 +02:00
gugus
a6419c3596 Clicking on an item is now detected. 
Trying to have items follow the mouse position, but it doesn't work yet.
 2012-04-26 19:35:45 +02:00
Marc Zinnschlag
d5e52e46ea removing even more cout spam (thanks to scrawl for finding this one) 2012-04-24 09:19:41 +02:00
scrawl
1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
 2012-04-24 02:02:03 +02:00
scrawl
e443455612 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2012-04-24 00:54:35 +02:00
Marc Zinnschlag
f4428097f9 removing more cout spam 2012-04-23 15:37:38 +02:00
Marc Zinnschlag
7ac9523e0c Merge branch 'master' into next 2012-04-23 15:32:02 +02:00
Marc Zinnschlag
9f1199ee7e removing a using directive from a header file 2012-04-23 15:29:15 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
Marc Zinnschlag
7102a825c2 Issue 255: moved global scripts into script manager (simplifying the environment class) 2012-04-23 11:15:47 +02:00
Marc Zinnschlag
2bfd90f3f9 Issue #255: added new environment class (not in use yet) 2012-04-23 10:57:16 +02:00
scrawl
1b02b503a2 gcc compile fix 2012-04-22 21:06:08 +02:00
scrawl
2c89306306 Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 2012-04-22 00:33:37 +02:00
Jason Hooks
8ebae0b706 Solid trace 2012-04-21 16:57:46 -04:00
Jason Hooks
16855291a7 Implementing snapping 2012-04-21 16:21:30 -04:00
gugus
25432d97d2 trying to get selected item. Doesn't work. 2012-04-21 20:35:45 +02:00
gugus
d4e9b62436 oups forgot to modify CMake 2012-04-21 11:11:40 +02:00
gugus
93ba773d2e Merge branch 'inventoryGUI' of https://github.com/pchan3/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/mwgui/container.cpp
 2012-04-21 11:08:10 +02:00
gugus
33654535c1 The inventory window now display the inventory of the player 2012-04-21 11:05:30 +02:00
gugus
1e8d894e1c Starting inventory window 2012-04-21 10:51:01 +02:00
Marc Zinnschlag
cc86998281 removing some cout spam 2012-04-21 10:12:59 +02:00
scrawl
7400b7f313 fix underwater effect staying active when teleporting from underwater to a cell that doesn't have water 2012-04-19 23:25:58 +02:00
scrawl
c6da3872b4 light improvements 2012-04-19 20:59:57 +02:00
Marc Zinnschlag
5f09f2bfc6 Merge remote branch 'scrawl/topic_case' into next 2012-04-19 10:36:34 +02:00
scrawl
934caf7a2b removed --report-focus which is now useless 2012-04-19 01:16:41 +02:00
scrawl
fb0e649191 minor fix 2012-04-19 01:10:55 +02:00
scrawl
aa4a1b675f fixed the sky reflection issue 2012-04-19 01:08:26 +02:00
scrawl
4889902b98 magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects 2012-04-18 21:18:53 +02:00
scrawl
4949576984 disable some player controls in gui mode 2012-04-18 19:03:26 +02:00
scrawl
c7381d4491 adding widget MWEnchantment 2012-04-18 18:09:30 +02:00
scrawl
d568b27b92 spell widget i18n improvements (used e.g. in birth menu) 2012-04-18 16:53:56 +02:00
pchan3
215d4e1739 Made adjustments to keep container window within the viewscreen. 2012-04-18 23:09:13 +10:00
pchan3
f902c8fa6f Fixes on Namespace issue & more. 2012-04-18 22:35:35 +10:00
scrawl
75b336baea Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	apps/openmw/mwworld/player.cpp
	libs/openengine/bullet/physic.cpp
 2012-04-18 13:43:15 +02:00
Jason Hooks
4d07ae7fe0 Swimming working 2012-04-18 00:13:38 -04:00
Jason Hooks
5f9056c45d Better no clip 2012-04-17 20:31:36 -04:00
scrawl
046ef39c4a use camera-relative rendering to prevent precision artifacts when moving far from (0,0,0) 2012-04-18 01:10:00 +02:00
scrawl
51a76eda92 Merge branch 'master' into graphics 2012-04-18 01:09:55 +02:00
Jason Hooks
1ce759af06 Merging in master 2012-04-17 18:12:05 -04:00
scrawl
8231cab599 correct case for dialogue topics 2012-04-17 23:47:50 +02:00
scrawl
2e57cf5730 fixed the tooltip for doors leading to exteriors, fixed map window cell name 2012-04-17 18:47:51 +02:00
scrawl
94993b515c clean up and tooltip padding 2012-04-17 16:49:28 +02:00
scrawl
8eb0636344 restored gui-mode tooltips 2012-04-17 16:00:13 +02:00
scrawl
1de1b3e40e Merge branch 'master' into tooltips 2012-04-17 15:57:08 +02:00
scrawl
c2fdacc84f show the creature name for soul gems (if any) 2012-04-17 15:51:02 +02:00
scrawl
c044fadcc3 show weapon type & damage in the tooltip 2012-04-17 15:31:16 +02:00
scrawl
a11c4da16c vertex colour tweak 2012-04-17 14:22:03 +02:00
Marc Zinnschlag
14ddcc1204 Merge remote branch 'jhooks/clothingarmor' 2012-04-17 00:26:39 +02:00
Jason Hooks
950378ff65 Khajiit male foot fix 2012-04-16 17:25:55 -04:00
scrawl
cdd4d83d9e moved the tooltip info to the appropriate MWWorld::Class classes 2012-04-16 22:58:16 +02:00
scrawl
13b67faf2f adding more safety checks 2012-04-16 20:39:41 +02:00
scrawl
c4825cdb43 fixed gold pickup sound for international MW versions, fix npc tooltip 2012-04-16 20:20:18 +02:00
scrawl
282f37b1b7 fix compilation 2012-04-16 19:34:46 +02:00
scrawl
53b48196f9 add interface for tooltips to MWWorld::Class 2012-04-16 19:30:52 +02:00
scrawl
cfa37b0e77 fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text 2012-04-16 19:14:05 +02:00
scrawl
424a90aa92 back & ok button caption 2012-04-16 17:46:54 +02:00
scrawl
14377ba789 window caption fix 2012-04-16 17:30:57 +02:00
scrawl
b3dc1931a9 general GUI refactoring, part 1 2012-04-16 15:48:01 +02:00
scrawl
f5ab127a39 toggleFullHelp 2012-04-16 15:00:44 +02:00
Marc Zinnschlag
7483c78b4a Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-16 14:06:27 +02:00
scrawl
d1e298c2e1 Merge branch 'master' into tooltips 2012-04-16 13:15:50 +02:00
Jason Hooks
0c9c253778 Fix for some types of boots 2012-04-15 22:49:17 -04:00
scrawl
194ecf274c attribute tooltips 2012-04-16 00:16:35 +02:00
scrawl
0a223196e8 Merge branch 'master' into tooltips 2012-04-15 22:23:16 +02:00
scrawl
268b7cd6fc replaced typename checks 2012-04-15 22:05:33 +02:00
Marc Zinnschlag
afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-15 22:06:05 +02:00
scrawl
5d9648d645 fix const reference 2012-04-15 22:00:28 +02:00
Jason Hooks
65c9cf565c Skirt and robe part blanking 2012-04-15 15:16:48 -04:00
scrawl
688e79e6d1 Merge branch 'master' into tooltips 2012-04-15 21:14:39 +02:00
scrawl
705d4c6d54 mostly complete 2012-04-15 21:14:14 +02:00
gugus
489261a6ae Close button works. 2012-04-15 21:02:54 +02:00
gugus
58d05fa503 more clean-up. Container window shows up! But there is no working close button. 2012-04-15 20:56:45 +02:00
Jason Hooks
bc8bb9c57e Reserve; skirts 2012-04-15 14:22:55 -04:00
gugus
78c8a22cd1 more clean up. The container GUI shows up now 2012-04-15 19:32:41 +02:00
gugus
a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-04-15 17:54:13 +02:00
gugus
b309d245c5 cleaning up hircine work 2012-04-15 17:52:39 +02:00
scrawl
ab4e03f05f Merge branch 'master' into tooltips 2012-04-15 17:11:14 +02:00
scrawl
d37bc9cba8 basic mouse-over info for in-game objects 2012-04-15 17:10:08 +02:00
Marc Zinnschlag
b5d12d0723 fixed ForceGreeting 2012-04-15 17:08:22 +02:00
Marc Zinnschlag
585ba41557 Merge remote branch 'gus/Factions2' 2012-04-15 17:05:38 +02:00
gugus
c24a85848f forceGreeting script instruction 2012-04-15 15:56:36 +02:00
gugus
f68248e0d0 corrected a bug in getPCRank 2012-04-15 14:20:08 +02:00
gugus
45a5877b23 implement getPCRank. Does not work yet. 2012-04-15 12:05:46 +02:00
Jason Hooks
85ac658cac Adding tons of skin body parts 2012-04-14 22:52:05 -04:00
Jason Hooks
5e1ac0cca1 Gloves, Gauntlets, Boots, Shoes 2012-04-14 20:32:46 -04:00
Jason Hooks
940a90e3ba Pauldrons 2012-04-14 19:21:14 -04:00
Jason Hooks
e5becb1f50 Group add function;Greaves 2012-04-14 18:58:52 -04:00
Jason Hooks
5d4ad4cd81 Shirts and Cuirasses 2012-04-14 16:44:46 -04:00
scrawl
cac662ca98 basic tooltips 2012-04-14 17:47:44 +02:00
scrawl
4b0099fb5b npc visibility flags fix 2012-04-14 16:10:47 +02:00
scrawl
fa5a1432c9 map lighting tweak, default settings tweak 2012-04-14 15:58:58 +02:00
scrawl
e05faa184f Merge branch 'terrainshader' into graphics 2012-04-14 15:10:35 +02:00
scrawl
e04d127f30 terrain shader fixes 2012-04-14 15:10:26 +02:00
Jason Hooks
7551926afd Adding helmets 2012-04-13 23:25:15 -04:00
Alexander "Ace" Olofsson
a74aeace73 Can now save strings with proper encoding, byte-perfect clones up until land records 2012-04-14 00:14:04 +02:00
scrawl
d861b8e45e Merge branch 'master' into graphics 2012-04-13 16:16:09 +02:00
Alexander "Ace" Olofsson
0c6862e3e6 Undefining some windows defines 2012-04-13 15:09:38 +02:00
Marc Zinnschlag
3442ef17a8 fixed ModDisposition 2012-04-13 14:54:13 +02:00
Marc Zinnschlag
73df51695c Merge remote branch 'gus/Factions2' 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/statsextensions.cpp
 2012-04-13 14:49:37 +02:00
scrawl
f2fae770d4 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwworld/player.cpp
 2012-04-13 13:55:13 +02:00
scrawl
a33ae35e94 some fixes 2012-04-13 13:28:31 +02:00
Marc Zinnschlag
e16daeed23 added GetSpell script function 2012-04-13 13:17:57 +02:00
scrawl
e3486931ae F10 hotkey toggle FPS 2012-04-13 13:17:50 +02:00
Marc Zinnschlag
37f478b69a Merge branch 'spells' 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwmechanics/npcstats.hpp
 2012-04-13 11:32:33 +02:00
Marc Zinnschlag
b099e1baf5 added addspell and removespell script instructions 2012-04-13 11:12:53 +02:00
Marc Zinnschlag
52c7ee3b6a moved selected spell from NpcStats to Spells 2012-04-13 10:49:45 +02:00
Marc Zinnschlag
1e56acc3de Merge remote branch 'scrawl/graphics' 2012-04-13 10:12:07 +02:00
Jason Hooks
e869433b07 Add or replace individual parts 2012-04-12 22:16:02 -04:00
Jason Hooks
1f566fc93a Another remove function 2012-04-12 20:59:30 -04:00
Jason Hooks
a885f3e942 Remove part function 2012-04-12 20:40:11 -04:00
scrawl
fb78e853d4 removed 2 unneeded lines 2012-04-12 19:18:38 +02:00
Marc Zinnschlag
a4fb71a0fc Merge remote branch 'scrawl/graphics' 2012-04-12 18:46:02 +02:00
scrawl
e2ec889d10 fixed a warning "implicit cast to float3" 2012-04-12 17:40:26 +02:00
gugus
7edc5c733c corrected a bug about rank. 2012-04-12 17:29:05 +02:00
gugus
03d6d1fb82 NPC rank is correctly loaded now. Also corrected a potential bug (i think). 2012-04-12 17:08:57 +02:00
scrawl
a96ad7fb82 restored toggleWater 2012-04-12 16:46:56 +02:00
scrawl
800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 2012-04-12 14:26:21 +02:00
Alexander "Ace" Olofsson
f16a9ce5ed Working on making output identical to input. 2012-04-12 14:00:58 +02:00
Jason Hooks
7fce57f335 Getting started with a new branch 2012-04-11 20:16:22 -04:00
scrawl
a727bcd4a4 override nif transparency settings (part 1) 2012-04-11 20:13:15 +02:00
Marc Zinnschlag
26a529111c removed old known spell list from NpcStats 2012-04-11 19:45:56 +02:00
Marc Zinnschlag
77065390d7 simplifying Spells class 2012-04-11 19:40:42 +02:00
Marc Zinnschlag
e04ccfced0 replaced old abilities container in CreatureStats with a Spells object 2012-04-11 19:03:36 +02:00
Marc Zinnschlag
750d79eaf0 added spell container class 2012-04-11 19:03:06 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
gugus
0553227ee1 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/player.cpp
	apps/openmw/mwworld/player.hpp
 2012-04-09 14:43:35 +02:00
gugus
dd9a88cee2 clean up 2012-04-09 14:32:07 +02:00
gugus
6ca212b9e9 script instruction: PCJoinFaction 2012-04-09 14:30:42 +02:00
gugus
aa8418634f add PCLowerRank script instruction 2012-04-09 14:26:53 +02:00
gugus
45d11eaf14 fixed a bug in the dialogue manager. 2012-04-09 14:23:12 +02:00
scrawl
75dd651205 Merge branch 'terraincollision' into physicsterrain 
Conflicts:
	apps/openmw/mwworld/physicssystem.cpp
 2012-04-09 13:56:09 +02:00
gugus
e5b1e27fa6 pcRaiseRank works. Player can now join factions. 2012-04-09 13:24:19 +02:00
Marc Zinnschlag
62908c9ef5 Merge remote branch 'scrawl/settingsfixes' 2012-04-09 10:47:13 +02:00
Jason Hooks
c0f52fef48 one more change 2012-04-09 00:51:10 -04:00
Jason Hooks
80afcb2eac small change 2012-04-08 20:44:44 -04:00
Jason Hooks
74deb5588d Post merge 2012-04-08 20:41:49 -04:00
scrawl
1df7be7fee - fixes to texture filtering setting 
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
 2012-04-09 00:10:42 +02:00
Marc Zinnschlag
0aecb0ed5c cmake fix 2012-04-08 23:44:40 +02:00
Marc Zinnschlag
5e9d209b21 Merge remote branch 'minty3/testbranch' 2012-04-08 23:40:48 +02:00
Jason Hooks
6bdfdf379b Trying iterators 2012-04-08 17:27:56 -04:00
Marc Zinnschlag
e17a09e710 Merge remote branch 'scrawl/water' 2012-04-08 23:21:46 +02:00
Aleksandar Jovanov
db928dcb2f put an opening bracket on a new line 2012-04-08 19:44:11 +02:00
Aleksandar Jovanov
9893e4b384 made player respect NpcStats for mDrawState 2012-04-08 19:43:04 +02:00
Marc Zinnschlag
9e3299cae8 Merge remote branch 'scrawl/water' 2012-04-08 18:40:19 +02:00
Alexander "Ace" Olofsson
290d09de64 Switching creature and npc to using the same id storage as the rest of the records 2012-04-08 18:32:40 +02:00
Alexander "Ace" Olofsson
00b8ce6b35 Fix linker error in windows. 2012-04-08 18:22:41 +02:00
Alexander "Ace" Olofsson
1d48781567 Forgot about the cell refs, oops 2012-04-08 17:52:55 +02:00
scrawl
a5c6207fe7 add setting to disable the underwater effect 2012-04-08 17:44:00 +02:00
Alexander "Ace" Olofsson
23f81e63dd Nicer help text and error for not selecting a valid mode. 2012-04-08 17:14:56 +02:00
scrawl
9e1a9e5758 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	libs/openengine/bullet/physic.cpp
 2012-04-08 17:08:36 +02:00
Alexander "Ace" Olofsson
fc8c75ab89 Esmtool can now clone an esm file in such a way that it can read it back again afterwards. 2012-04-08 17:04:52 +02:00
scrawl
b1c84f28a9 Merge branch 'master' into water 
Conflicts:
	files/settings-default.cfg
 2012-04-08 16:11:16 +02:00
scrawl
113bbfa253 removed the now unneccesary SG for transparent objects 2012-04-08 14:37:36 +02:00
Aleksandar Jovanov
23cc1d17ca missing ; added 2012-04-08 13:28:34 +02:00
Aleksandar Jovanov
c589cbd4ff enum bug fix 2012-04-08 13:25:28 +02:00
Aleksandar Jovanov
15526d6110 only fists support lacks 2012-04-08 13:17:16 +02:00
Marc Zinnschlag
77604086e2 Merge branch 'autoequip' 2012-04-08 13:01:25 +02:00
Marc Zinnschlag
ab2a1297b0 exclude player from auto equip 2012-04-08 13:01:03 +02:00
Aleksandar Jovanov
c1afd534fc all stuff added 2012-04-08 12:37:59 +02:00
Aleksandar Jovanov
b4ee01e691 missing file 2012-04-08 12:26:59 +02:00
Marc Zinnschlag
dcab6737e5 consider skills when auto equipping 2012-04-08 12:26:21 +02:00
Aleksandar Jovanov
b1259ca15c added a 'backend' for NPC/Player draw state 2012-04-08 12:25:33 +02:00
Alexander "Ace" Olofsson
0fd48c4229 Extended the esmtool a bit and prepared all records for saving. 2012-04-08 11:51:52 +02:00
Aleksandar Jovanov
d5b8d4ef49 Revert "test commit" 
This reverts commit 8c607870c0.

reverting the test commit in the test branch
 2012-04-08 11:30:17 +02:00
Aleksandar Jovanov
8c607870c0 test commit 2012-04-08 11:26:54 +02:00
Marc Zinnschlag
8e6c445111 Merge remote branch 'chris/sound' 2012-04-08 11:13:42 +02:00
Jason Hooks
ebab98a8a0 Restructuring things 2012-04-07 22:02:20 -04:00
Chris Robinson
59ccab0b2c Add sound volume settings 2012-04-07 16:00:30 -07:00
Chris Robinson
752e89a268 Add a setting to select the sound device name 2012-04-07 15:28:38 -07:00
Chris Robinson
b8be867e6e Work around a bug in the Windows OpenAL router 2012-04-07 14:58:52 -07:00
scrawl
c748252d33 weather fix again 2012-04-07 22:55:25 +02:00
scrawl
cdea19206c Revert "more accurate fog, TODO: apply this to the terrain" 
This reverts commit 96c37d3e7c.
 2012-04-07 22:47:39 +02:00
scrawl
96911ada95 restored render queue of transparent objects, they are now part of the mrt textures 
this fixes some issues with transparent objects not visible in the refraction
 2012-04-07 22:37:15 +02:00
Marc Zinnschlag
34a02fef45 consider item value when auto equipping 2012-04-07 20:09:09 +02:00
Marc Zinnschlag
d5a7d418dd added getValue function to Class hierarchy 2012-04-07 19:53:49 +02:00
Marc Zinnschlag
f52b9cc162 Merge branch 'autoequip' 2012-04-07 18:48:30 +02:00
Marc Zinnschlag
c94d683014 fill in initial spell list from NPC record 2012-04-07 18:48:02 +02:00
Marc Zinnschlag
12f7bae526 added known spells and selected spell to NpcStats 2012-04-07 18:37:41 +02:00
scrawl
044d649edd Merge branch 'master' into water 2012-04-07 17:16:35 +02:00
scrawl
96c37d3e7c more accurate fog, TODO: apply this to the terrain 2012-04-07 16:55:32 +02:00
scrawl
dbf7547003 fixed first weather transition being instant 2012-04-07 16:33:03 +02:00
Roman Melnik
bdbb8a8d84 Merge remote-tracking branch 'upstream/master' into windowsPinning 
Conflicts:
	apps/openmw/mwgui/window_manager.cpp (keep both changes)
 2012-04-07 17:30:20 +03:00
Roman Melnik
72b3f6121d Windows Pinning: add files to CMakeLists.txt 
Add new files (map_window and window_pinnable_base)
 2012-04-07 12:37:15 +03:00
Marc Zinnschlag
b7614dd0ce Merge remote branch 'chris/sound' 2012-04-06 22:09:34 +02:00
scrawl
dbde8405f7 Merge branch 'master' into water 2012-04-06 21:21:57 +02:00
scrawl
50702c5e84 Merge branch 'master' into water 2012-04-06 20:58:50 +02:00
Chris Robinson
87e8917c4d Don't try to play sounds when no sound output is initialized 2012-04-06 10:43:14 -07:00
scrawl
c49d5dd40b another sky tweak 2012-04-06 19:23:19 +02:00
scrawl
f008ca166b restored moons like they were 2012-04-06 19:21:28 +02:00
scrawl
c0f991ac0a underwater depth effect 2012-04-06 18:51:30 +02:00
scrawl
456eb95209 reversed sun and moon paths (sunrise at east) 2012-04-06 18:22:37 +02:00
scrawl
8316a4c2ec add mrt dummy output to sky shaders 2012-04-06 17:21:56 +02:00
scrawl
c169f9e171 underwater tweaks 2012-04-06 16:11:08 +02:00
scrawl
2976625b00 better underwater 2012-04-06 15:51:57 +02:00
scrawl
ec3fe1ef00 no sun glare in the reflection 2012-04-06 15:17:54 +02:00
scrawl
393530e671 more or less fixed the sky for normal viewing angles, still disappears at a certain height though 2012-04-06 15:05:17 +02:00
scrawl
a41eee9a72 specular lighting 2012-04-06 14:07:52 +02:00
Marc Zinnschlag
8bf9b371c7 removed remains of input framelistener 2012-04-06 10:39:55 +02:00
Roman Melnik
ef0a185e11 Pinnable windows: hide hud elements 
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.

Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
 2012-04-06 01:17:23 +03:00
scrawl
e718d4b6f0 another sky fix 2012-04-05 22:36:48 +02:00
scrawl
b36c0d95b8 night transition fix 2012-04-05 22:11:04 +02:00
scrawl
e492a69c8f Merge branch 'inputfix' into water 2012-04-05 21:27:59 +02:00
scrawl
a3151fe525 fixed input handling priority in the main loop 2012-04-05 21:16:51 +02:00
scrawl
8bfc81f398 Merge branch 'master' into water 2012-04-05 20:09:38 +02:00
scrawl
622fb568cf removed MRT setting and figure it out automatically 2012-04-05 19:27:54 +02:00
scrawl
b8a470efcd put transparent objects in a seperate render queue, in order to not mess up the mrt textures 2012-04-05 19:07:21 +02:00
Marc Zinnschlag
000cfad82d Merge remote branch 'scrawl/gamesettings' 2012-04-05 18:07:47 +02:00
scrawl
88c50c5171 Merge branch 'master' into water 2012-04-05 15:38:46 +02:00
scrawl
1b89a9e203 various fixes 2012-04-05 15:30:55 +02:00
Dmitry Marakasov
84b475130a Add missing include 2012-04-05 15:03:28 +02:00
scrawl
e1bde415f5 typo 2012-04-05 14:22:44 +02:00
scrawl
43fd0352f4 removed unneeded lines 2012-04-05 14:21:57 +02:00
scrawl
f49131e1b8 renamed setting, automatically disable MRT when unsupported 2012-04-05 13:09:59 +02:00
Marc Zinnschlag
1201c271b2 Merge remote branch 'swick/initocfg' 2012-04-05 12:43:00 +02:00
scrawl
f6342cfd60 fixed viewport background color, fixed indentation of some old functions 2012-04-05 11:52:06 +02:00
scrawl
5664d879a5 fixed some sky objects 2012-04-05 11:40:56 +02:00
scrawl
ab8b74dcac forgot adding a file 2012-04-05 08:58:21 +02:00
Jason Hooks
ca4de0606e Some planning 2012-04-04 23:23:24 -04:00
scrawl
3f05aba76d got MRT working, some minor quirks to solve (black viewport background) 2012-04-05 01:21:36 +02:00
Sebastian Wick
f7bfea5861 typo 2 -.- 2012-04-05 00:16:44 +02:00
Sebastian Wick
56c9992b29 typo 2012-04-04 23:52:42 +02:00
Sebastian Wick
8c84f68dab fix for older boost versions; unsigned warning 2012-04-04 23:51:22 +02:00
Marc Zinnschlag
6fd3d5c776 Merge remote branch 'lgro/master' 2012-04-04 23:19:30 +02:00
gugus
aaa5368fe9 added script instruction pcraiserank. Does not work yet. 2012-04-04 22:14:38 +02:00
gugus
2c7c945208 check playerfaction during dialogue 2012-04-04 22:13:57 +02:00
Lukasz Gromanowski
cd2789b15a Revert "Issue #225: Correction to commit ae98904." 
This reverts commit 0e5c90d3e7.
 2012-04-04 21:05:19 +02:00
Sebastian Wick
5dd65c11ee forgot to save the file 2012-04-04 21:04:52 +02:00
Sebastian Wick
57ae1bdc43 Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg 
Conflicts:
	apps/openmw/main.cpp
 2012-04-04 20:58:02 +02:00
scrawl
eb67afe552 added MRT output to terrain material 2012-04-04 20:18:08 +02:00
Sebastian Wick
6ccb32d26c import nosound option 2012-04-04 20:06:31 +02:00
Sebastian Wick
d3a6484bbc set the default value for --fallback the right way 2012-04-04 19:59:46 +02:00
Sebastian Wick
a974d88cf1 Revert "set a default value for --fallback" 
This reverts commit 94a220dcdd.
 2012-04-04 19:58:04 +02:00
Sebastian Wick
94a220dcdd set a default value for --fallback 2012-04-04 19:52:07 +02:00
scrawl
6442d49e16 render queue groups, sky fix 2012-04-04 18:53:40 +02:00
Sebastian Wick
48b7b03453 typo; World::getFallback(std::string key, std::string def) 2012-04-04 16:15:15 +02:00
Sebastian Wick
16e7bf353a remove debug message 2012-04-04 16:08:46 +02:00
Sebastian Wick
de510d445b throw an error if the --fallback syntax is wrong 2012-04-04 15:23:14 +02:00
Sebastian Wick
329ba24eab streamlined command line options 2012-04-04 15:11:30 +02:00
scrawl
cc4076d42a basic noise 2012-04-03 21:16:43 +02:00
scrawl
fe63f2b2aa first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering) 2012-04-03 19:10:02 +02:00
Marc Zinnschlag
e403c7158a Merge remote branch 'gus/DialogueSystem' 2012-04-03 18:27:36 +02:00
Marc Zinnschlag
cc9696cc2c Merge remote branch 'scrawl/minimap' 2012-04-03 18:26:20 +02:00
gugus
a268b89239 changed the way NPC faction is checked. Should be the same way for the player. 2012-04-03 17:31:41 +02:00
gugus
be4af711af NPC rank was not loaded. Not sure if it's the right way, but it seems to work. 2012-04-03 17:30:19 +02:00
gugus
07ea63c10c Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-03 17:29:00 +02:00
scrawl
6481cf87fc cleanup resources 2012-04-03 17:07:16 +02:00
scrawl
052cc47ee9 fixed waterAdded 2012-04-03 16:53:33 +02:00
scrawl
b3a186e729 simple water without shaders that uses original MW textures 2012-04-03 16:37:54 +02:00
scrawl
c1693a0c63 Merge branch 'minimap' into water 2012-04-03 15:37:11 +02:00
scrawl
51e33cc090 fixed map of some interiors 2012-04-03 15:34:13 +02:00
scrawl
8aea311797 added visibility flags for everything 2012-04-03 15:13:47 +02:00
scrawl
fd45208196 re-added code for reflection & refraction rendering 2012-04-03 14:23:23 +02:00
scrawl
d393f2dd4b Merge branch 'master' into water 2012-04-03 14:06:14 +02:00
Jason Hooks
57299571d5 Preparing for clothes/armor 2012-04-02 22:08:46 -04:00
Sebastian Wick
329d59e52b typo 2012-04-03 02:17:15 +02:00
Sebastian Wick
73705dadf6 parse fallback with boost program option custom validators 2012-04-03 02:14:39 +02:00
Sebastian Wick
d87dffa948 should work... but does not even compile 2012-04-03 01:47:43 +02:00
Sebastian Wick
2d23d79fd5 allways merge fallback; better syntax 2012-04-03 00:44:26 +02:00
Marc Zinnschlag
26371a82a5 Merge remote branch 'scrawl/crashfix' 2012-04-02 23:53:07 +02:00
Lukasz Gromanowski
0e5c90d3e7 Issue #225: Correction to commit ae98904. 
Changed pointer to LandData struct to simple member variable.
 2012-04-02 23:50:53 +02:00
Sebastian Wick
ab9c430632 fallback in apps/openmw; fix for apps/mwiniimporter 2012-04-02 20:47:09 +02:00
scrawl
d4a2bdfa3d fix crash when hardware occlusion queries unsupporetd 2012-04-02 20:46:42 +02:00
scrawl
c0af3c7241 Merge branch 'master' into terraincollision 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-02 19:57:58 +02:00
scrawl
bd9e165e3f Merge branch 'master' into water 2012-04-02 19:44:25 +02:00
scrawl
16481b0594 Merge branch 'master' into minimap 2012-04-02 19:38:36 +02:00
scrawl
342464530d rotated map working 2012-04-02 19:37:24 +02:00
scrawl
ff15f28787 options for texture filtering and mipmaps 2012-04-02 18:01:49 +02:00
scrawl
39ee9e9ab8 setting for field of view 2012-04-02 17:51:51 +02:00
Sebastian Wick
6e19076dc5 fallback for ini importer 2012-04-02 17:07:18 +02:00
scrawl
5f2a674d93 fixed a typo 2012-04-02 16:14:39 +02:00
scrawl
00cc45c537 FPS is now a setting instead of commandline option 2012-04-02 16:10:54 +02:00
scrawl
fd662f937a add settings for viewing distance and fog 2012-04-02 15:51:48 +02:00
scrawl
e5cc9adbb0 added settings for rendering distance of small objects 2012-04-02 15:30:29 +02:00
scrawl
2b4b941192 Merge branch 'master' into gamesettings 2012-04-02 15:21:10 +02:00
Sebastian Wick
16674ad141 open file for writing AFTER reading it :) 2012-04-02 14:42:01 +02:00
scrawl
e0631dd9be Merge branch 'master' into minimap 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-02 14:38:02 +02:00
Sebastian Wick
89565bacd1 since the default method is not available in older boost we should check by ourselfs if the options are given and dont use notify 2012-04-02 14:34:21 +02:00
scrawl
b380e71832 fixed underwater wireframe mode 2012-04-02 14:32:21 +02:00
scrawl
1445ae992d adding a setting to disable static geometry 2012-04-02 14:24:16 +02:00
scrawl
5accca385c fix crash on exit when no user settings exist 2012-04-02 13:47:25 +02:00
Marc Zinnschlag
6022d3ab13 Merge remote branch 'corristo/pgrd-rendering' 
reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
 2012-04-02 12:04:47 +02:00
Marc Zinnschlag
fb44a5da10 Merge remote branch 'ace/win-fix' 2012-04-02 11:46:09 +02:00
Marc Zinnschlag
eccb983c44 Merge remote branch 'chris/sound' 2012-04-02 11:34:48 +02:00
Marc Zinnschlag
cdd0182912 Merge remote branch 'scrawl/occlusionquery' 
Reduced cout spam

Conflicts:
	apps/openmw/mwrender/occlusionquery.cpp
 2012-04-02 11:33:16 +02:00
Jason Hooks
07d0203a3c Merge remote-tracking branch 'upstream/master' 2012-04-02 00:08:12 -04:00
Chris Robinson
63e0e82049 Implement an Audiere-based decoder 2012-04-01 15:02:07 -07:00
Roman Melnik
91a377df86 Fix behaviour of the MapWindow 
The map now will track player's position/rotation when
pinned, and will not update if position/rotation didn't
change since last frame.
 2012-04-01 23:51:49 +03:00
Chris Robinson
2147210ad7 Don't set an underwater environment when there's no water 2012-04-01 12:46:49 -07:00
Lukasz Gromanowski
ae989040e5 Issue #225: Fix for memleak when loading terrain. 2012-04-01 21:29:49 +02:00
Alexander "Ace" Olofsson
cec9562282 Fixing an ambigous symbol 2012-04-01 20:29:00 +02:00
scrawl
0a5757791c Merge branch 'master' into minimap 2012-04-01 20:17:07 +02:00
scrawl
c2a82c3d89 Merge branch 'master' into gamesettings 2012-04-01 20:06:18 +02:00
Roman Melnik
911ca4be89 Move MapWindow to separate files 
Separate MapWindow from bunch of classes in layouts.cpp/hpp
Inherit it from WindowPinnableBase.

TODO: map arrow (player position) updates orientation only
when you open the inventory. When the map window is pinned,
the arrow direction is not updated.
 2012-04-01 20:39:53 +03:00
Roman Melnik
d09f0610ea Add basic windows pinning 
Create WindowPinnableBase class for windows which should be
allowed to be pinned.

Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).

Handle clicking on PinToggle button (pinning/unpinning a window).
 2012-04-01 20:36:57 +03:00
scrawl
7b3adb27a3 backend changes, terrain num lights setting 2012-04-01 18:48:37 +02:00
scrawl
f4bbcb48a6 settings-default.cfg 2012-04-01 17:14:49 +02:00
Marc Zinnschlag
de41e1118a Merge remote branch 'scrawl/weather' 2012-04-01 17:10:30 +02:00
scrawl
6091a0504d first settings test (config file has to be created manually) 2012-04-01 16:59:35 +02:00
Nikolay Kasyanov
30d6c880ff Feature #37 (In Progress) Render Path Grid 
tuned sized a bit
 2012-04-01 17:51:37 +04:00
Nikolay Kasyanov
cab412c225 Feature #37 (In Progress) Render Path Grid 
optimisation, now it takes only two batches per cell.
 2012-04-01 17:27:18 +04:00
scrawl
9a261a02aa changed the cloud movement direction like suggested on the forum 2012-04-01 15:14:43 +02:00
scrawl
ee754eda6c don't create sky until entering an exterior cell 2012-04-01 15:07:41 +02:00
scrawl
df8e0bbff2 player check 2012-04-01 14:53:41 +02:00
scrawl
80456778be fix for pickup up transparent objects, workaround for doors 2012-04-01 14:22:04 +02:00
scrawl
30407d3a2c Merge branch 'master' into occlusionquery 2012-04-01 14:16:25 +02:00
scrawl
4e63f89829 silence an error regarding faced handle 2012-04-01 13:09:30 +02:00
Marc Zinnschlag
8aa4001937 compile fix 2012-04-01 10:34:51 +02:00
Marc Zinnschlag
38066d9ecb Merge remote branch 'swick/initocfg' 2012-04-01 10:26:26 +02:00
Jason Hooks
0021ccf862 Merge remote-tracking branch 'upstream/master' 2012-03-31 20:48:42 -04:00
Chris Robinson
9c06bfc8fc Merge remote branch 'zini/master' into sound 2012-03-31 14:26:21 -07:00
Sebastian Wick
a2a7539fd5 fix for more than 10 game files; delete both master and plugin settings if called with --game-files 2012-03-31 23:15:33 +02:00
Sebastian Wick
1d596d6c72 use std::map<std::string, std::vector<std::string> > instead of std::map<std::string, std::string> 2012-03-31 22:48:50 +02:00
Marc Zinnschlag
40310f3663 Merge remote branch 'scrawl/occlusionquery' 2012-03-31 22:09:47 +02:00
Marc Zinnschlag
b5b40e2623 Merge remote branch 'lgro/master' 2012-03-31 21:45:15 +02:00
Lukasz Gromanowski
bdc4c79b4e Fix for segfault when doing 'coc "seyda neen"'. 
This is a fix for segfault:

==8683== Process terminating with default action of signal 11 (SIGSEGV)
==8683==  Access not within mapped region at address 0x0
==8683==    at 0x59DFE4: MWRender::Animation::handleShapes(std::vector<Nif::NiTriShapeCopy, std::allocator<Nif::NiTriShapeCopy> >*, Ogre::Entity*, Ogre::SkeletonInstance*) (animation.cpp:503)
==8683==    by 0x5A4ECE: MWRender::Actors::update(float) (actors.cpp:134)
==8683==    by 0x5937A9: MWRender::RenderingManager::update(float) (renderingmanager.cpp:168)
==8683==    by 0x629AD6: MWWorld::World::update(float) (world.cpp:705)
==8683==    by 0x68B022: OMW::Engine::frameRenderingQueued(Ogre::FrameEvent const&) (engine.cpp:157)
==8683==    by 0x51F9574: Ogre::Root::_fireFrameRenderingQueued(Ogre::FrameEvent&) (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F964F: Ogre::Root::_fireFrameRenderingQueued() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F9681: Ogre::Root::_updateAllRenderTargets() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F98CF: Ogre::Root::renderOneFrame() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F990C: Ogre::Root::startRendering() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x68A669: OMW::Engine::go() (engine.cpp:408)
==8683==    by 0x51CECB: main (main.cpp:254)
==8683==  If you believe this happened as a result of a stack
==8683==  overflow in your program's main thread (unlikely but
==8683==  possible), you can try to increase the size of the
==8683==  main thread stack using the --main-stacksize= flag.
==8683==  The main thread stack size used in this run was 8388608.

when doing 'coc "seyda neen"' when animations are enabled
(Animation::animate member variable is set to 1).
 2012-03-31 21:34:40 +02:00
Marc Zinnschlag
89fb3146ab Merge remote branch 'ace/win-fix' 2012-03-31 21:31:16 +02:00
Marc Zinnschlag
ca4ad74151 more cleanup 2012-03-31 21:29:46 +02:00
Sebastian Wick
6d875dfd54 handle master/plugin properly 2012-03-31 21:06:48 +02:00
Alexander "Ace" Olofsson
64f792c01d Fix a value defined at the wrong place 2012-03-31 21:05:33 +02:00
Alexander "Ace" Olofsson
4ef921c43f Prevent internal classes from being marked dllimport 2012-03-31 20:50:22 +02:00
scrawl
13efe68fc3 disabled some debug output 2012-03-31 20:28:07 +02:00
scrawl
cfb194f1d1 fix 6 2012-03-31 20:18:20 +02:00
scrawl
5f78f6c723 change queue 2012-03-31 20:10:34 +02:00
scrawl
b018d00fd3 fix 5 2012-03-31 20:05:23 +02:00
Chris Robinson
e8e8d3fb1b Fully reset the music before starting the next track 2012-03-31 10:59:29 -07:00
Eli2
3cc81d74bc Cleanup, replaced if with switch 2012-03-31 19:50:21 +02:00
Chris Robinson
3a57746ee4 Remove an unneeded volume special-case 2012-03-31 10:43:55 -07:00
Chris Robinson
4944a29b21 Keep track of the sound pitch 2012-03-31 10:41:12 -07:00
scrawl
c9067249dd fix 4 2012-03-31 19:16:14 +02:00
scrawl
c08a2b2942 fix 3 2012-03-31 19:12:02 +02:00
scrawl
909abb480d fix 2 2012-03-31 19:09:36 +02:00
scrawl
f8d45eae52 fix #1 2012-03-31 19:08:05 +02:00
Chris Robinson
cbf6c0404a Implement a basic underwater sound environment 2012-03-31 10:06:12 -07:00
Sebastian Wick
092de45924 std::map to std::multimap 2012-03-31 18:28:48 +02:00
Sebastian Wick
653fbdd10c master/plugin support; needs multimap instead of map 2012-03-31 18:24:43 +02:00
Marc Zinnschlag
751e7d2199 basic auto-equipping (picks the first matching item 2012-03-31 17:26:15 +02:00
Chris Robinson
575474ff69 Pass the mode flags to the sound output play methods 2012-03-31 08:14:39 -07:00
Sebastian Wick
ceedae4a1a technical corrections 2012-03-31 16:54:53 +02:00
Chris Robinson
b2d7dca8c3 Merge remote branch 'zini/master' into sound 2012-03-31 07:46:56 -07:00
Chris Robinson
977e7ac9a3 Remove the Play_Single flag. It's not correct. 2012-03-31 07:41:26 -07:00
Chris Robinson
ae308b9b5f Use a set of flags instead of separate booleans 2012-03-31 07:31:55 -07:00
Chris Robinson
e48d125a84 Only allow one instance of a given tracked soundid 
The untracked flag should probably be broken up and combined with the loop
boolean into a set of flags.
 2012-03-31 05:57:03 -07:00
Sebastian Wick
b7635b3d4a pass maps by reference 2012-03-31 14:34:00 +02:00
Sebastian Wick
e35670c6cb ignore syntax errors and empty lines; fixed merge function 2012-03-31 14:28:19 +02:00
Nikolay Kasyanov
5e829362cb Feature #37 (In Progress) Render Path Grid 
more similar to vanilla path grid rendering
 2012-03-31 16:22:55 +04:00
Nikolay Kasyanov
006e1cde85 some updates after terrain merge 2012-03-31 14:56:54 +04:00
Nikolay Kasyanov
523648dbb1 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/debugging.cpp
 2012-03-31 14:56:18 +04:00
Chris Robinson
bfac946878 Finally "fix" --nosound 
Expect degraded performance with it. Looping sounds are constantly checked to
see if they're playing, and try to play it again when it's not.
 2012-03-31 03:31:41 -07:00
Chris Robinson
7541e08909 Don't reset the sound Output device if init fails 2012-03-31 02:48:14 -07:00
Nikolay Kasyanov
057c2f2e2a Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-31 13:42:13 +04:00
Marc Zinnschlag
509650d5f3 Merge remote branch 'ace/fs-fix' 2012-03-31 11:37:18 +02:00
Marc Zinnschlag
6eb3281c4c boost fix 2012-03-31 11:36:51 +02:00
Chris Robinson
28378c063b Minor OpenAL_SoundStream cleanups 2012-03-31 02:22:23 -07:00
Marc Zinnschlag
222f0e20bc Merge remote branch 'swick/initocfg' into initcfg 2012-03-31 11:20:05 +02:00
Chris Robinson
4e908aa095 Add a method to set the sound's position 2012-03-31 01:34:26 -07:00
Chris Robinson
b01289128b Split OpenAL_Sound into separate classes for 2D and 3D sounds 2012-03-31 01:15:27 -07:00
Chris Robinson
5adeee20fd Mute sounds that go outside the max distance 2012-03-31 00:57:29 -07:00
Sebastian Wick
849c3a9bec add the section to the ini-keys 2012-03-30 23:12:52 +02:00
Sebastian Wick
c160bc7080 works, sort of 2012-03-30 22:58:54 +02:00
Sebastian Wick
fbd626baf6 mwiniimporter 2012-03-30 20:59:44 +02:00
Chris Robinson
fc167dbc83 Pass Ogre Vector3s to playSound3D and updateListener 2012-03-30 11:42:11 -07:00
Chris Robinson
fefc8f86ab Remove the unused streamSound3D method 2012-03-30 11:11:07 -07:00
Chris Robinson
c33349a774 Merge remote branch 'zini/master' into sound 2012-03-30 08:36:01 -07:00
Marc Zinnschlag
0892df0ad3 framework for gamemechanics-realted actor updated 2012-03-30 17:01:55 +02:00
Marc Zinnschlag
a1d3516e0a constness fix 2012-03-30 17:01:23 +02:00
scrawl
fc5cd703bb maps are now rendered with correct rotation, however for interiors the arrow is wrong 2012-03-30 16:34:36 +02:00
Chris Robinson
1ee8b963d0 Store the sound listener position as well 2012-03-30 07:30:17 -07:00
Marc Zinnschlag
d717b7b9dd factored out actor related game mechanics code into a separate class 2012-03-30 16:18:58 +02:00
Chris Robinson
fad27d99e6 Update the actual sound volume with the position 2012-03-30 07:10:34 -07:00
scrawl
a4576f043d fixed the physics debug rendering now activates/deactivates properly 2012-03-30 16:02:41 +02:00
Chris Robinson
479df78ea1 Update the actual sound position after the listener 2012-03-30 07:01:37 -07:00
Marc Zinnschlag
8d7bf34348 Merge branch 'terrain' 2012-03-30 15:52:27 +02:00
Marc Zinnschlag
557e97bab4 fixed a terrain-related Redemption crash 2012-03-30 15:52:09 +02:00
Chris Robinson
71d9d7e943 Store the current sound position with the Sound object 2012-03-30 06:41:06 -07:00
Marc Zinnschlag
46279a001b Merge remote branch 'scrawl/dialogue' 2012-03-30 15:39:56 +02:00
Marc Zinnschlag
2d2af4b28a Merge remote branch 'scrawl/terrain18' into terrain 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
 2012-03-30 15:38:14 +02:00
scrawl
521b9eec6c Merge branch 'master' into minimap 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/world.cpp
 2012-03-30 15:31:07 +02:00
Chris Robinson
de102cd274 Simplify broken OpenAL workaround 2012-03-30 06:28:40 -07:00
Chris Robinson
33a63d88a5 Merge remote branch 'zini/master' into sound 2012-03-30 06:22:19 -07:00
scrawl
30d27fa83f Merge branch 'master' into occlusionquery 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-30 15:00:04 +02:00
scrawl
26bdbf77f3 Merge branch 'master' into occlusionquery 2012-03-30 14:49:06 +02:00
Alexander "Ace" Olofsson
4a9a416d46 Can find files even if no .bsa file exists now 2012-03-30 14:45:32 +02:00
scrawl
4a6d034591 Merge branch 'master' into occlusionquery 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
 2012-03-30 14:39:42 +02:00
scrawl
4bbedeb3e7 made all dialogs semi transparent (like in morrowind) 2012-03-30 14:01:43 +02:00
scrawl
d3f31c3498 dialogue window enhancements 2012-03-30 13:53:35 +02:00
Marc Zinnschlag
a90c3b9f23 Merge remote branch 'scrawl/water' 2012-03-30 13:07:47 +02:00
Marc Zinnschlag
cc9a874f2b Merge remote branch 'corristo/openal' 2012-03-30 10:45:31 +02:00
scrawl
d5c49fa036 getWaterLevel use CellStore ; attempted fix for morrowind without tribunal 2012-03-30 10:12:28 +02:00
Chris Robinson
6a16e33f82 Merge remote branch 'zini/master' into sound 2012-03-29 21:17:59 -07:00
Nikolay Kasyanov
b21a6291f7 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
	apps/openmw/mwworld/world.hpp
 2012-03-30 02:50:30 +04:00
Nikolay Kasyanov
aab79599a9 Merge branch 'openal' into pgrd-rendering 2012-03-30 02:43:40 +04:00
Nikolay Kasyanov
b6aa8925f4 (Temporary) workaround for broken OpenAL implementations that doesn't return meaningful max counts of sources 2012-03-30 00:12:38 +04:00
Marc Zinnschlag
647c0e4df3 Merge remote branch 'scrawl/renderingdistance' 2012-03-29 21:27:25 +02:00
Marc Zinnschlag
eec135c040 Merge remote branch 'scrawl/water' 2012-03-29 21:20:16 +02:00
Chris Robinson
3d5384e2bb Remove some unneeded casts 2012-03-29 11:28:33 -07:00
scrawl
8d224f009f toggleFogOfWar script command 2012-03-29 19:45:19 +02:00
scrawl
0c2317ce9d player arrow works again 2012-03-29 19:20:09 +02:00
scrawl
79c2a2e465 implemented toggleWater (twa); formatting again 2012-03-29 18:33:08 +02:00
scrawl
01ecf3e0be attempt at rotation (BROKEN) 2012-03-29 18:16:11 +02:00
scrawl
35f40b99ad remove the bounding box hack, not needed because calculation is correct now 2012-03-29 18:10:01 +02:00
scrawl
0332a8df96 Merge branch 'renderingdistance' into minimap 2012-03-29 18:09:24 +02:00
Marc Zinnschlag
10b4c1d904 silenced a warning 2012-03-29 18:04:52 +02:00
Marc Zinnschlag
ea79d9b7c3 Merge remote branch 'scrawl/renderingdistance' 2012-03-29 18:02:30 +02:00
scrawl
e22ae7c840 bounds fix (again) 2012-03-29 17:30:13 +02:00
scrawl
b2bdf0ebf3 Merge branch 'master' into minimap 2012-03-29 17:08:32 +02:00
scrawl
37e6db69d8 fix 2012-03-29 17:07:59 +02:00
scrawl
19c801f538 disabled rendering distance for now 2012-03-29 16:56:30 +02:00
scrawl
f45c650975 bounds fix 2012-03-29 16:47:59 +02:00
scrawl
2f096e131d throw exception if water level is attempted to be modified in exterior 2012-03-29 16:23:02 +02:00
scrawl
5a19d4ec45 implement water script functions and save water height in CellStore 2012-03-29 15:50:15 +02:00
scrawl
f497813043 formatting, added Water::setHeight 2012-03-29 15:49:24 +02:00
Nikolay Kasyanov
c3357c4396 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
 2012-03-29 13:27:13 +04:00
Nikolay Kasyanov
0897a2a4cb Merge branch 'master' into openal 2012-03-29 13:09:54 +04:00
scrawl
39b3afb98f use camera height instead of player height for underwater check 2012-03-29 05:03:34 +02:00
Nikolay Kasyanov
20f976ddc7 probably openal initialization fix 2012-03-29 03:02:26 +04:00
Pieter van der Kloet
4488be33ce Added missing slash to launcher CMakeLists.txt 2012-03-29 00:12:34 +02:00
scrawl
e5a19209a4 remove the timeout stuff 2012-03-29 00:05:48 +02:00
scrawl
c5f044eb0d fixed compilation 2012-03-28 22:46:29 +02:00
scrawl
cb72e812f9 Merge branch 'master' into renderingdistance 2012-03-28 21:47:26 +02:00
scrawl
58f7a03626 Merge branch 'terrain18' into terraincollision 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-03-28 21:46:52 +02:00
Marc Zinnschlag
a0c5ccf974 Merge remote branch 'lgro/valgrind' 2012-03-28 21:46:47 +02:00
scrawl
47c3e92db1 removed the unused ray scene query 2012-03-28 21:42:41 +02:00
scrawl
e6303fc3f4 Merge branch 'master' into water 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-28 21:37:20 +02:00
Lukasz Gromanowski
f86d53636d Issue #225: Correction to commit fa4c4b8. 
Correction to commit fa4c4b8 - memeber mChanged should be
set to true, otherwise the map won't display if the game
is started in (0, 0) cell.
 2012-03-28 21:36:38 +02:00
scrawl
6bea08157e Merge branch 'master' into terrain18 2012-03-28 21:30:15 +02:00
scrawl
ecf99f3309 Merge branch 'master' into minimap 2012-03-28 21:29:46 +02:00
scrawl
29acb057b3 Merge branch 'master' into occlusionquery 2012-03-28 21:04:42 +02:00
scrawl
cc7d3af701 Merge branch 'terrain18' into occlusionquery 2012-03-28 21:03:55 +02:00
Marc Zinnschlag
34d9ad0cbd Merge remote branch 'chris/sound' into next 2012-03-28 18:14:35 +02:00
Marc Zinnschlag
2b2eb34f8f Merge remote branch 'corristo/master' into next 2012-03-28 18:07:21 +02:00
Chris Robinson
bedf56a237 Merge remote branch 'zini/next' into sound 2012-03-28 06:27:34 -07:00
Chris Robinson
be337ef7cc Return SoundPtr objects from playSound[3D] 
Note that each Sound object currently contains "precious" resources even after
the sound is stopped. The reference should be reliquished as soon as it's no
longer needed (the SoundManager will make sure the sound continues to play
until it's finished).
 2012-03-28 06:08:25 -07:00
Chris Robinson
293f33914e Use a deque fpr OpenAL's free sources 2012-03-28 05:35:51 -07:00
Chris Robinson
a3291ef360 Add a sound method to update the volume 2012-03-28 05:19:35 -07:00
Chris Robinson
7008bd2fe1 Store some sound properties in the Sound class 2012-03-28 04:58:47 -07:00
Chris Robinson
c072babd17 Better handle bad OpenAL source counts 2012-03-28 04:56:40 -07:00
Chris Robinson
089c340935 Switch the map so the SoundPtr is used as a key 2012-03-28 04:37:00 -07:00
gugus
ddb35b77ff Merge branch 'next' of https://github.com/zinnschlag/openmw.git into Factions2 2012-03-28 11:46:39 +02:00
gugus
0c61f0d294 test stuff 2012-03-28 11:45:46 +02:00
Nikolay Kasyanov
66b31d3d43 Bug #229 (Fixed): On OS X Launcher cannot launch game if path to binary contains spaces 2012-03-28 12:04:42 +04:00
scrawl
4249d2c536 add getNorthVector method 2012-03-28 03:15:10 +02:00
Jason Hooks
b9fabce9c4 Awesome, working 2012-03-27 20:17:54 -04:00
scrawl
72ff7ec030 Merge branch 'next' into occlusionquery 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2012-03-27 23:46:48 +02:00
Lukasz Gromanowski
fa4c4b8f21 Issue #225: Initialize members in class constructor. 2012-03-27 23:07:25 +02:00
scrawl
43b1f896f4 fix object pickup when player is very close to object 2012-03-27 22:36:02 +02:00
scrawl
8f6d10f229 fix uninitalised stuff 2012-03-27 20:59:58 +02:00
Marc Zinnschlag
a996cfed71 Merge remote branch 'ace/win-fixes' into next 2012-03-27 20:11:46 +02:00
Chris Robinson
c6c06f1140 Return SoundPtr objects from the playSound and streamSound methods 2012-03-27 05:59:09 -07:00
Jacob Essex
ec21ff21cc Removed memory leak, allocated more on the stack 2012-03-27 13:58:12 +01:00
scrawl
e398c51f8a remove unneeded render queue workaround 2012-03-27 13:13:28 +02:00
Chris Robinson
f0db2ab82f Split stopSound3D into separate functions to deal with stopping all sounds on an object 2012-03-27 03:20:50 -07:00
Chris Robinson
033faba9c4 Make a function parameter const 2012-03-27 03:00:04 -07:00
Chris Robinson
c2611d035c Use a pair to match the MWWorld::Ptr object and sound ID, instead of nested maps 2012-03-27 02:50:45 -07:00
Marc Zinnschlag
9863195f09 Merge remote branch 'lgro/valgrind' into next 2012-03-27 11:14:09 +02:00
Marc Zinnschlag
e56731d25e Merge remote branch 'scrawl/deletefix' into next 2012-03-27 11:10:15 +02:00
Jacob Essex
b76b62e5e4 Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore 2012-03-27 09:20:22 +01:00
scrawl
bb09c2189a lower rendering distance for small objects (reduce batch count) 2012-03-27 00:45:25 +02:00
Alexander "Ace" Olofsson
55f1053b4f Windows fixes for compiling and linking 2012-03-27 00:36:53 +02:00
Lukasz Gromanowski
be94da1527 Issue #225: Initialize class members in constructor. 2012-03-27 00:34:06 +02:00
Lukasz Gromanowski
6d6ed909bf Issue #225: Deallocate memory used by actors animations. 2012-03-27 00:31:15 +02:00
scrawl
bf421d2873 use vector instead of array 2012-03-27 00:18:09 +02:00
scrawl
18c2b5eb0a Merge branch 'next' into occlusionquery 2012-03-26 22:09:41 +02:00
scrawl
bb3f3ce1db bugfix 2012-03-26 21:52:38 +02:00
scrawl
28dfba55e0 delete fix 2012-03-26 20:29:07 +02:00
Lukasz Gromanowski
5185a28b60 Issue #225: Initialize all class members in constructor. 2012-03-26 19:09:55 +02:00
Chris Robinson
0d552c10bc Use an empty MWWorld::Ptr object for non-3D sounds 2012-03-26 04:10:47 -07:00
Chris Robinson
7b3ecc290e Fix compilation with older OpenAL headers 2012-03-26 01:12:06 -07:00
Chris Robinson
f8f749dbec Merge remote branch 'zini/next' into sound-rewrite 2012-03-26 00:02:21 -07:00
scrawl
4ee03cd61f handle timeout 2012-03-26 00:31:03 +02:00
scrawl
98a33a7fc6 fix 2012-03-25 23:28:51 +02:00
scrawl
382fa6ac68 fixes 2012-03-25 22:53:00 +02:00
Jason Hooks
e4251be529 Down gravity 2012-03-25 15:16:02 -04:00
scrawl
53d4be5cf6 object pickup should work everywhere 2012-03-25 20:52:56 +02:00
Marc Zinnschlag
d993766ee1 Merge remote branch 'pvdk/garamond' into next 2012-03-25 11:05:41 +02:00
Chris Robinson
3e98e28059 Use a better method to get a more even randomization 2012-03-24 21:05:03 -07:00
Jason Hooks
18a139cd66 adding up and down move buttons 2012-03-24 22:03:08 -04:00
Chris Robinson
2bc81a778b Merge remote branch 'zini/next' into sound-rewrite 2012-03-24 17:27:10 -07:00
scrawl
f959a5cbeb auto adjust size of map window title bar 2012-03-24 23:24:19 +01:00
Pieter van der Kloet
155cd76f37 Changed Launcher font to EB Garamond and added license info 2012-03-24 20:43:35 +01:00
scrawl
9d30a139cc added api 2012-03-24 20:41:23 +01:00
scrawl
e212a32350 bugfix 2012-03-24 18:38:58 +01:00
scrawl
743ea0c9be use hardware occlusion query for sun glare effect 2012-03-24 17:59:26 +01:00
Chris Robinson
71d3f9bd51 Get the object reference's position once when updating its sounds 2012-03-24 08:12:04 -07:00
scrawl
5fba52c238 Merge branch 'terrain18' into occlusionquery 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-24 15:14:33 +01:00
scrawl
99b2b6b648 ogre 1.8 fixes 2012-03-24 14:46:48 +01:00
scrawl
f2a7acb102 Merge branch 'next' into terrain 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-24 13:19:17 +01:00
scrawl
f4898539e9 added some code that doesn't do anything yet, waiting for ogre 1.8 2012-03-24 13:06:01 +01:00
Chris Robinson
5cb90ab704 Add some dummy copy constructors and assignment operators to prevent implicit versions from being used 2012-03-24 03:49:03 -07:00
Marc Zinnschlag
9ec1e55aaf Merge remote branch 'scrawl/minimap' into next 2012-03-24 10:31:42 +01:00
Chris Robinson
fa70a72b75 Remove some unused sound manager fields and constructor parameters 2012-03-24 00:22:54 -07:00
scrawl
a6259a1b0d bugfixes 2012-03-23 17:37:56 +01:00
scrawl
7a3034701f functional HUD map 2012-03-23 16:51:56 +01:00
scrawl
a1f80e029e abstracted some code to be reused for hud 2012-03-23 16:16:31 +01:00
scrawl
789fbb460f move implementation to .cpp 2012-03-23 15:34:54 +01:00
scrawl
ce63d29d4a rotate hud player arrow 2012-03-23 15:26:24 +01:00
gugus
319022d962 speed up dialogue start-up. 2012-03-23 15:24:39 +01:00
gugus
f9bb19fcdc begining factions 2012-03-23 15:18:09 +01:00
scrawl
06fa310e29 player arrow rotated correctly 2012-03-23 15:00:48 +01:00
scrawl
b8f962a68d Merge branch 'next' into shaders 2012-03-23 10:26:20 +01:00
scrawl
770b0f2106 gui changes 2012-03-23 10:25:55 +01:00
scrawl
9c3e1f48f0 player arrow 2012-03-23 09:00:00 +01:00
Chris Robinson
1ccddefe28 Properly report the default device when opening sound fails 2012-03-23 00:31:01 -07:00
scrawl
8e299bd25b remove unuseful std::cout 2012-03-23 08:16:32 +01:00
scrawl
2dd329938a automatically zoom in on the player while moving 2012-03-23 08:16:04 +01:00
Chris Robinson
2f0af42261 Use the ALC_ENUMERATE_ALL_EXT extension with OpenAL when available 2012-03-22 23:51:00 -07:00
Chris Robinson
277597c567 Fix DEFAULT_OUTPUT for OpenAL_Output 2012-03-22 18:44:55 -07:00
Chris Robinson
2e28819243 Avoid trying to play an ambient sound if there's no chance for any to play 2012-03-22 18:39:10 -07:00
scrawl
9076401892 Merge branch 'next' into terrain 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
 2012-03-22 22:31:49 +01:00
scrawl
6067053f08 Merge branch 'next' into water 
Conflicts:
	CMakeLists.txt
 2012-03-22 21:41:32 +01:00
scrawl
cf3515a898 it is now possible to drag the minimap with the mouse 2012-03-22 21:27:21 +01:00
scrawl
cc9f20a04f MW_MapView skin 2012-03-22 20:25:41 +01:00
scrawl
ab9aa1ba74 Merge branch 'next' into minimap 
Conflicts:
	files/mygui/openmw_map_window_layout.xml
 2012-03-22 19:36:37 +01:00
Marc Zinnschlag
47bcbdef17 Merge remote branch 'scrawl/mygui' into mygui 2012-03-22 18:46:21 +01:00
scrawl
d1508f5a59 List -> ListBox 2012-03-22 15:28:06 +01:00
scrawl
560e702973 fixed scroll bars 2012-03-22 15:23:23 +01:00
scrawl
26aae9d2ce fix class name typo 2012-03-22 15:10:29 +01:00
scrawl
161d519206 fixed the dialogue history topic selection 2012-03-22 15:01:37 +01:00
Pieter van der Kloet
73a1b256a8 Changed warning dialog text to be less ambiguous 2012-03-22 12:42:08 +01:00
Pieter van der Kloet
fd4826d06f Fix for Bug #222, config is always written to user location now 2012-03-22 12:34:43 +01:00
Marc Zinnschlag
47828f91f0 Issue #217: added getWeight function to ContainerStore 2012-03-22 09:45:48 +01:00
Chris Robinson
bac6df5563 Avoid leaking an ffmpeg stream 2012-03-21 23:32:24 -07:00
Chris Robinson
15317796bf Handle the wav -> mp3 extension conversion in the sound output backend 2012-03-21 22:49:40 -07:00
Chris Robinson
f11e3e39a1 Add an enumerate method to the sound output interface 2012-03-21 20:15:01 -07:00
Chris Robinson
366c97c492 Use a separate method to check for finished sounds and update the listener 2012-03-21 19:24:38 -07:00
Chris Robinson
e6fe1c0261 Remove a mostly unneeded wrapper function 2012-03-21 19:08:11 -07:00
Chris Robinson
aecc77a73c Replace the sound file extension when opening fails 
This should make it more efficient to lookup a sound instead of checking each
time it's played. A better method would perhaps be to check if the resource
exists when the ESM is loaded and replace it then as needed.
 2012-03-21 18:42:48 -07:00
Chris Robinson
8056a7f20b Throw an exception when looking up a sound instead of returning an empty string 2012-03-21 18:20:32 -07:00
Chris Robinson
9a139f511f Avoid redefining SOUND_IN 2012-03-21 15:29:05 -07:00
Chris Robinson
56c3b988cc Avoid copying the region when looking for a sound to play 2012-03-21 15:19:40 -07:00
Chris Robinson
8c5f85ca83 Use a local variable to mark sound streams as finished while processing 
This avoids a race condition where the source can underrun while the final
buffers are being queued and the sound can be detected as stopped
 2012-03-21 14:49:29 -07:00
Chris Robinson
6a85ef1229 Set Ogre's data stream to NULL when closing the audio file 2012-03-21 14:46:29 -07:00
Chris Robinson
0d973ac8ff Use the vector's data field instead of the address of the first element 
Same thing really, but less convoluted
 2012-03-21 14:38:37 -07:00
Chris Robinson
fd8326e958 Better handle some ffmpeg errors 2012-03-21 12:20:36 -07:00
scrawl
9b31b6272f fixed the mouse cursors and fixed MWAttribute & MWSkill 2012-03-21 16:07:56 +01:00
scrawl
64212c0ee6 replaced all the StaticImage and StaticText in code 2012-03-21 14:54:02 +01:00
scrawl
b0b41a9199 should now compile warning free 2012-03-21 13:48:57 +01:00
scrawl
97ab48993e more deprecated fixes 2012-03-21 13:32:32 +01:00
scrawl
deeb21a131 switched to the new multi-delegates system 2012-03-21 13:27:08 +01:00
Marc Zinnschlag
3dcfcf46cb Issue #217: container change tracking 2012-03-21 12:48:05 +01:00
Marc Zinnschlag
a0ee2954bd Issue #217: moved some functino implementations from ptr.hpp to ptr.cpp 2012-03-21 12:29:07 +01:00
Marc Zinnschlag
0adbe258fd Issue #217: made Ptr track container; fixed a cmake script bug 2012-03-21 12:20:19 +01:00
Chris Robinson
7b22ee6fd1 Use for_each to clear the ffmpeg stream packets 2012-03-20 21:46:12 -07:00
Chris Robinson
2989a1e06e Improve ffmpeg failure messages 2012-03-20 18:57:11 -07:00
Chris Robinson
26a441f29a Add a readAll method to the sound decoder, for potentially more efficient reading 2012-03-20 17:57:28 -07:00
Chris Robinson
deb473b9ae Implement the ffmpeg decoder 2012-03-20 17:05:19 -07:00
Chris Robinson
9a48002025 Fix compilation of the FFmpeg decoder 2012-03-20 14:13:58 -07:00
Chris Robinson
e48745b68e Fix streamMusic's path lookup 2012-03-20 12:39:49 -07:00
scrawl
d451d7bb67 compile fixes for mygui 3.2 2012-03-20 20:24:36 +01:00
scrawl
66baf9ec81 Merge branch 'master' into mygui 2012-03-20 20:02:30 +01:00
Chris Robinson
fc27d5cc19 Restore music playback 2012-03-20 11:31:13 -07:00
Chris Robinson
5ae47f783e Use the sound manager's update to make sure music is still playing 2012-03-20 10:46:10 -07:00
Chris Robinson
0261aac518 Use Ogre's resource group manager to handle sound files 2012-03-20 10:34:36 -07:00
Chris Robinson
80dbf82a74 Explicitly stop sounds instead of relying on their deletion to do it 2012-03-20 07:22:17 -07:00
Chris Robinson
74e79bb4af Merge remote branch 'zini/master' into sound-rewrite 
Conflicts:
	apps/openmw/mwsound/soundmanager.cpp
	apps/openmw/mwsound/soundmanager.hpp
 2012-03-20 06:17:02 -07:00
Marc Zinnschlag
1023ddd587 silenced some warnings 2012-03-20 10:30:21 +01:00
Marc Zinnschlag
4d0d941c2e Merge remote branch 'kromgart/master' 2012-03-20 10:17:35 +01:00
Marc Zinnschlag
2d135d81e7 Merge remote branch 'lgro/glibc_pthreads_fix' 2012-03-20 10:15:47 +01:00
Marc Zinnschlag
6a0474a977 removed some cout spam 2012-03-20 10:15:22 +01:00
Marc Zinnschlag
aca274cbca Merge remote branch 'gus/DialogueSystem' 2012-03-20 10:11:40 +01:00
Marc Zinnschlag
ef711ffdc1 Merge remote branch 'scrawl/weather' 2012-03-20 10:08:43 +01:00
Pieter van der Kloet
0b517d15c1 Made missing data files dialog less scary and added exception handling for esmreader 2012-03-20 02:49:59 +01:00
Jason Hooks
2b3e75718c Updating everything 2012-03-19 20:03:48 -04:00
Jason Hooks
ed7cb1dc67 restarting 2012-03-19 19:38:44 -04:00
scrawl
04c6f23a2b disabled solstheim weather (we can't travel there anyway) 
also, there was a bug that could cause this weather to show up on
morrowind, which is fixed now
 2012-03-19 22:54:04 +01:00
gugus
7a1ff61541 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-19 21:31:36 +01:00
Chris Robinson
fd37a4827c Enforce a 15MB limit on the sound buffer cache 2012-03-19 13:19:22 -07:00
Lukasz Gromanowski
fc95917253 Fix for not visible pthreads function with glibc 2.15 
Linking error will appear:

Linking CXX executable ../../openmw
/usr/bin/ld: CMakeFiles/openmw.dir/__/__/components/bsa/bsa_archive.cpp.o: undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
/usr/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib/libpthread.so.0 so try adding it to the linker command line
/lib/libpthread.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status

if we don't add explicitly pthreads library to linker flags
after update glibc to version 2.15 on (Arch) Linux.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-03-19 20:54:30 +01:00
Roman Melnik
88979577db Change 'nullptr' to 'NULL' (after fixing bug#192 in previous commit) 2012-03-19 21:45:53 +02:00
Chris Robinson
04638516b2 Check for stopped active sounds too and remove them 2012-03-19 12:08:40 -07:00
Roman Melnik
a9759c3f33 Fix bug #192: Remove the focus from the console when console is closed 
(set current keyFocusWidget to nullptr)
 2012-03-19 21:01:00 +02:00
Marc Zinnschlag
b46a2bfa01 Merge remote branch 'werdanith/journalmessage' 2012-03-19 19:34:28 +01:00
Marc Zinnschlag
f2a47d421b some cleanup 2012-03-19 19:21:08 +01:00
Michael Papageorgiou
82c4bfbf18 Add a notification when the journal is updated 2012-03-19 20:18:08 +02:00
gugus
d4f3430fc6 fix: topics who should not be displayed are not displayed anymore. 2012-03-19 19:17:20 +01:00
Chris Robinson
6c45d6668b Cache OpenAL buffers for easy reuse 2012-03-19 10:33:06 -07:00
gugus
2707391535 fix for questions 2012-03-19 18:30:52 +01:00
gugus
11569819db compilation fix 2012-03-19 18:01:54 +01:00
gugus
ba4d44eb67 fix for questions. 2012-03-19 18:01:41 +01:00
Chris Robinson
91821ccd8c Add the sound stream to the thread after resetting the mIsFinished flag 2012-03-19 09:08:59 -07:00
Chris Robinson
db46bf39b3 Add a rewind method to the sound decoder 2012-03-19 08:48:25 -07:00
Chris Robinson
afa2cb6de7 Stop trying to read decoded audio once it's finished 2012-03-19 07:51:28 -07:00
Chris Robinson
4f69972a9c Add a method to stream a sound in 3D 2012-03-19 07:28:03 -07:00
Chris Robinson
ae8218bf03 Allocate OpenAL sources when opening the device 
This allows sources to be more efficiently retrieved and returned
 2012-03-19 07:11:01 -07:00
Chris Robinson
8f9d4ff841 Use 6 125ms buffers for OpenAL streams 2012-03-19 05:29:04 -07:00
Chris Robinson
dc6354b2f9 Add functions to get string names for sample types and channel configs 2012-03-19 02:31:40 -07:00
Chris Robinson
4a0b5b7918 Increase the sound stream thread sleep time to 50ms 2012-03-19 02:19:13 -07:00
Chris Robinson
4698e8c0a2 Make the sound stream thread object per-device 2012-03-19 02:15:08 -07:00
Chris Robinson
2c27827e4f Add some comment markers to the OpenAL sound classes 2012-03-19 01:33:33 -07:00
Chris Robinson
e234b90173 Use a loop to find the OpenAL format from the decoder format 2012-03-19 00:49:52 -07:00
Chris Robinson
6a256d3993 Make sure the OpenAL stream list is clear before shutting down 2012-03-19 00:38:56 -07:00
Jason Hooks
fe9e6a732c Some cleanup 2012-03-18 22:32:46 -04:00
Jason Hooks
51fb9e67cd Merge 2012-03-18 21:31:31 -04:00
gugus
7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-19 00:20:43 +01:00
gugus
1a832a65f6 Changed a lot of things. Topics can now change durring dialogue without bug. 
Missing: ability to remove keyword
 2012-03-19 00:19:58 +01:00
Chris Robinson
7194114669 Use a background thread to keep OpenAL streams fed 
Maybe this could be moved to the SoundManager instead of in OpenAL, but it's
good enough for now.
 2012-03-18 14:42:19 -07:00
Michael Papageorgiou
d10b18b0f3 Removed a couple of warnings with nosound 2012-03-18 22:50:52 +02:00
gugus
ff5d4b24fc journal filter works now 2012-03-18 21:47:43 +01:00
Michael Papageorgiou
f567950e25 Fix for the --nosound crash 2012-03-18 22:38:53 +02:00
Marc Zinnschlag
af39275a63 Merge remote branch 'scrawl/weather' 2012-03-18 21:07:04 +01:00
scrawl
1907e21207 removed preprocessor constants 2012-03-18 20:44:56 +01:00
scrawl
c2329b7027 removed preprocessor constants 2012-03-18 20:32:50 +01:00
Chris Robinson
b938fd7b36 Make the sound output init return void 2012-03-18 12:19:54 -07:00
Chris Robinson
1965b5bc79 Rename some Sound class member functions 2012-03-18 12:03:15 -07:00
Chris Robinson
403e51cef3 Move the sample type and channel config enums to MWSound and give use appropriate names for the values 2012-03-18 11:56:54 -07:00
Chris Robinson
efae7dfe83 Rename some sound decoder class member variables and functions 2012-03-18 11:47:15 -07:00
Chris Robinson
9656456d30 Make sure the sound decoders are closed when they're finished with 2012-03-18 11:34:23 -07:00
Chris Robinson
362e254720 Rename some more sound class member variables and functions 2012-03-18 11:30:53 -07:00
Chris Robinson
162642e672 Prefix some SoundManager class member variables 2012-03-18 11:17:45 -07:00
gugus
9c85a8c1ce Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-18 19:06:52 +01:00
Marc Zinnschlag
ce2cb709c5 fixed getJournalIndex function 2012-03-18 19:05:35 +01:00
gugus
00d3bc9d23 every filters are check during dialogue now. There is a problem with journal. 2012-03-18 18:58:22 +01:00
gugus
7f2ff6f5f1 removed the TODO 2012-03-18 18:05:28 +01:00
gugus
4afe6dd235 death filter 2012-03-18 18:04:51 +01:00
gugus
48e6a42168 Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanager.cpp
 2012-03-18 17:59:11 +01:00
gugus
34b33b78d2 better filters 2012-03-18 17:58:14 +01:00
Marc Zinnschlag
76b24d9d1a fixed a compile error 2012-03-18 17:30:05 +01:00
Chris Robinson
2f92559fc7 Use OpenAL's linear attenuation model 
We should use the inverse distance clamped model (the default), but we first
need to handle muting sounds that are beyond their max distance. Linear
attenuation doesn't give a proper rolloff, but it makes the sounds silent at
max distance.
 2012-03-18 09:05:38 -07:00
gugus
8740354c80 inventory filter now use player inventory 2012-03-18 17:03:54 +01:00
Chris Robinson
a256b9a7b0 Remove a comment about Audiere 2012-03-18 08:42:55 -07:00
gugus
019a28093b better filters 2012-03-18 15:26:18 +01:00
scrawl
3a00fbb950 removed mygui from source tree and use system install instead 2012-03-18 15:11:37 +01:00
Marc Zinnschlag
d9677cb33e fixed problem with parsing optional string arguments 2012-03-18 14:27:49 +01:00
gugus
100c6a42a5 better default values for filters 2012-03-18 11:32:05 +01:00
Marc Zinnschlag
655f9fe920 Merge remote branch 'k1ll/staticogre' 2012-03-18 11:16:34 +01:00
Marc Zinnschlag
af875896ad fix for issue #179 2012-03-18 11:09:38 +01:00
Chris Robinson
3fea3e7d25 Fix stereo files with libsndfile 2012-03-17 23:47:12 -07:00
Chris Robinson
f7ac94d686 Pass the new position to the sound update method 2012-03-17 23:41:45 -07:00
Chris Robinson
44fc204864 Avoid passing a sound decoder to the play methods 2012-03-17 23:30:43 -07:00
Chris Robinson
ddfa906922 Add a missing include 2012-03-17 22:45:28 -07:00
Chris Robinson
a69ec91242 Remove some unnecessary wrappers and do some small cleanups 2012-03-17 22:13:57 -07:00
Marc Zinnschlag
187b8e58d6 fixed handling of optional instruction/function arguments; removed choice workaround 2012-03-17 19:32:44 +01:00
Chris Robinson
a91085a1b9 Add a couple comments 2012-03-17 10:45:11 -07:00
Chris Robinson
7160d20db3 Be more consistent with the vector orientations given the sound handler 2012-03-17 10:36:34 -07:00
Chris Robinson
cbeff4657f Pass the loop and untracked flags when playing a 3d sound 2012-03-17 10:16:22 -07:00
Chris Robinson
87adf6002a Fix a copy-paste typo in the openal output 2012-03-17 09:57:39 -07:00
Chris Robinson
5563f583ff Add and implement methods to update tracked sounds on an object 2012-03-17 09:51:03 -07:00
Chris Robinson
979ae89aab Pass volume and pitch parameters to streamed sounds 2012-03-17 09:37:41 -07:00
Chris Robinson
cac07d0fbf Remove some unnecessary methods 2012-03-17 09:27:31 -07:00
Chris Robinson
e49a090af7 Remove unnecessary hack 2012-03-17 09:16:09 -07:00
Chris Robinson
d57051375d Implement non-streaming sounds with OpenAL 2012-03-17 09:15:47 -07:00
gugus
f87bd65ae1 Merge branch 'DialogueSystem' of github.com:scrawl/openmw into DialogueSystem 2012-03-17 17:00:28 +01:00
gugus
846196d048 fixed a crash 2012-03-17 16:56:22 +01:00
Chris Robinson
9adf1e8461 Keep a handle on played sounds 2012-03-17 08:02:46 -07:00
scrawl
21143f006b fix several warnings 2012-03-17 15:47:22 +01:00
scrawl
9d4f79bcfc GCC compile fix 2012-03-17 15:24:47 +01:00
Michael Papageorgiou
dbbf50a184 Journal sounds, close sound will be added later 2012-03-17 15:52:57 +02:00
Chris Robinson
656863ec6e Add functions to play sounds 2012-03-17 06:51:44 -07:00
Chris Robinson
a46f8ced05 Keep the sound output's listener updated with the camera position 2012-03-17 06:18:59 -07:00
scrawl
5e939e4818 map window now works for interiors 2012-03-17 13:59:51 +01:00
scrawl
1840401172 weather transitions (e.g. from clear to cloudy) use timescale 2012-03-17 13:14:31 +01:00
scrawl
3ae69f792a no light-"jumps" during night 2012-03-17 12:57:52 +01:00
Chris Robinson
2dabdcb9e5 Add a function to update the sound listener 2012-03-17 04:22:54 -07:00
Chris Robinson
2429755bf1 Make the sound's Play method return void 2012-03-17 03:20:43 -07:00
Chris Robinson
caf5d71d44 Make the sound decoder's Open method return void 
Errors are thrown, not returned
 2012-03-17 03:18:28 -07:00
Chris Robinson
1b41987e18 Move OpenAL_SoundStream function definitions out of the class 2012-03-17 03:15:07 -07:00
Chris Robinson
2f6b73d461 Prevent streamMusic from throwing an exception 2012-03-17 03:06:35 -07:00
Chris Robinson
207d7dd89e Stop and delete the current music before deleting the sound output 2012-03-17 03:01:51 -07:00
Chris Robinson
1ade01edc8 Add a function to stream sounds 2012-03-17 02:55:08 -07:00
Chris Robinson
9cf42f6d0f Flesh out the sound decoder a bit more 2012-03-17 02:51:46 -07:00
Chris Robinson
637617056b Make a skeleton Sound class 2012-03-17 02:45:18 -07:00
Chris Robinson
246b0266fb Remove references to Audiere. It's not supported for now. 2012-03-17 00:11:59 -07:00
Chris Robinson
46cd84aac5 Add a skeleton ffmpeg decoder 2012-03-16 23:59:21 -07:00
Chris Robinson
1322b1e160 Move Sound_Output's definition to a separate header 2012-03-16 23:40:07 -07:00
Chris Robinson
10037e79e7 Add a skeleton decoder class using mpg123 and libsndfile 2012-03-16 23:18:15 -07:00
Chris Robinson
45b612ab3b Add a skeleton output classs using OpenAL 2012-03-16 22:12:17 -07:00
Chris Robinson
42b445383f Remove Mangle- and OpenEngine-related sound code 
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
 2012-03-16 17:08:13 -07:00
scrawl
3e4cf64a77 Merge branch 'master' into shaders 2012-03-16 20:46:18 +01:00
scrawl
5ea2122f79 sun gradually disappears 2012-03-16 20:39:58 +01:00
scrawl
d18b3271b1 transition tweak 2 2012-03-16 20:32:41 +01:00
scrawl
460b584934 transition tweaks 2012-03-16 19:49:01 +01:00
scrawl
a67cc8e73b more fixes 2012-03-16 19:02:33 +01:00
gugus
10321ff51a Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-16 17:58:23 +01:00
gugus
042d87f77f a lot of clean up 2012-03-16 17:53:34 +01:00
gugus
91801e5cab stop spamming messages 2012-03-16 17:39:14 +01:00
gugus
56a84b6a1a choices works. The only thing remaining is the script arguments problems. 
Need a lot of clean up too.
 2012-03-16 17:30:59 +01:00
scrawl
c885ec1bd1 Merge branch 'master' into minimap 2012-03-16 17:10:27 +01:00
scrawl
91d2031eb7 first attempt at map window 2012-03-16 17:09:31 +01:00
Michael Papageorgiou
b2c6d52db1 Another file search fix 2012-03-16 09:00:18 +02:00
scrawl
877cb2aca7 much better looking moons 2012-03-15 20:35:23 +01:00
scrawl
e354203c21 stars rotation 2012-03-15 19:49:15 +01:00
Alexander "Ace" Olofsson
e8eea03b4c Fixed a few more non-virtual destructor warnings 2012-03-15 17:40:42 +01:00
Nikolay Kasyanov
65fc141b62 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-15 20:38:21 +04:00
Marc Zinnschlag
a7211d2a90 Merge remote branch 'werdanith/searchfix' 2012-03-15 16:54:29 +01:00
Michael Papageorgiou
588ac44bc7 Improved matching for the FileListLocator 2012-03-15 17:32:10 +02:00
Marc Zinnschlag
5b378e820d warning level adjustments and some related fixes 2012-03-15 16:01:41 +01:00
k1ll
b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 2012-03-15 15:51:39 +01:00
Marc Zinnschlag
6f9d9c0f9e another armour class detection fix 2012-03-15 15:05:14 +01:00
Marc Zinnschlag
7ab20c3eb1 fixed armour class detection 2012-03-15 14:36:12 +01:00
Marc Zinnschlag
c616d005e8 fixed a spelling mistake 2012-03-15 14:31:16 +01:00
Marc Zinnschlag
3c3fb8d706 Merge remote branch 'werdanith/activationsounds2' into equipment 2012-03-15 14:06:48 +01:00
Michael Papageorgiou
f7c7ed0ac7 Fix regression with locating sound files 2012-03-15 13:56:46 +02:00
scrawl
2edd7e59f4 some fixes and facilities for saving the fog of war to disk 2012-03-14 20:44:06 +01:00
gugus
07d8d654cd one step toward function filters and end choices. 2012-03-14 18:47:29 +01:00
scrawl
5a46d58da5 fully working fog of war 2012-03-14 17:44:19 +01:00
scrawl
583a25f634 fog of war rendering (incomplete) 2012-03-14 14:51:58 +01:00
Nikolay Kasyanov
a8e25bc32c Feature #37 (In Progress) Render Path Grid 
improved path grid point mesh (closer to vanilla MW)
 2012-03-14 15:03:04 +04:00
Marc Zinnschlag
81abd97753 Merge remote branch 'scrawl/weather' 2012-03-14 09:40:22 +01:00
Marc Zinnschlag
010c8e6041 Merge remote branch 'scrawl/viewingdistance' 2012-03-14 09:35:24 +01:00
Nikolay Kasyanov
3a705baa29 Feature #37 (In Progress) Render Path Grid 
added simple pathgrid edges
 2012-03-14 03:06:56 +04:00
Michael Papageorgiou
947288e13a Merge master and rewrite around the new detection function 2012-03-14 00:38:44 +02:00
scrawl
e8267c7363 adjusted fog distance, prevents objects suddenly popping up on cell load 2012-03-13 22:14:35 +01:00
scrawl
8421fd2670 fixed a visual issue with the stars 2012-03-13 19:57:33 +01:00
Michael Papageorgiou
db9085ae59 Pickup sounds for weapons 2012-03-13 20:40:30 +02:00
Michael Papageorgiou
7c1475b723 Pickup sounds for potions, repair, gold, lights, rings 2012-03-13 20:01:55 +02:00
Michael Papageorgiou
34e18df0fe Pickup sounds for apparatus, books, clothes, ingredients, lockpicks, misc and probes 2012-03-13 18:50:32 +02:00
scrawl
118250171d Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders 
Conflicts:
	apps/openmw/mwrender/objects.cpp
 2012-03-13 17:31:10 +01:00
scrawl
f46d9b094b fix weather sounds sometimes playing in interiors 2012-03-13 17:25:07 +01:00
scrawl
b43281a66b Merge branch 'terrain_next' into terraincollision 
Conflicts:
	CMakeLists.txt
 2012-03-13 17:14:49 +01:00
scrawl
9612ce595b Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision 
Conflicts:
	CMakeLists.txt
 2012-03-13 17:09:50 +01:00
Michael Papageorgiou
6dddf8a3d5 Pickup sounds for armors 2012-03-13 18:05:38 +02:00
scrawl
4813a1ce9d Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 2012-03-13 16:00:59 +01:00
scrawl
771f920c2c Merge branch 'master' of https://github.com/zinnschlag/openmw into minimap 2012-03-13 15:59:09 +01:00
Marc Zinnschlag
cbbc295eb6 implemented new equipment functions in MWClass 2012-03-13 15:35:06 +01:00
Marc Zinnschlag
c314cddb1c added getEquipmentSkill function to Class hierarchy 2012-03-13 14:27:13 +01:00
Marc Zinnschlag
ea336214de more inventory sanity checks 2012-03-13 14:04:19 +01:00
Marc Zinnschlag
4b73116b9d added getEquipmentSlots function to MWWorld::Class hierarchy 2012-03-13 13:50:11 +01:00
Marc Zinnschlag
635b7ec6cb slot system 2012-03-13 13:31:11 +01:00
Michael Papageorgiou
703e484a92 Doors and Containers sounds, now in 3D 2012-03-13 14:17:49 +02:00
Michael Papageorgiou
836732096e Fix both relative and 3D sounds 2012-03-13 14:08:32 +02:00
Marc Zinnschlag
222b5b741e Merge branch 'master' into equipment 2012-03-13 12:14:47 +01:00
Pieter van der Kloet
1ed1c29db9 Fix Boost path problem for Boost versions below 1.43 2012-03-12 14:46:48 +01:00
Pieter van der Kloet
96c0b8760e Got rid of the console showing up on Windows and removed libpng stuff 2012-03-12 02:37:40 +01:00
Nikolay Kasyanov
f292a5a7ca Feature #37 (In Progress) Render Path Grid 
now using mwRoot instead of ogre's root, so no more messing with coordinates.
 2012-03-12 02:37:07 +04:00
Jason Hooks
6d346933db gus's changes 2012-03-10 17:45:34 -05:00
Nikolay Kasyanov
4659076129 Feature #37 (In Progress) Render Path Grid 
workaround for strange ESMStore bug
 2012-03-10 20:45:55 +04:00
Nikolay Kasyanov
11f957a64d Feature #37 (In Progress) Render Path Grid 
cubes for path grid points
strange crash when trying to get path grids from Debugging
 2012-03-10 20:03:00 +04:00
scrawl
fa68be2b19 set map window cell name 2012-03-10 16:05:12 +01:00
scrawl
5b38b17baf local map rendering (nothing to see yet, as it is not displayed in GUI) 2012-03-10 15:28:18 +01:00
Nikolay Kasyanov
6357adffcf Fixed typo 2012-03-10 18:13:44 +04:00
Nikolay Kasyanov
5328853445 Feature #37 (In Progress) Render Path Grid 
added "togglepathgrid" script command
 2012-03-10 18:13:44 +04:00
Marc Zinnschlag
79158b9325 NPCs are using InventoryStore instead of ContainerStore from now on 2012-03-10 12:49:54 +01:00
Marc Zinnschlag
84c8cd3720 added InventoryStore class (doesn't do anything yet) 2012-03-10 12:49:27 +01:00
Marc Zinnschlag
5562653578 provisionally fill up containers on cell load 2012-03-10 12:36:29 +01:00
Marc Zinnschlag
06e0706b35 added fill and clear functions to container store 2012-03-10 12:11:07 +01:00
scrawl
2196e1321b added weather sounds 2012-03-09 18:30:03 +01:00
Marc Zinnschlag
c259b25fcf Merge remote branch 'werdanith/soundmanagerrefactor' 2012-03-09 17:27:11 +01:00
Michael Papageorgiou
6f46f2b7a0 SoundManager: add the ability to play non-3d looping sounds 2012-03-09 18:10:23 +02:00
Michael Papageorgiou
a309ef7b55 Corrected setPlaylist and added stopMusic 2012-03-09 03:56:29 +02:00
Michael Papageorgiou
44620ada86 SoundManager: Finish up with Task #172, plus cleanup 2012-03-09 03:22:16 +02:00
Michael Papageorgiou
ad6175c78a SoundManager: Set up the priority for file look up right and take care of a corner case 2012-03-08 23:06:52 +02:00
gugus
82c6b0f92a choice function. Do not work. 2012-03-07 18:52:27 +01:00
gugus
6f7752633a there was no extension in the compiler context. Corrected. But Choice doesn't work. 2012-03-07 18:44:09 +01:00
gugus
39415f0b4a fix compilation bug with Visual C++ 2012-03-07 17:35:10 +01:00
Michael Papageorgiou
054a176c86 Added new FileLibrary class to handle music, this fixes a number of issues. 2012-03-07 17:46:51 +02:00
scrawl
8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 2012-03-07 13:29:59 +01:00
gugus
4990ba48ed Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-07 09:47:46 +01:00