teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
10219 commits 34 branches 0 tags 66 MiB
Commit graph

1484 commits

Author SHA1 Message Date
scrawl
8fd961bbac Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't. 2013-03-31 15:50:48 +02:00
scrawl
1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 2013-03-31 14:50:03 +02:00
scrawl
bc6e1fd981 Add missing files 2013-03-31 14:36:03 +02:00
scrawl
b0199c703c Companion UI 2013-03-31 13:13:46 +02:00
scrawl
e27e53f607 Fix not playable body parts appearing in the race selection menu. 2013-03-30 20:04:05 +01:00
Glorf
7dbc779c3a Self-enchanting mechanics 2013-03-30 19:08:42 +01:00
scrawl
0f0cc0e3e3 Fix a few gold conditions that I missed, trade window was affected 2013-03-30 18:29:21 +01:00
scrawl
51204f098e Added soulgem dialog; made interactive message boxes not close the previous UI 2013-03-30 15:51:07 +01:00
scrawl
e7af718b55 Remove unnecessary WindowManager::messageBox arguments 2013-03-30 12:56:37 +01:00
scrawl
04673b2f14 Don't enchant if the enchantment value is too high for the item 2013-03-30 12:54:20 +01:00
Marc Zinnschlag
573368849b Merge remote-tracking branch 'glorf/enchanting' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2013-03-29 16:48:21 +01:00
Glorf
86275e5bd4 Some enchanting fixes 2013-03-29 12:00:09 +01:00
Glorf
6643fe789c Enchanting system 2013-03-28 17:41:00 +01:00
scrawl
564256c4e1 Fix the spell icon panel being visible when it shouldn't. 2013-03-27 18:04:15 +01:00
scrawl
6a2b87e14a Fix dialogue response coloring for creatures 2013-03-25 17:37:59 +01:00
scrawl
4be0c6b708 Fix topics not being selectable for creatures 2013-03-25 17:32:01 +01:00
Marc Zinnschlag
6c76e97bbc fixed day count in rest dialogue 2013-03-25 11:53:02 +01:00
scrawl
a2ca679beb Added PC repair feature 2013-03-23 08:16:46 +01:00
scrawl
20774f8f81 Added merchant repair feature 2013-03-22 14:13:10 +01:00
scrawl
918cdcffc2 Split up components/esm/loadlocks 2013-03-22 05:50:54 +01:00
scrawl
4cbb202306 Several tooltip fixes 2013-03-20 03:31:01 +01:00
scrawl
b9c3a4816d Fix dialogue topics still being accessible in the history pane when they shouldn't be 2013-03-20 03:30:15 +01:00
scrawl
6c1ff8caca Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
 2013-03-20 02:29:03 +01:00
Glorf
3bd545ed8e In-console nonexistent class fix 2013-03-19 21:55:37 +01:00
Glorf
dd11ae04ee Console code cleaned 2013-03-19 17:25:41 +01:00
Glorf
f5bf7254a8 Minor console selection improvements 2013-03-18 23:46:17 +01:00
Glorf
a07c910d0b Feature #535: Console object selection improvements 2013-03-18 21:33:12 +01:00
Marc Zinnschlag
08f6d04960 constness fixes 2013-03-18 08:29:40 +01:00
Marc Zinnschlag
19c3b5516d Merge remote-tracking branch 'glorf/fallbacks-next' into next 2013-03-18 08:14:25 +01:00
scrawl
95e1cdc07d Move getArmorRating to MWWorld::Class. 2013-03-17 22:29:12 +01:00
scrawl
c66675b599 Fix the 'Take all' button taking equipped items when stealing 2013-03-17 22:28:28 +01:00
Glorf
ea7f386e7d Access to Fallback via getFallback 2013-03-17 13:50:15 +01:00
scrawl
dd57eabc3e Better use an enum for magic effect IDs 2013-03-16 23:28:26 +01:00
scrawl
1666bc7740 Armor rating 2013-03-16 22:53:33 +01:00
scrawl
cebcbe11f8 Implemented service refusal 2013-03-16 20:32:21 +01:00
scrawl
c0b0227e8a enchanting 2013-03-16 19:00:14 +01:00
scrawl
3e9cd0e2e3 Fix the back button on generate class result dialog advancing creation stage 2013-03-14 22:33:51 +01:00
scrawl
c4a42f2e1f Fix infinite recursion on shutdown caused by incorrect onWidgetDestroy listener 2013-03-13 23:17:25 +01:00
scrawl
0223df4dfc Fix invalid cast exception in the spell creation dialog 2013-03-13 19:45:22 +01:00
scrawl
fdcbdbf35d Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay 2013-03-13 19:44:34 +01:00
scrawl
4c588cbab6 Levelup dialog is now dynamic; added level descriptions 2013-03-12 17:18:47 +01:00
Glorf
93de570f9a Moved specializations out of step 2013-03-10 15:58:29 +01:00
Glorf
04e99ee9d6 Character creation struct consts 2013-03-10 15:15:33 +01:00
Glorf
1ef682896a Character creation questions import 2013-03-10 15:03:48 +01:00
scrawl
a51b73b609 Fix topics that have the same name as a service opening that service when clicked 2013-03-09 21:50:01 +01:00
Sebastian Wick
0ae48c1f83 fix for Bug #509 2013-03-09 20:40:59 +01:00
scrawl
b19571df89 If character creation dialogs are enabled in the wrong order, force creation stage to advance 2013-03-09 14:59:50 +01:00
scrawl
d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 2013-03-08 23:46:25 +01:00
scrawl
0ee0dbdb97 Added "dispose corpse" button, added stealing (all items visible and no penalty yet) 2013-03-07 14:00:13 +01:00
scrawl
e34685b8a3 Fix manually changed mouse cursor 2013-03-07 12:46:26 +01:00
scrawl
39411eda7b Fix the spell buying window listing already owned spells 2013-03-06 15:11:40 +01:00
Marc Zinnschlag
dc3edc6024 Merge branch 'vartype' 2013-03-05 10:59:08 +01:00
Marc Zinnschlag
ba4907fbaf use new Variant type for GMSTs 2013-03-05 08:02:27 +01:00
Marc Zinnschlag
8a887a0aef Merge remote-tracking branch 'potatoesmaster/tradewindow' 2013-03-04 19:42:51 +01:00
scrawl
d5c6c221c1 Books/scrolls: Fix the take button incorrectly showing 2013-03-04 17:28:01 +01:00
Emanuel Guevel
8e07638699 Update the trading offer on "max sale" button click 2013-03-04 12:24:41 +01:00
scrawl
c9fefc7f5d Simpler, more lightweight underwater effect, changed colors to match vanilla better 2013-03-03 19:28:11 +01:00
scrawl
5341bf9504 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:51:58 +01:00
Marc Zinnschlag
3e97943e06 Merge remote-tracking branch 'scrawl/includes' 2013-03-03 15:37:13 +01:00
scrawl
9a84f6744f Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr) 2013-03-03 13:11:02 +01:00
scrawl
6037c44ea6 Fix ingredient effect display 2013-03-03 12:41:57 +01:00
scrawl
8e05c4159d Magic effect icons for permanent enchantments 2013-03-03 12:17:37 +01:00
scrawl
cf87708c1f Magic effect icons for spells 2013-03-03 12:01:19 +01:00
scrawl
0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
 2013-03-03 11:02:38 +01:00
scrawl
ef1678e47e Oops, rotation center should be dynamic 2013-03-01 22:32:02 +01:00
scrawl
d8f2d0195a Got rid of the texture rotation hack by rendering the cursor manually. 2013-03-01 18:45:52 +01:00
scrawl
b7ab12e7cf Workaround to prevent the map drawing on top of the world button 2013-02-28 21:12:13 +01:00
vorenon
c9a701cfa1 Removed the 3 dots after the load text. 2013-02-28 19:25:18 +01:00
Marc Zinnschlag
ce1310614c Merge remote-tracking branch 'potatoesmaster/pinned' 2013-02-27 17:37:04 +01:00
Emanuel Guevel
be9d49c510 Do not hide pinned windows during loadings 2013-02-27 16:17:41 +01:00
scrawl
369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-27 09:25:44 +01:00
vorenon
89cba3cf45 Replaced ifs/elseifs with switch 2013-02-26 19:52:51 +01:00
vorenon
13c33c1613 added missing click sound to main menu 2013-02-26 19:37:47 +01:00
vorenon
b1ca719d61 Added click sound to OK button for message boxes 2013-02-26 16:37:59 +01:00
scrawl
d4264353a3 Merge branch 'z-up' into graphics 
Conflicts:
	apps/openmw/mwrender/localmap.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/water.cpp
	files/materials/water.shader
 2013-02-26 14:54:53 +01:00
Marc Zinnschlag
dc445844d2 Merge remote-tracking branch 'scrawl/z-up' 2013-02-26 14:37:50 +01:00
scrawl
b9912a19e0 Z-up conversion: fix player arrow direction on global map 2013-02-26 14:31:30 +01:00
scrawl
284ba58e1e Z-up conversion: global map, shader fix 2013-02-26 13:52:01 +01:00
scrawl
2e7bc1a368 Z-up conversion: local map, fix tcg 2013-02-26 13:39:10 +01:00
Chris Robinson
da575b181e Use the correct GMST for the race menu 2013-02-25 13:04:17 -08:00
scrawl
b1fc68d44d Merge branch 'master' into graphics 2013-02-25 17:36:33 +01:00
scrawl
73d48a95f6 Add message box when the player tries to move when being overencumbered. 2013-02-25 16:31:48 +01:00
scrawl
cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 2013-02-25 15:12:03 +01:00
scrawl
dfe29db9cb Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation) 2013-02-25 06:57:32 +01:00
scrawl
0d6a3367d3 Water shader no longer depends on object shaders being enabled 2013-02-24 10:28:50 +01:00
scrawl
4b51184ec4 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 14:37:28 +01:00
Sergey Shambir
a3adcf752d TradeWindow: fixed coding style 
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
 2013-02-23 13:51:21 +01:00
scrawl
db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 04:13:51 +01:00
Emanuel Guevel
3dc28baa28 Remove "PinToggle" event from layout file 2013-02-20 01:31:10 +01:00
Emanuel Guevel
3ba3c71556 Make the "lock window" button to change state visually 2013-02-20 01:30:39 +01:00
Emanuel Guevel
43d6392921 Change the way pinnable window are made visible 
This ensure pinned window are not displayed in main menu, dialogue and
container mode.
 2013-02-20 01:00:13 +01:00
scrawl
32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-19 00:15:54 +01:00
scrawl
170a9762ac Fix travel services not actually costing gold. 2013-02-17 18:30:21 +01:00
Marc Zinnschlag
31bfe62bbc Merge remote-tracking branch 'scrawl/bug_562' into next 2013-02-17 17:41:19 +01:00
scrawl
d899f33444 Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now. 2013-02-17 16:00:31 +01:00
scrawl
00db13be32 Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed. 2013-02-17 15:56:22 +01:00
Marc Zinnschlag
b8c0c94d5f Merge remote-tracking branch 'wareya/master' into next 2013-02-17 08:58:41 +01:00
Wareya
c98a815581 Remove debug printing from previous commit 2013-02-16 13:37:25 -05:00
Wareya
f0220fb06b Implement "Rest Until Healed" 
Fixes: https://bugs.openmw.org/issues/563
 2013-02-16 13:35:03 -05:00
Marc Zinnschlag
910858c300 Merge remote-tracking branch 'sergeyshambir/guiconvience' into next 2013-02-16 14:50:42 +01:00
scrawl
7604fb51b6 CG no longer listed in the settings if the plugin isn't loaded. 2013-02-14 23:17:21 +01:00
scrawl
6a49ea9b4f Cleaning out some old bits 2013-02-13 18:39:36 +01:00
Sergey Shambir
7d7a1119da Fixed book text misalignment, at least in some cases 
https://bugs.openmw.org/issues/284
 2013-02-12 11:49:20 +04:00
Sergey Shambir
03803f19b5 BookTextParser: moved to Ogre::UTFString 
Font height and unicode characters glyph width now accounted correctly.
 2013-02-12 11:22:19 +04:00
Sergey Shambir
3b64389668 BookTextParser: fixed infinitive loop 2013-02-12 11:14:30 +04:00
Marc Zinnschlag
64d9d9e2ce Merge remote-tracking branch 'wheybags/master' into next 2013-02-10 17:29:28 +01:00
Tom Mason
c32c31f6d6 break after activating button 2013-02-10 15:41:02 +00:00
Tom Mason
158c6fc9fa pressing enter when a messagebox is prompting for "ok", will activate ok button 2013-02-10 14:58:46 +00:00
Sergey Shambir
59808c3e10 GUI: Birth and Class dialogs now both select 1st item in list at first 
time.
 2013-02-10 08:59:38 +04:00
Sergey Shambir
725bfe6372 TradeWindow: balance now changes per time if user holds +/- button 
pressed
 2013-02-10 08:50:36 +04:00
scrawl
d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-09 16:40:10 +01:00
scrawl
86d65519e3 Settings window fix 2013-02-05 23:57:30 +01:00
scrawl
608c112f34 Supply the new render window to mygui 2013-02-05 20:48:25 +01:00
scrawl
c4d518132f With the 1x1 background window trick, we can apply VSync without restart. Some issues left though. 2013-02-05 19:22:08 +01:00
scrawl
3772cd9257 Refraction can be disabled separately now 2013-02-05 14:29:46 +01:00
scrawl
5cc8af0f14 fix map positions 2013-02-03 20:06:03 +01:00
scrawl
15e51b76de Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth 2013-02-03 15:46:23 +01:00
Tom Mason
ac112ef972 refactored special variable code 2013-02-03 13:27:27 +00:00
scrawl
3ec703e6af Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-01 16:25:54 +01:00
Tom Mason
0f58e03343 Unequipping items will reset OnPCEquip variable 2013-01-31 19:04:39 +00:00
Emanuel Guevel
82287445af DialogueWindow: do not execute onFrame() when not visible 2013-01-15 00:59:48 +01:00
Jordan Milne
9b485a86ef resize the window in a slightly less bad way, fix my check in setUseHardwareCursors to be the right way round 2013-01-13 22:38:22 -04:00
scrawl
6c6ce4a05c Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-01-14 00:10:57 +01:00
Jordan Milne
d26e33eb26 Merge branch 'master' into sdl_input 2013-01-13 17:06:39 -04:00
Jordan Milne
b6ec64485c fix includes for Windows 2013-01-12 17:52:26 -04:00
Jordan Milne
5a6589af01 extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start 2013-01-12 11:57:29 -04:00
Marc Zinnschlag
f4ee8e2642 Issue #479: Added additional magnitude parameter to known spells 2013-01-12 13:10:20 +01:00
scrawl
2c3719a6f5 Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass. 2013-01-12 07:02:12 +01:00
scrawl
30136eb449 Update settings UI 2013-01-12 06:36:48 +01:00
Jordan Milne
eeacb04fe2 Fully working hardware cursors (if you compile SDL2 with XCursor support) 2013-01-11 09:32:29 -04:00
Jordan Milne
3fb920a66f Merge branch 'master' into sdl_input 2013-01-11 08:29:01 -04:00
Jordan Milne
f9b064d1bc add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully 2013-01-11 08:27:59 -04:00
scrawl
c71656493d Ingredient effects now correctly hide until the player has discovered them 2013-01-11 01:23:24 +01:00
Jordan Milne
eff26159d9 Merge branch 'master' into sdl_input 2013-01-10 18:03:35 -04:00
Marc Zinnschlag
274ff530dc Merge remote-tracking branch 'wheybags/master' 2013-01-10 11:53:42 +01:00
Marc Zinnschlag
4defb1a476 Merge remote-tracking branch 'trombonecot/lowerstring' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 2013-01-09 22:13:59 +01:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
Tom Mason
5bfdb2449d allowed dropObjectOnGround to be used on npcs, not just player 2013-01-09 18:53:14 +00:00
Nathan Jeffords
6ca87e108f updated loading screen to use the resource managers pattern matching when finding files 2013-01-09 08:54:03 -08:00
Jordan Milne
5fa77da9d4 Merge branch 'master' into sdl_input 2013-01-09 10:56:15 -04:00
Marc Zinnschlag
649ae645f3 Merge remote-tracking branch 'blunted2night/bug_495_v2' 2013-01-09 12:12:41 +01:00
Jordan Milne
1bf36c686c add ability to check if a window is on the stack (to see if we're in the main menu) 2013-01-09 06:09:47 -04:00
Jordan Milne
857bb42297 Create a separate scenemanager for each CharacterPreview instance 2013-01-09 01:44:15 -04:00
Nathan Jeffords
b9fbd6ae4b Factored faced object lookups into MWRender::World 
* Renamed MWWorld::World::getFacedHandle to getFacedObject.
 * Changed it to return an object pointer
 * Updated clients to use return object directly.
 2013-01-07 23:38:08 -08:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-07 13:25:15 +01:00
Marc Zinnschlag
fbb59302d9 Merge remote-tracking branch 'blunted2night/loading_screen_fix' 2013-01-04 10:50:59 +01:00
Nathan Jeffords
9afe4467d8 cache results of query for spash screen names 
ResourceGroupManager::listResourceNames returns a list of all resource
accessable which is expensive, this change caches the result of the
processed query so additional splash screen changes are quicker.
 2013-01-03 15:45:09 -08:00
scrawl
1718d735b5 Fix menu/journal/book/scroll buttons when using localised MW-installations 
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
 2013-01-03 01:09:03 +01:00
Marc Zinnschlag
ff74f687fb Merge remote-tracking branch 'lazydev/master' 2013-01-02 16:04:44 +01:00
lazydev
04cca2a1ce fix for http://bugs.openmw.org/issues/517 2013-01-02 18:58:52 +04:00
scrawl
86f30992d7 fix message boxes not appearing properly when e.g. trading 2013-01-01 22:00:14 +01:00
lazydev
7cd1e87fe8 Merge branch 'master' of git://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
 2013-01-01 22:18:21 +04:00
greye
7e0713f6c4 fix string case update 2012-12-31 11:22:40 +04:00
lazydev
cd5d95ed22 1. Dialogs in Russian version now works. 
2. Destination names it travel window are now translated
 2012-12-31 04:15:47 +04:00
Marc Zinnschlag
8b2785400b Merge remote-tracking branch 'trombonecot/comparestring' 2012-12-30 20:11:18 +01:00
eduard
69d9d22579 comparestring 2012-12-30 19:56:38 +01:00
scrawl
f56182cac2 fix journal window not rendering any text 2012-12-30 17:06:17 +01:00
eduard
c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
 2012-12-30 13:09:37 +01:00
eduard
8545667bbd string compare and tolower 2012-12-28 17:54:56 +01:00
Tom Mason
ad9b86058b replaced explicit text with GMST entries, thanks to zinnschlag 2012-12-27 15:28:13 +00:00
Tom Mason
299a1f32ed cleanup 2012-12-26 23:52:16 +00:00
Tom Mason
51fce62b69 Merge branch 'messageboxes' 2012-12-26 23:06:27 +00:00
Tom Mason
716fbbbd74 messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory 2012-12-26 22:57:53 +00:00
Tom Mason
a14b7e4a0f small fixes on text defines 2012-12-26 18:07:56 +00:00
Marc Zinnschlag
afc2e840ae renamed namespace TranslationData to Translation 2012-12-26 17:06:33 +01:00
Marc Zinnschlag
206c613b52 moved translation storage from GUI manager to engine 2012-12-26 17:03:37 +01:00
Marc Zinnschlag
4c28f3211b Merge remote-tracking branch 'lazydev/master' 2012-12-26 15:50:03 +01:00
lazydev
1f71395660 renaming of translation component; removing of C++11 features 2012-12-25 23:20:39 +04:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
Tom Mason
f2c6907244 Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work 2012-12-20 23:16:34 +00:00
scrawl
64210e6efa Revert "New Game button" 
This reverts commit c5dd0e1968.
 2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb Revert "remove commandline switch for new game" 
This reverts commit 86671096ec.
 2012-12-18 19:09:08 +01:00
scrawl
86671096ec remove commandline switch for new game 2012-12-16 16:14:49 +01:00
scrawl
c5dd0e1968 New Game button 2012-12-16 16:05:31 +01:00
scrawl
a3bd3a40ca fix 2 unrelated leaks 2012-12-16 00:47:29 +01:00
scrawl
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
 2012-12-11 22:28:23 +01:00
Marc Zinnschlag
386eec51c1 some skill usage fixes 2012-12-07 11:36:38 +01:00
eduard
ea8ee11ff7 tradding skill use 2012-12-06 14:25:53 +01:00
eduard
5332546541 tradding skill use 2012-12-06 13:58:52 +01:00
scrawl
3db850a7d1 Don't crash if no loading screens are found 2012-12-03 05:45:04 +01:00
scrawl
ea2bbec76e better fix for bed activation 2012-12-03 05:32:12 +01:00
Tom Mason
a6fd369e4e Fixed wait window reappearing after sleeping 2012-12-02 22:10:47 +00:00
Marc Zinnschlag
b25f2e88ce Issue #492: fixed double alchemy ingredients removal 2012-12-02 15:07:22 +01:00
Marc Zinnschlag
556d737f65 Merge remote-tracking branch 'trombonecot/windowformatting' 2012-12-02 14:36:36 +01:00
eduard
30d0e93cf4 Fix window formatting on tool tip with too log titles 2012-12-02 14:12:18 +01:00
eduard
7e7e6e2bcb Fix window formatting on tool tip with too log titles 2012-12-02 14:08:22 +01:00
scrawl
c4facc233e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-12-01 11:30:51 +01:00
scrawl
8e857587d7 fix a text coloring bug 2012-11-28 02:36:33 +01:00
scrawl
1def60dbe1 PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank 2012-11-28 02:15:34 +01:00
Marc Zinnschlag
a6c7f16a7b Merge remote-tracking branch 'scrawl/reputation' 2012-11-23 21:26:44 +01:00
scrawl
eb29b1593b ModReputation, SetReputation 2012-11-23 19:56:45 +01:00
scrawl
f218ef2675 fix separator 2012-11-23 19:21:13 +01:00
scrawl
1d7e92b6b3 dialogue fixes 2012-11-23 19:05:40 +01:00
scrawl
693eeabeca shiny: fix GLSL texture units when shaders were disabled 2012-11-19 13:55:26 +01:00
scrawl
dc67a547b0 global map explored overlay 2012-11-16 19:34:09 +01:00
scrawl
aefde3f5bc Merge branch 'master' into globalmap 2012-11-15 13:21:24 +01:00
Marc Zinnschlag
409d15576b Merge remote-tracking branch 'greye/player-model' 2012-11-12 14:18:38 +01:00
scrawl
11a8d5d70a Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 2012-11-10 21:19:41 +01:00
scrawl
7c22690116 Merge branch 'next' into globalmap 2012-11-10 21:19:10 +01:00
greye
623e00531d fix reentering race selection 2012-11-10 21:54:43 +04:00
greye
0d33d005a5 head/hair selection 2012-11-10 21:30:16 +04:00
greye
50867e8d87 fix gender selection update, main model visibility and couple of crashes 2012-11-10 19:57:50 +04:00
Marc Zinnschlag
0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 2012-11-10 14:59:52 +01:00
Marc Zinnschlag
d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 2012-11-10 12:36:01 +01:00
greye
b1ef0026a9 race selection/inventory preview character model update 2012-11-10 11:41:12 +04:00
scrawl
92bba18218 removed useless member 2012-11-10 00:47:24 +01:00
scrawl
94aeb15220 bartering disposition change 2012-11-10 00:38:45 +01:00
scrawl
33b4b29fbc persuasion mechanics, added reputation 2012-11-10 00:29:36 +01:00
scrawl
ace9ee9c83 persuasion dialog 2012-11-09 20:18:38 +01:00
scrawl
d53a7ade1e method names, disposition uint->int 2012-11-09 14:42:09 +01:00
scrawl
ae78eaeb28 fixed training, fixed todo comments 2012-11-08 23:21:03 +01:00
scrawl
b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2012-11-08 23:16:40 +01:00
scrawl
bf4e855260 fixed creatures 2012-11-08 22:31:08 +01:00
gugus
4634227f1c notify the user when the merchant doesn't accept the offer 2012-11-08 21:50:56 +01:00
scrawl
3d7146cd50 don't allow opening a window multiple times, primarily the console 2012-11-08 19:34:54 +01:00
greye
2a86432887 store birthsign in MWWorld::Player 2012-11-08 18:50:23 +04:00
gugus
0a883f4492 The player can now barter with merchants 2012-11-08 13:38:20 +01:00
greye
83e758ee50 clean up interfaces 2012-11-08 16:37:57 +04:00
greye
9dc9098fa7 update MWBase::World interface since records contains own id 2012-11-08 01:52:34 +04:00
greye
f818fa1ebf minor update since records contains own id 2012-11-08 01:39:24 +04:00
greye
5b9621bca5 store player record data in ESMStore 2012-11-08 01:36:43 +04:00
greye
9ab2c16055 store created character classes as dynamic records 2012-11-08 01:22:44 +04:00
Marc Zinnschlag
918316168f Merge remote-tracking branch 'greye/store' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp
 2012-11-07 19:34:28 +01:00
Marc Zinnschlag
0805301922 Merge remote-tracking branch 'bwrsandman/master' into next 2012-11-07 10:40:40 +01:00
bwrsandman
7911f08c53 Issue #438: set 0 a.m. to be 12 a.m. 2012-11-06 13:19:35 -05:00
greye
b3ad872845 new interface in manualref, fix various typos 2012-11-06 13:43:48 +04:00
greye
e74b2c060d disable createRecord(), Land constness hack, various fixes with Store<T> interface 2012-11-06 13:14:03 +04:00
greye
a9c1ce412a applying new interface vol.7, inconsistent 2012-11-06 11:29:18 +04:00
gugus
2841d831a6 Disposition is now updated everyframe 2012-11-05 23:16:37 +01:00
Marc Zinnschlag
a7da929496 Merge remote-tracking branch 'scrawl/master' into next 2012-11-05 22:46:42 +01:00
greye
4637503680 applying new interface vol.6, inconsistent 2012-11-06 00:34:11 +04:00
scrawl
646e689239 clear name edits when opening alchemy / spell creation 2012-11-05 20:47:28 +01:00
greye
42aae566a7 applying new interface vol.5, inconsistent 2012-11-05 23:41:26 +04:00
gugus
9ebe9cb40c Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes 2012-11-05 19:55:06 +01:00
gugus
aaf1b66c7e BarterOffer is used in other trading services too 2012-11-05 19:53:55 +01:00
Marc Zinnschlag
61942c9c4a Issue #440: Make day numbers start at 1 instead of 0 2012-11-05 18:01:50 +01:00
greye
d205723a17 resolving m prefix/ESMStore movement 2012-11-05 18:02:47 +04:00
greye
8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 2012-11-05 17:41:36 +04:00
greye
2057f5619e move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f m prefix for mwworld/cellstore.hpp 2012-11-05 16:07:59 +04:00
gugus
f72f898bd9 implement barterOffer. It's used for travel only. 
I've started to implement disposition, but it's very basic for now.
 2012-11-05 11:07:43 +01:00
Marc Zinnschlag
6f7a621b6f disabled enchanting unfinished enchantment GUI for now 2012-11-04 23:15:20 +01:00
scrawl
38828acac9 transparent overlay 2012-11-04 12:13:04 +01:00
scrawl
ba2fc2d6f8 better fix for chargen button colors 2012-11-04 11:37:47 +01:00
emoose
c8cc6b6e65 Fixed: engine: Bug #437 Stop animations when paused; tooltips: capitalize first letter (eg paper -> Paper) 2012-11-03 16:39:32 +00:00
emoose
b70b8cc4bc Fixed: character creation: make OK button grayed out/disabled (loses the hoverover when it's re-enabled though...) 2012-11-03 06:02:33 +00:00
emoose
4a9821dc65 fix kdevelop indentation... 2012-11-02 20:43:07 +00:00
emoose
15f972cc62 fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit 
todo: going from CharacterCreation back to CreateClassDialog loses data
 2012-11-02 20:33:08 +00:00
bwrsandman
5d45d328b8 Fixed uninitialized variable that caused a segfault when going to previous page. 2012-10-26 21:28:22 -04:00
scrawl
234716daa6 finished spell creation 2012-10-23 11:42:38 +02:00
scrawl
33361e6539 Merge branch 'master' into spellcreation 2012-10-23 10:38:53 +02:00
scrawl
59560e84eb small addition 2012-10-19 20:48:15 +02:00
scrawl
b2b9254718 improved the ingredient GUI code (this didnt fix anything, though) 2012-10-19 20:44:53 +02:00
scrawl
475163bd4a Merge branch 'master' of https://github.com/zinnschlag/openmw 2012-10-19 20:21:34 +02:00
scrawl
fbe3538f32 bug #412: sort birth signs 2012-10-19 20:13:37 +02:00
Marc Zinnschlag
3f6afb13f1 Merge remote-tracking branch 'scrawl/alchemy' 2012-10-19 20:09:45 +02:00
scrawl
d76522e7a4 searchPtrViaHandle 2012-10-19 19:48:02 +02:00
scrawl
28cc480ce1 fix some alchemy issues and make the gui use the new implementation 2012-10-18 22:21:39 +02:00
Marc Zinnschlag
18686614db Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 2012-10-18 15:46:43 +02:00
Marc Zinnschlag
510674aa5e Merge branch 'master' into alchemy 
Conflicts:
	components/esm/loadmgef.hpp
 2012-10-18 14:37:05 +02:00
scrawl
e80394c0b5 fix training limit 2012-10-17 18:48:29 +02:00
scrawl
125315ebe7 remove a cout 2012-10-17 18:21:24 +02:00
scrawl
c64eb96952 Merge branch 'Travel_Dialogue' into training_travel 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt
 2012-10-17 18:17:53 +02:00
scrawl
1a2034b4dd training window 2012-10-17 18:03:02 +02:00
scrawl
6be092e268 substr check 2012-10-17 12:41:24 +02:00
scrawl
84a4fd56c3 consider all files in Splash directory 2012-10-17 12:39:45 +02:00
scrawl
6acbea822b splash screen directory listing 2012-10-16 23:59:03 +02:00
scrawl
7d1e659960 fading, greying out destinations you cant afford, warning fix 2012-10-16 20:25:50 +02:00
gugus
9583a1b8e9 FadeOut/In, that's for you scrawl! 2012-10-16 19:59:53 +02:00
gugus
c9afe222be traveling now takes time 2012-10-16 19:34:29 +02:00
scrawl
c991f68a2d buying created spell 2012-10-15 21:54:19 +02:00
scrawl
f154031e54 last bits of the gui 2012-10-11 18:26:29 +02:00
gugus
27a3487d78 right prices 2012-10-08 15:51:36 +02:00
gugus
5a611b66d7 traveling. 2012-10-08 11:14:22 +02:00
gugus
85d9357e3a Travel GUI 2012-10-06 17:52:46 +02:00
scrawl
025e820703 abstracted code and use it in enchanting window as well 2012-10-03 15:36:10 +02:00
scrawl
1c0dd3ccc5 some editing code 2012-10-03 15:06:54 +02:00
Marc Zinnschlag
332039da10 Issue #61: replaced 4 ingredient member variables with vector in alchemy GUI 2012-10-02 10:29:47 +02:00
Marc Zinnschlag
14833a4c3a Issue #61: More robust tools handling in alchemy window 2012-10-02 10:20:49 +02:00
Marc Zinnschlag
6469933ce8 Merge branch 'master' into alchemy 
Conflicts:
	apps/openmw/mwgui/alchemywindow.cpp
 2012-10-02 09:30:49 +02:00
scrawl
21493c2dbd added magic effect flags from Research wiki page 2012-10-01 23:33:07 +02:00
scrawl
dc33dee22e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
 2012-10-01 20:25:23 +02:00
scrawl
ff2c2d2b96 Merge branch 'master' into spellcreation 
Conflicts:
	apps/openmw/mwbase/windowmanager.hpp
 2012-10-01 17:54:45 +02:00
Marc Zinnschlag
d1c4559abe fixed GMST string handling in GUI 2012-10-01 10:03:49 +02:00
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
Marc Zinnschlag
10c8360e07 Issue #61: Replaced apparatus handling in alchemy GUI with new implementation in Alchemy class 2012-09-30 19:05:45 +02:00
scrawl
0c6ad13364 WakeUpPc instruction 2012-09-29 09:41:34 +02:00
gugus
4f5c4bf89a Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwgui/dialogue.hpp
	apps/openmw/mwgui/mode.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
 2012-09-28 17:09:15 +02:00
gugus
4d496c1188 correction1 2012-09-28 17:02:27 +02:00
gugus
1971ba66f1 destination name is now OK for every trave services 2012-09-27 13:08:38 +02:00
Marc Zinnschlag
cd343c4fbd Issue #61: Basic alchemy class (doesn't do anything yet) 2012-09-27 11:59:40 +02:00
scrawl
ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation 
Conflicts:
	apps/openmw/mwgui/dialogue.cpp
 2012-09-27 08:47:47 +02:00
scrawl
9b0254a158 small map fix 2012-09-26 23:34:35 +02:00
gugus
3060fbee60 TravelGUI, not completly finished. 2012-09-26 18:30:47 +02:00
scrawl
71d04e16da fix the global map updating when pinned 2012-09-25 21:57:57 +02:00
scrawl
e2b1329620 fix the race selection escape crash 2012-09-25 21:49:34 +02:00
scrawl
05eb307bfb added video timing 2012-09-25 02:54:29 +02:00
scrawl
73c69e8eda video playback 2012-09-25 02:35:50 +02:00
scrawl
b63d205c6e change the select attribute/skill dialogs to be reusable 2012-09-24 22:09:38 +02:00
Marc Zinnschlag
5bdc7bcacf Merge branch 'master' into next 2012-09-24 10:14:09 +02:00
scrawl
d393f551ed edit effect dialog 2012-09-24 08:09:16 +02:00
scrawl
dd5c083124 fix the race selection escape crash 2012-09-24 00:42:05 +02:00
scrawl
1cb1259e18 fixing some unrelated warnings 2012-09-23 19:36:37 +02:00
scrawl
9d7c35ae48 and go 2012-09-23 00:36:20 +02:00
scrawl
b4db339fd5 everything uses find now 2012-09-22 21:39:05 +02:00
scrawl
9f2668b45b Task #400 Review GMST access 2012-09-22 21:35:57 +02:00
scrawl
b471bef92a Merge branch 'master' into next 2012-09-22 20:48:22 +02:00
Marc Zinnschlag
39e21a6103 Merge remote-tracking branch 'scrawl/globalmap' into next 2012-09-22 18:27:42 +02:00
scrawl
78b2d51cfc fix a map crash 2012-09-22 16:52:31 +02:00
Marc Zinnschlag
3560690660 Merge remote-tracking branch 'scrawl/sleep_wait' into next 2012-09-21 18:27:06 +02:00
scrawl
872fcf3e3d sleeping restoration of health, magicka, and fatigue 2012-09-21 17:53:16 +02:00
scrawl
f49401bb53 center map on the player, dynamic map size 2012-09-21 16:26:04 +02:00
scrawl
1d012d1680 don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore. 2012-09-21 15:24:26 +02:00
scrawl
9106e5307c moved global map from RenderingManager to gui and removed world method 2012-09-21 14:11:01 +02:00
greye
18cc435aa1 resolving conflicts 2012-09-21 13:13:11 +04:00
scrawl
a161b34c67 remove useless member, fix map rendering crash 2012-09-20 18:23:27 +02:00
scrawl
98c1dc1151 ShowMap & FillMap commands, merged next 2012-09-20 18:02:37 +02:00
scrawl
8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 2012-09-20 17:41:14 +02:00
scrawl
451a9fd6ac don't update world arrow position in interior 2012-09-20 17:35:30 +02:00
scrawl
e5e3d829d0 player arrow & markers 2012-09-20 17:30:09 +02:00
scrawl
86cfc91ef3 global map rendering 2012-09-20 13:56:37 +02:00
Marc Zinnschlag
87a9373a56 Merge remote-tracking branch 'scrawl/gamma' into next 2012-09-20 09:01:58 +02:00
scrawl
b9a3f8e8d7 gamma slider 2012-09-19 23:47:42 +02:00
scrawl
be44810623 implemented GetPCSleep 2012-09-19 03:11:23 +02:00
scrawl
bf5e30b24f everything done except health/mana restore 2012-09-19 02:53:06 +02:00
scrawl
ab698bb401 date time label 2012-09-18 20:53:32 +02:00
scrawl
4d4ba6698a fix character preview destruction; don't allow empty names in name dialog 2012-09-18 19:00:20 +02:00
scrawl
0ba996f290 dialog layout 2012-09-18 18:29:03 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
scrawl
896428c129 enableRestMenu & enableLevelupMenu 2012-09-15 20:18:41 +02:00
scrawl
b34b894d6a removed some debug stuff 2012-09-15 17:20:47 +02:00
scrawl
76b494100e finished? 2012-09-15 17:12:42 +02:00
scrawl
95f3a20e2c Merge branch 'master' into levelup 2012-09-15 14:25:37 +02:00
scrawl
2793096b50 Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
 2012-09-15 00:57:29 +02:00
scrawl
b76a28f69c beginnings of the gui 2012-09-14 19:44:00 +02:00
scrawl
35f7216f2f fixed some things 2012-09-14 17:25:32 +02:00
scrawl
7c59b83419 performance optimization 2012-09-14 17:10:10 +02:00
scrawl
a308d2e38a fixed exception, fixed armor label obscuring the items 2012-09-14 15:33:24 +02:00
scrawl
1f7e044fad removed some debug stuff 2012-09-14 14:41:19 +02:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0 race selection preview 2012-09-13 19:03:31 +02:00
scrawl
5155339cb6 character preview working 2012-09-13 14:56:50 +02:00
scrawl
d90af9c524 Merge branch 'master' into characterpreview 2012-09-13 14:22:17 +02:00
scrawl
7ad80e306b fixed the disappearing 2012-09-13 12:33:09 +02:00
scrawl
4f3eb3c34a character preview WIP 2012-09-13 00:54:32 +02:00
scrawl
2f0b47fc38 test 2012-09-13 00:21:58 +02:00
scrawl
a96ed6ac61 splash screens on startup 2012-09-12 19:15:29 +02:00
Marc Zinnschlag
e9e30c0fce fixed a memory leak 2012-09-11 20:34:54 +02:00
scrawl
a8d9aa98b1 some fixes 2012-09-11 19:18:26 +02:00
scrawl
d5a08e31e7 scene does not disappear anymore during load 2012-09-11 17:36:20 +02:00
scrawl
369db182de actual progress bar, performance optimization 2012-09-11 16:53:49 +02:00
scrawl
2b339f6c0f loading screen 2012-09-11 16:37:54 +02:00
scrawl
4977c33e4c fixed a stats window resizing problem that I introduced today 2012-09-10 21:58:19 +02:00
scrawl
89ad2af1d9 key usage to open doors or containers 
to test: player->additem, "key_arrile", 1 (door in arille's tradehouse)
player->additem, "key_alvur", 1 (chest in the back of beshara)
 2012-09-10 17:44:59 +02:00
scrawl
d581ac426e useless cout message 2012-09-10 14:10:56 +02:00
scrawl
996e6280d8 more spell buying window cleanup 2012-09-10 14:10:01 +02:00
scrawl
ba0acd4056 changed some text colors 2012-09-10 13:52:37 +02:00
scrawl
fde69d0c87 Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing 2012-09-10 13:40:34 +02:00
scrawl
bc6a1979b0 replaced everything with the new method 2012-09-10 13:39:22 +02:00
Marc Zinnschlag
61c8a627aa added a missing include 2012-09-10 13:19:15 +02:00
Marc Zinnschlag
273ac0a97f Merge branch 'spellbuying' 2012-09-10 13:16:02 +02:00
Marc Zinnschlag
f17756712a fixed spell list handling 2012-09-10 13:15:55 +02:00
scrawl
b66c8099eb new system for dynamic sizing of buttons & text boxes 2012-09-10 11:20:27 +02:00
scrawl
35dd49f948 fixed some "using namespace" in headers 2012-09-10 09:10:50 +02:00
scrawl
56061474c4 another 3 unnecessary lines 2012-09-09 23:53:23 +02:00
scrawl
bb267dddf6 some stats window cleanup 2012-09-09 23:50:57 +02:00
scrawl
432c089434 fix the spell tooltips to show the spell target 2012-09-09 23:06:24 +02:00
Marc Zinnschlag
bcf3a81a6c and a tiny bit more of cleanup 2012-09-09 21:18:47 +02:00
Marc Zinnschlag
9c49ca1468 a bit more random cleanup 2012-09-09 21:08:57 +02:00
Marc Zinnschlag
06677a0fc8 fixed ID handling and some misc cleanup 2012-09-09 21:03:39 +02:00
Marc Zinnschlag
3fad1c0786 fixed a crash 2012-09-09 20:43:21 +02:00
Adam Hogan
08410b9062 Renamed SpellBuyingWindow, took some suggestions from scrawl 2012-09-09 14:10:07 -04:00
Adam Hogan
ebf80943a9 Added spell buying window 2012-09-08 18:17:03 -04:00
Marc Zinnschlag
e2bf4694cb Merge remote-tracking branch 'scrawl/master' 2012-08-31 09:22:32 +02:00
scrawl
760f05c454 the HUD can be toggled with F12 key; useful for screenshots 2012-08-30 20:47:39 +02:00
greye
a90547bbbe code formatting 2012-08-29 21:35:06 +04:00
scrawl
6ad08dfd33 added settings for crosshair & subtitles 2012-08-29 11:15:17 +02:00
scrawl
1c5055c8ac fix a problem where hovering a marker would render it on top of the fog of war instead of below 2012-08-28 18:49:44 +02:00
scrawl
7eaf5e7f0f changed the markers to look more like morrowind's (hover effect) 2012-08-28 18:40:11 +02:00
scrawl
571d5095d4 removed a cout 2012-08-28 17:32:50 +02:00
scrawl
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
Marc Zinnschlag
160b52162b Merge remote-tracking branch 'scrawl/quick_keys' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2012-08-28 09:06:40 +02:00
scrawl
321f7c3419 fix an infinite recursion regression on several dialogs. 2012-08-27 21:29:04 +02:00
scrawl
5c28a67203 broke something in the last commit. 2012-08-27 20:55:39 +02:00
scrawl
4f19b7fb9b fix leaks. 2012-08-27 20:52:32 +02:00
scrawl
bc36b0e2bd remove the restriction on the last quick key 2012-08-27 20:51:13 +02:00
scrawl
6161f81c24 last bits of the quick key menu. 2012-08-27 20:44:14 +02:00
scrawl
9af0b48ad6 show/hide crosshair correctly 2012-08-27 19:18:55 +02:00
scrawl
c5e55d3cac fix screenshot function 2012-08-27 15:51:01 +02:00
scrawl
c0f27bd5ef magic selection window 2012-08-26 11:37:33 +02:00
scrawl
fab4cfecb1 some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
scrawl
67577c6192 UI cursor & camera sensitivity sliders 2012-08-13 18:48:50 +02:00
scrawl
c7b8787c32 "reset to defaults" button, invert y axis button 2012-08-13 02:55:22 +02:00
scrawl
bc6e4feedc hotkey window first version 2012-08-13 01:26:15 +02:00
scrawl
97c45455fd fix WindowManager destruction 2012-08-12 21:21:23 +02:00
Marc Zinnschlag
c4bf6214db Merge remote branch 'scrawl/master' 2012-08-12 18:11:36 +02:00
Marc Zinnschlag
6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
Marc Zinnschlag
35a64edf2a Issue #107: removed a template from the window manager 2012-08-12 16:07:04 +02:00
Marc Zinnschlag
484cce12a8 Issue #107: removed redundant getStore function from window manager 2012-08-12 14:36:46 +02:00
Marc Zinnschlag
f37d3cd3c9 Issue #107: added a few todo comments 2012-08-12 14:09:55 +02:00
Marc Zinnschlag
4ca3cb81d4 Issue #107: some include clean up 2012-08-12 14:07:48 +02:00
Marc Zinnschlag
e0ba7cf952 Issue #107: Fixing up the window manager interface 2012-08-12 13:46:14 +02:00
Marc Zinnschlag
020fde70b8 Issue #107: moving function implementations from hpp to cpp file 2012-08-12 11:10:17 +02:00
Marc Zinnschlag
dbac3d2e5f Issue #107: fixing WindowManager::removeDialog 2012-08-12 10:52:29 +02:00
Marc Zinnschlag
a3b27ae756 Issue #107: Moved ClassPoint from window manager to character creation 2012-08-12 10:50:03 +02:00
Marc Zinnschlag
0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 2012-08-11 17:53:39 +02:00
Marc Zinnschlag
b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 2012-08-11 17:30:55 +02:00
scrawl
dcf1e66456 fix main menu placement after resolution changes 2012-08-11 17:26:01 +02:00
scrawl
44ff31b50a removed world exit methods 2012-08-10 16:21:53 +02:00
scrawl
f72956b918 - added a simple main menu (with Return, Options and Exit buttons) 
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
 2012-08-10 15:15:48 +02:00
Marc Zinnschlag
6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 2012-08-09 14:33:21 +02:00
Marc Zinnschlag
d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 2012-08-09 12:56:03 +02:00
Marc Zinnschlag
923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 2012-08-09 10:35:53 +02:00
scrawl
15a16aeba1 Fixed DirectX HLSL shaders and re-enabled them in the gui 2012-08-01 04:11:16 +02:00
Marc Zinnschlag
db10baafe1 Merge branch 'scriptconsole' 2012-07-30 12:43:48 +02:00
Marc Zinnschlag
fd6c155118 Issue #352: added --script-run switch 2012-07-30 12:37:46 +02:00
Marc Zinnschlag
23f8595b87 Issue #352: refactored script execution in console 2012-07-30 11:57:19 +02:00
Marc Zinnschlag
90de02b901 Issue #350: console only script instructions 2012-07-30 11:43:28 +02:00
Marc Zinnschlag
78fe6fdce5 Issue #351: Refactoring Action class 2012-07-27 12:00:10 +02:00
Marc Zinnschlag
2d080ce4ef compile fix 2012-07-23 21:47:53 +02:00
Marc Zinnschlag
483a6d8605 Merge remote branch 'scrawl/shadersystem' 2012-07-23 21:46:06 +02:00
scrawl
02a52c0ff1 fixed some more settings bugs 2012-07-23 21:39:22 +02:00
scrawl
3ebc6fd590 fixed a settings window bug 2012-07-23 20:50:56 +02:00
scrawl
a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 2012-07-23 20:12:42 +02:00
Marc Zinnschlag
2c5d3d8df9 Merge remote branch 'scrawl/shadersystem' into shadersystem 
Attention: We have submodules again. Don't forget to update!

Conflicts:
	components/files/configurationmanager.cpp
 2012-07-23 14:12:21 +02:00
greye
32b1350b63 CreatureStats class 2012-07-22 18:29:54 +04:00
scrawl
f5ffea4d4b new button, water timescale 2012-07-19 23:30:41 +02:00
scrawl
e077814a8c water 2012-07-19 22:23:07 +02:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2012-07-17 10:32:18 +02:00
Marc Zinnschlag
0d3a7d482e Merge remote branch 'modred11/master' 2012-07-17 10:21:46 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2012-07-14 11:16:35 +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
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
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
d30ba14a17 Issue #324: Finished turning NpcStats into a proper class 2012-07-06 18:23:48 +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
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
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
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
70ac1c818d Merge remote branch 'scrawl/settingswindow' 2012-06-27 09:02:29 +02:00
scrawl
232fe0be8c fix for the directx crash 2012-06-26 18:03:52 +02:00
scrawl
30e86e1b9d settings window resolution sorting, aspect ratio 2012-06-26 15:41:13 +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
scrawl
15e959868c make some of the gui mode changes a bit safer 2012-06-19 17:07:00 +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
3c42a71dae removed some cout spam 2012-06-16 16:42:35 +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
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
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
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
72bb7a2d2c fix a typo 2012-05-30 08:04:07 +02: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
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
c7268233df spell window layout & opening/closing/pinning logic 2012-05-29 09:02:22 +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
f75266e4ba fixed race dialog bug 2012-05-29 01:47:49 +02:00
scrawl
0a17d6d710 more resolution switching fixes 2012-05-28 12:34:29 +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
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
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
c7010623fb Issue #294: disallowed inventory prevents Talk, Open and Take actions 2012-05-25 18:45:17 +02:00
scrawl
750259973e potion creating works, most of the values are bogus 2012-05-25 18:00:13 +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
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
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
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
5f6e8224f4 skill progress 2012-05-21 10:48:25 +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
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
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
scrawl
7ef0ad4e39 show faction & birthsign in the stats window 2012-05-19 14:55:09 +02:00
scrawl
24ce88de2a working mygui tag replacement system for GMST strings 2012-05-19 14:19:21 +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
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
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
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
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
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
0afda15ce9 fix for cells that have no region. 2012-05-17 18:14:33 +02:00
scrawl
5da4da820e beginnings of trade window layout. 2012-05-17 17:15:44 +02:00