mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 16:19:56 +00:00
Code Issues Releases Wiki Activity
21210 commits 38 branches 54 tags 122 MiB
Commit graph

2605 commits

Author SHA1 Message Date
Bret Curtis
e517ad3f7b add ktx support for splashscreens 2017-09-14 10:06:36 +02:00
Bret Curtis
dff0a766a8 adding 3 more extensions 2017-09-13 15:30:22 +02:00
Bret Curtis
b26887ef9b add support for png and dds splashscreens to begin with. 2017-09-13 13:52:05 +02:00
scrawl
00ae9a01a1 Merge pull request #1445 from akortunov/guifixes 
Allow to add levelup a description for levels > 20
 2017-09-11 10:28:09 +00:00
Andrei Kortunov
7760e4514c Allow to add levelup a description for levels > 20 2017-09-10 22:47:34 +04:00
MiroslavR
1e585ac71a Log a warning in case of missing bookart instead of showing a pink rectangle (Fixes #3826) 2017-09-08 22:50:07 +02:00
Andrei Kortunov
ac2f20f983 Update a disposition bar when a dialogue widget is disabled, but visible 2017-09-08 19:42:06 +04:00
Andrei Kortunov
91dcd5bc6e Do not allow to unequip weapon from inventory during attack 2017-08-31 13:28:09 +04:00
Andrei Kortunov
6f22d819c5 Do not allow to switch weapon to probe or lockpick during attack 2017-08-31 12:36:54 +04:00
scrawl
8c6a8ca48d Respect the framelimit in all cases (Fixes #3531) 
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
 2017-08-30 21:26:30 +00:00
scrawl
dc53573de4 Merge pull request #1405 from akortunov/stancechangefixes 
Do not allow player to change weapon/spell during attack or spellcast
 2017-08-29 23:11:23 +00:00
Andrei Kortunov
73d5efabee Display negative values on fatigue progress bar 2017-08-29 18:53:21 +04:00
Andrei Kortunov
fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 2017-08-29 15:53:23 +04:00
scrawl
4fba157d3b Implement releaseGLObjects for cached resources 2017-08-26 19:29:12 +00:00
Andrei Kortunov
0177fe6602 Display large entries in journal correctly 2017-08-22 23:26:06 +04:00
Andrei Kortunov
65d05ee1cd Get only text from clipboard (bug #4025) 2017-08-19 15:32:17 +04:00
Andrei Kortunov
e0bb9c089b Revert commit 67d59bead5 (a better 
implementation found)
 2017-08-19 15:24:06 +04:00
Andrei Kortunov
7c80ddc9de Owned crosshair improvements (bug #2789) 2017-08-18 17:08:15 +04:00
Andrei Kortunov
67d59bead5 Get only text from input fields (bug #4025) 2017-08-16 15:03:04 +04:00
Andrei Kortunov
ec64034160 Confiscate stolen item/gem when enchanting 2017-08-14 19:29:34 +04:00
Andrei Kortunov
f84eb68b3d Confiscate an item when you try to sell it to its owner (bug #3944) 2017-08-14 11:31:17 +04:00
scrawl
1bdcecc32e Merge pull request #1390 from akortunov/referencecheck 
Do not make target reference unavailable on cell change
 2017-08-12 18:48:52 +00:00
scrawl
b6aaa2f2be Merge pull request #1389 from akortunov/autosave 
Create autosave when waiting
 2017-08-12 16:50:30 +00:00
Andrei Kortunov
b3b7d6aa9f Do not make target reference unavailable on cell change (bug #3898) 2017-08-12 09:36:09 +04:00
Andrei Kortunov
c542ae6875 Create autosave when waiting (bug #1452) 2017-08-12 09:06:31 +04:00
scrawl
0f983144a4 Merge pull request #1383 from akortunov/guifixes 
Enable transparency for interactive messageboxes and tooltips in game mode
 2017-08-10 21:55:24 +00:00
Andrei Kortunov
56f5a5dee3 Added transparency to 'owned' tooltip 2017-08-08 22:57:39 +04:00
Andrei Kortunov
4cc8afd25d Add transparency for tooltips in game mode 2017-08-08 20:38:15 +04:00
Andrei Kortunov
6cb3c83248 Add transparency for interactive messageboxes in game mode 2017-08-08 20:36:50 +04:00
scrawl
cd4525cf25 Merge pull request #1372 from akortunov/guifixes 
Journalbook layout fixes
 2017-08-07 18:49:13 +00:00
Jake Westrip
63343b6241 Ensure jail does not decrease a skill past zero 2017-08-05 06:15:15 +10:00
Andrei Kortunov
56a30d7aec Journalbook layout fixes 2017-08-03 20:27:14 +04:00
Andrei Kortunov
35beede065 Restock items after trade deal instead of trade window opening 2017-08-03 18:41:13 +04:00
Andrei Kortunov
487e72fd23 Play Up sounds instead of Down ones in trade window (bug #3982) 2017-08-03 18:39:59 +04:00
scrawl
eac2e52841 Merge pull request #1329 from akortunov/priorityfix 
Combat AI: make default spell priority calculation formula close to vanilla
 2017-07-31 18:21:47 +00:00
scrawl
9ac409e61c Merge pull request #1287 from akortunov/spellsorting 
Spellbuying menu improvements
 2017-07-31 09:43:47 +00:00
scrawl
43279c49b5 Go back to index when selecting 'cancel' on topics list 2017-07-30 23:51:44 +02:00
Andrei Kortunov
99b5f21a46 Add missing journal sounds (bug #3974) 2017-07-29 19:41:46 +04:00
Andrei Kortunov
6ab36c0539 Spellbuying menu improvements 2017-07-27 13:20:18 +04:00
Julian
d7aa2a882d improve dialogue window performance 2017-07-26 18:58:27 +02:00
Andrei Kortunov
3ba0a336b7 Move spell magicka cost calculation to standalone function 2017-07-24 21:11:59 +04:00
scrawl
c9f8a220dc Update the tooltip when the focusObject is set 2017-07-20 20:59:36 +02:00
scrawl
0e2e23e9f8 Remove tooltip object as part of WindowManager::clear 2017-07-20 20:59:09 +02:00
Andrei Kortunov
2b22d10ebc Spellview fixes 2017-07-16 13:14:19 +04:00
Andrei Kortunov
9179a019df Quick keys menu fixes 2017-07-16 13:11:34 +04:00
Andrei Kortunov
5be1c81913 Fixed Close button handler in EditEffectDialog (fixes #3956) 2017-07-15 14:03:36 +04:00
Andrei Kortunov
54b4d93f79 Added a special function for GUI sounds playing 2017-07-10 15:48:00 +04:00
Allofich
42402976e3 Fixes for building in MSVC 2017-06-13 19:38:12 +09:00
scrawl
6d90f5a9a5 Merge pull request #1312 from akortunov/guifixes 
Split greeting from topic response
 2017-06-12 23:19:45 +02:00
Bret Curtis
dbf149f9b2 gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now 2017-06-10 00:51:19 +02:00
Bret Curtis
c781d1f8ed purge unnecessary imports 
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
 2017-06-09 19:08:53 +02:00
Bret Curtis
d799954ca0 replace and purge boost::math::gcd and other non-used headers 2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2 replace and purge boost::function 2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702 replace boost::bind 2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96 remove boost/tuple 2017-06-09 19:08:53 +02:00
Bret Curtis
d97aa9152b remove more unused imports, including boost headers 2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 2017-06-09 19:08:53 +02:00
Bret Curtis
c8b67221d7 use nullptr instead of NULL 2017-06-09 16:49:25 +02:00
Ewan Higgs
38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 2017-06-09 16:49:25 +02:00
Andrei Kortunov
4bb9622c21 Handle greetings differently from responses 2017-06-08 22:40:31 +04:00
scrawl
59eb0aba7d Merge pull request #1310 from akortunov/guifixes 
Removed empty space before dialogue entry (bug #3892)
 2017-06-07 21:55:45 +02:00
Andrei Kortunov
c2962ced90 Removed empty space before dialogue entry (bug #3892) 2017-06-04 23:20:43 +04:00
Andrei Kortunov
f4a187a9c2 Move a setting to show enchanting success chance from GUI to Game section 2017-06-03 23:03:24 +04:00
Andrei Kortunov
9a1ba1e559 Show success chance when self-enchanting (Feature #3492) 2017-06-03 14:39:15 +04:00
scrawl
9fd0d54a35 Merge pull request #1289 from akortunov/newrepair 
Improved repair and recharge widgets
 2017-05-31 22:47:38 +02:00
Andrei Kortunov
10d4cb15ad Improved repair widget 2017-05-31 19:11:49 +04:00
Andrei Kortunov
1164c3f16e Improved recharge widget 2017-05-31 19:11:49 +04:00
scrawl
2638327593 Merge pull request #1303 from akortunov/guifixes 
Character generation layout fixes
 2017-05-31 15:25:41 +02:00
scrawl
a1661af864 Merge pull request #1301 from akortunov/tooltips 
Tooltips layout fixes
 2017-05-29 00:13:34 +02:00
Andrei Kortunov
4f41c44cd6 Swap enchant type when clean selected soulgem widget (fixes #3878) 2017-05-20 18:30:11 +04:00
Andrei Kortunov
1520a4d7db Levelup menu layout fixes 2017-05-01 20:48:39 +04:00
Andrei Kortunov
26ec467df0 Tooltips: faction, magic effects layout fixes 2017-05-01 10:00:51 +04:00
Andrei Kortunov
987677db75 Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes 2017-04-30 22:39:05 +04:00
Andrei Kortunov
6331cc6ab9 Tooltips: level, race, class, specialization layout fixes 2017-04-30 19:45:36 +04:00
scrawl
9f1527b7da Merge pull request #1272 from akortunov/guifixes 
Service menus layout fixes
 2017-04-30 12:27:21 +02:00
Andrei Kortunov
c2706ac3e7 Merchant repair and travel window scroll fix 2017-04-23 09:15:25 +04:00
scrawl
8fbf9dc597 Merge pull request #1253 from akortunov/pinned 
Remember "pinned" windows across game restarts
 2017-04-21 18:44:47 +02:00
Andrei Kortunov
2b3b6d558f Move updatePinnedWindows() function to private section 2017-04-21 19:37:09 +04:00
Andrei Kortunov
f986e3fafa Remove unused code 2017-04-21 18:39:01 +04:00
scrawl
fc56fc0b81 Merge pull request #1265 from akortunov/develop 
Use "sLevel" GMST instead of hardcoded text in load game menu
 2017-04-21 15:30:15 +02:00
Andrei Kortunov
e717d046f2 Escaped class name string 2017-04-21 17:21:57 +04:00
scrawl
1956602aa2 Merge pull request #1262 from Allofich/warnings 
Fix more warnings
 2017-04-21 14:34:36 +02:00
Andrei Kortunov
f67ec9c9ce Use sLevel GMST instead of hardcoded text in load game menu 2017-04-21 09:40:25 +04:00
Andrei Kortunov
6c1e3a0618 Merged from upstream master 2017-04-21 08:48:22 +04:00
Allofich
ff3cb18d4f Fix shadowing warnings 2017-04-21 11:06:18 +09:00
scrawl
1ffb9e1bf3 Remove renderWorldMap() 2017-04-21 00:50:22 +02:00
Andrei Kortunov
90d90b6d81 Fixed dynamic stats tooltips in review menu 2017-04-20 17:24:34 +04:00
Andrei Kortunov
39682d616c Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes 2017-04-20 17:20:20 +04:00
Andrei Kortunov
f0f1df3a96 Properly clear inventory 2017-04-19 20:54:09 +04:00
scrawl
30081393a6 Add InventoryWindow::clear() as part of world cleanup 2017-04-19 18:28:49 +02:00
scrawl
f90e5081f9 Merge pull request #1257 from akortunov/chargen 
Chargen menus fixes
 2017-04-18 22:23:30 +02:00
Andrei Kortunov
aac78d29a4 Service menus layout fixes 2017-04-16 20:30:20 +04:00
Andrei Kortunov
c93cf822c7 Reviewmenu: read name, race, class and birthsign from player stats (fixes bug #2628) 2017-04-14 23:21:20 +04:00
Andrei Kortunov
fb0c4700a4 Save a proto gender in racemenu 2017-04-14 23:19:48 +04:00
scrawl
f63b1e81cd Merge pull request #1228 from akortunov/master 
Options to show hidden weapon parameters
 2017-04-14 20:01:08 +02:00
scrawl
8d8f293a65 Merge pull request #1246 from akortunov/develop 
Menu improvements
 2017-04-12 23:57:00 +02:00
Andrei Kortunov
c3d49d5ca5 Fixed inventory crash and skipmenu launch 2017-04-12 22:57:32 +04:00
Andrei Kortunov
72a16dc78b Merge branch 'master' into pinned since added PR #1250 2017-04-12 13:17:06 +04:00
Andrei Kortunov
506cc47c9d Add option to show reach and attack speed for melee weapons 2017-04-12 09:12:25 +04:00
scrawl
993860a4b1 Merge pull request #1250 from resilar/mapbutton 
Hide WorldButton when in game mode
 2017-04-11 21:34:53 +02:00
Andrei Kortunov
95ce7637f3 Adds persisted pin (feature #2834, bug #2489) 2017-04-10 10:18:00 +04:00
def
785b3c3d01 Hide WorldButton when in game mode 2017-04-03 09:40:12 +03:00
Andrei Kortunov
31bd70f334 Added missed recharge and repair sounds 2017-04-02 23:19:43 +04:00
Andrei Kortunov
df5a43363a Confirmation dialogs size fix 2017-03-30 17:05:56 +04:00
Andrei Kortunov
edadcb338c Savegame dialog improvements 2017-03-27 23:10:57 +04:00
Andrei Kortunov
7d09a5d644 Progress bars vertical alignment 2017-03-27 13:33:28 +04:00
scrawl
373bd78cf3 Merge pull request #1233 from akortunov/guifixes 
Vanilla style drowning widget
 2017-03-24 18:10:11 +01:00
Andrei Kortunov
b89fdcfd27 Vanilla style drowning widget (partially fixes bug #3801). 2017-03-24 09:41:18 +04:00
Andrei Kortunov
1a47b9727b Changed tooltip maximum width (bug #3800) 2017-03-23 14:31:01 +04:00
Andrei Kortunov
eb81ab5b24 Disables weapon and spells cycling in GUI mode (bugs #2409, #2483, #2645) 2017-03-15 17:07:25 +04:00
scrawl
5eff286c71 Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps. 2017-03-14 19:27:55 +01:00
MiroslavR
a8517c34eb Code style 2017-03-13 13:57:05 +01:00
scrawl
a556475fae Explicitely set the user data type to avoid const/non-const mismatch 2017-03-13 02:48:23 +01:00
scrawl
5de5be77f3 Fix Ptr/ConstPtr userdata mismatch (Bug #3784) 2017-03-13 02:48:23 +01:00
Mitchell Schwitzer
421b92ae05 fix styling & add missing lines regarding max proficency 2017-03-12 17:24:43 -07:00
Mitchell Schwitzer
f31e5ba85e fix display maximum proficency reached 2017-03-12 17:02:07 -07:00
Mitchell Schwitzer
7960d5a9a7 fix skill progress bar v2 
both widgets display their own progess indicator. it was being set for
value (when you hovered over the level of your skill, eg the "5" in
"Acrobatics    5"), but not for the name.

this fixes that, but the progress information is being stored/displayed
by two different widgets for one skill
 2017-03-12 16:52:29 -07:00
scrawl
29556a1802 More consistent wording of errors/warnings 
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
 2017-03-04 21:48:31 +01:00
scrawl
1692b7f38e Merge pull request #1209 from dhustkoder/master 
Added ConstContainerStoreIterator (Task #3092)
 2017-03-02 18:36:21 +01:00
Rafael Moura
18a4b64f1a Porting more ContainerStoreIterator usage to const version #2 2017-02-27 21:50:10 +00:00
Rafael Moura
9963601484 Porting code to ConstContainerStoreIterator #1 2017-02-19 15:18:35 +00:00
scrawl
57b585570a Preload magic effect visuals of the player's selected weapon/spell 2017-02-15 21:01:25 +01:00
scrawl
72c6b11cf8 Move global map render to the worker thread 2017-02-14 07:58:16 +01:00
scrawl
fe0cf5be05 StatsWindow: don't rebuild all skill widgets when one skill changes 2017-02-06 02:40:35 +01:00
scrawl
7201cf5fe2 ItemWidget: skip setImageTexture if the icon has not changed 2017-02-05 02:26:27 +01:00
scrawl
83a9435167 Fix unnecessary use of CopyFramebufferToTextureCallback when loading is too fast for a loading screen to be displayed 2017-02-03 23:39:39 +01:00
scrawl
c58fc6d276 Improve performance of loading screen by not recomputing the bounding sphere of the entire scene after each loading step 2017-02-03 22:29:38 +01:00
MiroslavR
c9dd63af8d Merge pull request #1171 from NeveHanter/travel-followers-cost 
Implemented "paying" for travelling followers
 2016-12-26 22:34:39 +01:00
NeveHanter
ff4aba2a6e Moved duplicated code to common ActionTeleport static method and reordered travel price calculations 2016-12-23 21:27:29 +01:00
scrawl
cf496287f7 Silence static analysis warnings 2016-12-22 14:43:54 +01:00
NeveHanter
15cd3c178b Clamp price multiplication to 1, as it resulted in player alone traveling at no fee. 2016-12-20 21:23:55 +01:00
NeveHanter
8902bb5b13 Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith 2016-12-20 12:38:51 +01:00
scrawl
f8690dcd20 Set the drag-and-drop state after initiating the drag, not before (Fixes #3134) 2016-12-16 20:16:59 +01:00
MiroslavR
8c97ac269d Remove item shadows properly (Fixes #3652) 2016-12-10 22:22:41 +01:00
scrawl
c326564e20 Merge pull request #1136 from Allofich/deletespell 
Allow deleting spells that have the "always succeeds" flag
 2016-11-20 19:23:25 +01:00
Allofich
c82df2553c Allow deleting spells that have the "always succeeds" flag (Fixes #3627) 2016-11-21 02:26:02 +09:00
MiroslavR
c1e52bbcf7 Fix -Wmismatched-tags clang warning 2016-11-20 15:10:37 +01:00
MiroslavR
8f91732b09 Show starting abilities, powers and spells in stat-review window (Fixes #2410) 2016-11-19 21:51:19 +01:00
MiroslavR
175cfd4dff Fix overloaded virtual function warning 2016-11-13 17:22:50 +01:00
MiroslavR
e80636f0ca Improve performance of repairing/recharging (Fixes #2493) 2016-11-06 11:01:46 +01:00
MiroslavR
5cd04af3fa Fix horrible performance when resizing/moving the settings window 
Resize widgets instead of reconstructing them.
 2016-11-01 16:37:00 +01:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
scrawl
5ccbabc27d Fix build against bullet with profiler disabled (Fixes #3592) 2016-10-14 21:00:35 +02:00
scrawl
612c3e995f Add drop shadow to ItemWidget (Fixes #3545) 2016-10-13 01:42:50 +02:00
scrawl
3019d70986 Use 'default icon' for items with no icon specified 2016-10-08 16:05:20 +02:00
Allofich
53e94b7c3f Fix shadowing warnings 2016-10-06 23:33:52 +09:00
scrawl
3d76ba5a7c Merge pull request #1086 from Allofich/warnings 
Fix shadowing warnings
 2016-10-02 14:03:02 +02:00
Allofich
6ec37b5cfb Fix shadowing warnings 2016-10-02 17:48:54 +09:00
MiroslavR
210c02d98e Fix interactive ID validity checks in TypesetBookImpl 2016-10-01 21:07:17 +02:00
MiroslavR
52e00f5fef Do not show uncarriable lights in item views 2016-09-24 18:01:31 +02:00
scrawl
30d5c7488d savegamedialog: don't reset the character selection scrollbar when a character is deleted 2016-09-18 19:26:41 +02:00
scrawl
7bd445fb83 Don't crash if FontManager::getByName returns NULL (Fixes #3552) 2016-09-17 17:21:35 +02:00
scrawl
dda5bfbc9f CharacterPreview no longer depends on osgViewer 2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3 LocalMap no longer depends on osgViewer 2016-08-16 22:37:44 +02:00
scrawl
0fbc0d0da7 Attempt to silence warning 2016-08-14 16:41:17 +02:00
scrawl
8c44334409 Merge pull request #1021 from Allofich/weight 
Corrections to tooltip displays of zero-weight items
 2016-08-14 15:14:58 +02:00
scrawl
2f6075329b Clang warning fixes 2016-08-14 15:10:50 +02:00
Allofich
502a26a7ff Use getWeightString() to avoid casting to int 2016-08-14 19:38:53 +09:00
MiroslavR
ddbfe0c944 Fix disabled door markers appearing on the map (Fixes #3348) 2016-08-12 03:14:36 +02:00
Internecine
90735d226d Replaced Store::find usage with Store::search to remove exception handlers. 2016-08-02 11:43:41 +12:00
Internecine
14165352f6 Added exception handlers when trying to retreive enchantment and magic effect data. 2016-08-01 13:16:42 +12:00
MiroslavR
80f2ae0ca7 Apply magic effects while waiting/sleeping 2016-07-06 00:20:23 +02:00
MiroslavR
41484432b4 Player's death now interrupts waiting/sleeping 2016-07-06 00:15:25 +02:00
scrawl
b9b73d7b12 Replace "sys::default" with ESM::CellId::sDefaultWorldspace 2016-07-02 19:48:11 +02:00
MiroslavR
7244809c4a Remove redundant part of condition 2016-06-26 15:17:52 +02:00
MiroslavR
dfc62c99b4 Show correct class image in level-up dialog (Fixes #3443) 2016-06-26 03:22:58 +02:00
scrawl
844cbc5a14 Add isNullAction() method to fix compiler warning 2016-06-11 18:26:20 +02:00
scrawl
f64bc3c7ef Pass the victim to commitCrime on pickpocket detection (Fixes #3424) 2016-06-06 23:50:22 +02:00
scrawl
9eab3b1728 Fix crash in race dialog when no head or hair are available 2016-06-06 01:04:14 +02:00
Ben Shealy
5085afa3d7 Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading 2016-06-04 12:28:47 -04:00
Ben Shealy
8703609649 Allow +/- buttons in trade window to decrease offer to 0 2016-04-09 17:49:21 -04:00
scrawl
2162d9ed02 Restore key focus to the save list when the deletion confirmation messagebox is accepted 
Gives me an idea for a new MyGUI feature - per-window widget focus as it is usually the case in other GUI toolkits.
 2016-03-29 01:29:55 +02:00
scrawl
02016f4c56 Don't reset the save list when deleting a save (Fixes #3279) 2016-03-29 01:26:55 +02:00
scrawl
92c2a10de4 Fall back to 'warrior' for not found class images (Fixes #3228) 2016-03-24 16:52:16 +01:00
scrawl
e381957105 Don't assume that class ID and name are equal 2016-03-21 11:51:34 +01:00
scrawl
90cc1de46c Do not list custom made classes in the pick class dialog 2016-03-21 11:46:25 +01:00
scrawl
a6e23d03d3 Don't clamp disposition twice, clamping is already done inside getDerivedDisposition 2016-03-18 00:42:22 +01:00
scrawl
12ec90f9e7 Change default argument, fix GetDisposition 2016-03-18 00:38:02 +01:00
scrawl
bc5adfa4fe Merge pull request #913 2016-03-18 00:31:55 +01:00
scrawl
a0cc9de088 Make the creation of save file directories even more explicit 2016-03-14 00:00:11 +01:00
ae-g-i-s
c9791c5c1a Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233) 2016-03-08 21:30:28 +01:00
scrawl
60a12b3dee Use MyGUI's castType function 2016-03-05 20:00:51 +01:00
scrawl
763f647412 Add ItemModel::allowedToInsertItems 2016-03-05 19:53:24 +01:00
scrawl
373c1e7602 Assign the PageDisplay on initialization 2016-03-05 19:48:01 +01:00
scrawl
04d51d5871 Always update the ingredient icons (Fixes #3220) 2016-02-29 13:25:09 +01:00
scrawl
90a99991d1 Use empty() instead of !size() 2016-02-22 19:06:12 +01:00
scrawl
1232607385 Remove pointless widget names in settings layout file 2016-02-18 19:41:06 +01:00
scrawl
3969675afa Remove unused settings 2016-02-18 19:38:34 +01:00
scrawl
c4d38bb42d Fix clang analyzer warnings 2016-02-16 19:17:04 +01:00
scrawl
eaf3f5a829 Remove unused arguments 2016-02-13 04:14:05 +01:00
scrawl
9e53e12c70 More renaming of TextureManager -> ImageManager 2016-02-05 23:10:27 +01:00
scrawl
f99f403dda Rename TextureManager to ImageManager 2016-02-05 23:03:53 +01:00
scrawl
6ef848b7c5 Remove TextureManager::getTexture2D 
Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.

This is closer to what the OSG serializer does.

Streamlines the TextureManager and will make it easier to multithread.
 2016-02-05 23:01:11 +01:00
scrawl
e8662bea31 Change the way that image origin is converted to OpenGL's lower-left convention 
Flip the texture coordinates instead of flipping textures.

This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
 2016-02-05 21:03:11 +01:00
scrawl
8e5398d85b Add missing initializations 2016-02-05 14:35:29 +01:00
scrawl
7d647088ab Make the local map cell distance configurable 2016-02-05 01:19:45 +01:00
scrawl
bd655c20fd Refactor local map updates 
We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.

Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
 2016-02-05 01:19:45 +01:00
scrawl
b9d1d6144a Don't reveal unknown potion effects in alchemy window (Fixes #3146) 2016-02-02 22:50:11 +01:00
scrawl
ce9a18fb87 Merge pull request #879 from jordan-ayers/bugfix/1544 
Improve Drop Command - Bugfix/1544
 2016-01-19 15:02:51 +01:00
Jordan Ayers
5699cf7f09 Barter: Leave unsold projectiles equipped. 2016-01-18 20:00:18 -06:00
scrawl
41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-15 15:46:10 +01:00
scrawl
6546c05428 Move Fallback map to components/ 2016-01-11 23:10:16 +01:00
scrawl
ef20962fc5 Disable fog of war rendering on the HUD map by default 2016-01-11 22:58:08 +01:00
scrawl
ca4e859f61 Remove unused argument 2016-01-11 22:58:01 +01:00
scrawl
190bf15887 SettingsWindow: support auto-updating of slider labels through the layout file 2016-01-11 22:57:16 +01:00
scrawl
745b29a995 Remove a debugging leftover 2016-01-05 17:01:21 +01:00
scrawl
d9d6228c94 Implement PageDisplay::_updateView (Fixes #3125) 2016-01-05 16:54:09 +01:00
scrawl
5952498e9e Explicitely cast a size_t to int 2016-01-05 16:53:51 +01:00
scrawl
db7b80b503 Revert "Accept a ConstPtr in ItemPtr tooltips" 
This reverts commit 41c8ec56e0.

Does not work due to code relying on getting the non-const Ptr from the widget. Further refactoring is needed.
 2015-12-19 22:52:35 +01:00
scrawl
41c8ec56e0 Accept a ConstPtr in ItemPtr tooltips 2015-12-19 16:37:26 +01:00
scrawl
5a7bbbd508 Accept a ConstPtr in ToolTips::setFocusObject 2015-12-19 16:34:26 +01:00
scrawl
32d5dece58 Add count argument to getToolTipInfo 2015-12-19 16:29:07 +01:00
scrawl
04f7a8f8eb Remove redundant getId function 2015-12-18 16:58:38 +01:00
scrawl
d5a2586f38 LoadingScreen: add support for important labels 
Used in saveGame so the player can be sure whether or not the game was saved.

Fixes #3074
 2015-12-15 21:16:20 +01:00
scrawl
67883feaae LoadingScreen: ensure values are within progress range 2015-12-15 21:05:35 +01:00
scrawl
625644e917 LoadingScreen: documentation updates 2015-12-15 21:03:56 +01:00
scrawl
152f1d625d LoadingScreen: remove unused declarations 2015-12-15 20:54:21 +01:00
scrawl
ccbba5e926 LoadingScreen: remove indicateProgress, not used 2015-12-15 20:52:23 +01:00
Chris Robinson
8c364cd818 Remove left over declaration 2015-12-13 17:13:36 -08:00
Chris Robinson
b830a413d3 Rename the texture filter options 
To avoid compatibility issues with upgrading from or downgrading to older
builds.
 2015-12-13 16:02:09 -08:00
Chris Robinson
fb6abb53ae Simplify the in-game texture options 
This makes it behave like it originally did, although the config options remain
expanded.
 2015-12-13 15:02:36 -08:00
Chris Robinson
76bde5ee13 Separate and expand texture filtering options 2015-12-13 11:25:01 -08:00
scrawl
05f1fbf593 WindowManager: explicitely pass the ESMStore 
Fixes potential crash when the loading screen layout tries to retrieve a GMST value via #{GMST} syntax before the World has been created.

Possibly related to Bug #2854.
 2015-12-09 01:09:09 +01:00
Marc Zinnschlag
071ba3a4df Merge remote-tracking branch 'scrawl/werewolf' 2015-12-08 09:28:35 +01:00
scrawl
07b064f616 Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
scrawl
f875597be5 Don't use tolower() 
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
 2015-12-07 21:58:30 +01:00
scrawl
1a654fa451 Reset locale after strftime() call 2015-12-07 21:24:30 +01:00
scrawl
152f415b9a Change texture coordinates when falling back to player_hit_01 2015-12-07 18:32:58 +01:00
scrawl
998ef36837 Setting fix 2015-12-07 18:04:23 +01:00
scrawl
9d4af59860 Don't attempt to create quest log buttons if textures are unavailable (Fixes #3063) 2015-12-07 15:33:04 +01:00
scrawl
5981e1cbb3 Don't create the werewolf overlay if its texture is not available 
Avoiding a warning in the log when Bloodmoon is not installed
 2015-12-07 14:41:33 +01:00
scrawl
2327a41826 Fix journal freeze 2015-12-01 16:09:05 +01:00
scrawl
8fb328ef4f Fix updating of character preview size in InventoryWindow::setGuiMode 2015-11-30 05:43:36 +01:00
scrawl
d5a738bd39 Apply 27e669296e (locale-unaware tolower) to more code 
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
 2015-11-30 00:38:52 +01:00
scrawl
db71634a2d Allow replacing of interactive message boxes (Fixes #3040) 2015-11-28 19:15:54 +01:00
scrawl
783594033a Optimize MWMechanics::Spells 
Use pointers as map keys instead of string IDs. Resolves a nasty performance bottleneck on functions like hasCommonDisease() that previously had to look up all contained spells from the ESM store on every call. hasCommonDisease() is called hundreds of times per frame by the AI target update since it's used to calculate target disposition.

The total cost of hasCommonDisease() was 2.7% of the frame loop, now it's negligible.
 2015-11-27 01:07:15 +01:00
scrawl
984c455027 Fix Show Owned option affecting tooltips that are not objects (Fixes #3036) 2015-11-26 18:23:39 +01:00
scrawl
edfcb45ad7 Fix crash when onPcEquip script removes the equipped item (Fixes #3016) 2015-11-24 22:55:17 +01:00
cfcohen
b507d5da5d One more tooltip fix. This one in the review dialog with Socucius Ergalla. 2015-11-22 00:50:36 -05:00
scrawl
1b1d9a7a9c Fixed another tooltip 2015-11-21 02:05:27 +01:00
cfcohen
cf4f3d9ebc Correct tooltip for Magicka in stats window. 2015-11-20 14:57:42 -05:00
scrawl
e9e12d396d Merge remote-tracking branch 'upstream/openmw-37' into HEAD 2015-11-15 21:37:32 +01:00
scrawl
0f347eccbf Flip the origin of global map texture 
Now it's consistent with the overlay texture.
 2015-11-15 21:36:41 +01:00
scrawl
9897400d97 Restore the previous key focus widget after playing video 2015-11-12 19:03:24 +01:00
scrawl
b89945804c BookPage: implement hit test with margin for error 2015-11-09 02:57:49 +01:00
scrawl
516f2765a1 Use the ScalingLayer for journal, books and scrolls 2015-11-08 18:30:22 +01:00
scrawl
a7ad45e73e WindowBase::center use the layer size instead of render window size 2015-11-08 18:30:21 +01:00
scrawl
f9932130da Work around MyGUI bug with mouse event coordinates (fixed in git) 2015-11-08 18:30:21 +01:00
scrawl
6c12c9a467 Layer renaming fix 2015-11-07 19:45:30 +01:00
scrawl
d85d74e615 Use AdditiveLayer for the hit fader 2015-11-07 18:05:16 +01:00
scrawl
a90ef8afd0 layer renaming 2015-11-07 17:49:11 +01:00
scrawl
57b9eafa0f osgMyGUI: implement AdditiveLayer 2015-11-07 17:45:22 +01:00
scrawl
51f3a8fec6 osgMyGUI: move Platform methods to the .cpp file 2015-11-07 17:39:31 +01:00
scrawl
13c7235b6b Remove old FPS setting code 2015-11-07 00:13:13 +01:00
scrawl
6e69808129 Fix the frameNumber not being incremented in certain frames 2015-11-06 23:14:27 +01:00
scrawl
c9d7078b4b Water: add texture quality setting to the settings window 2015-10-29 00:27:42 +01:00
scrawl
944e6d0844 Fix adjustment of inventory preview size when guimode changes (Fixes #2973) 2015-10-26 14:26:02 +01:00
scrawl
7b954e8cc3 Remove unnecessary dependency on MWScrollBar 2015-10-24 16:04:08 +02:00
scrawl
69f234d97b Small delay before the loading screen shows 
Kinda irritating to have the loading bar pop up for a fraction of a second.
 2015-10-23 16:50:08 +02:00
scrawl
f36d463617 Enchantment error handling fix (Fixes #2959) 
Catch errors about missing enchantments before they propagate up the stack and interrupt the whole frame update.
 2015-10-13 18:15:39 +02:00
scrawl
899e35591c Escape MyGUI markup codes in console output 2015-09-26 02:08:23 +02:00
Alexander "Ace" Olofsson
7d4125d97f Fixes for building with unity build 2015-09-24 15:21:42 +02:00
Marc Zinnschlag
96880b4dfe Merge remote-tracking branch 'scrawl/tabs' 2015-09-17 09:30:31 +02:00
Emmanuel Anne
29a84452ab durations in tooltips : use "show effect duration" setting 2015-09-16 22:42:54 +02:00
scrawl
a47617c21f Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
Emmanuel Anne
b0d373f7e6 durations in tooltips : water walking effects is seen differently 
so move the duration info out of this block...
 2015-09-16 19:19:29 +02:00
Emmanuel Anne
1472711583 add duration to spell icons too 
and use gmststrings instead of direct strings in tooltips
durations can display minutes and hours
I don't know any effect lasting an hour or more but you never know...
 2015-09-16 17:53:14 +02:00
Marc Zinnschlag
353d6973e2 Merge remote-tracking branch 'origin/master' 2015-09-08 08:27:00 +02:00
scrawl
0442bc98f3 Update sleep interruption formula according to wiki, thanks Hrnchamd 2015-09-07 22:31:11 +02:00
scrawl
fd48c1d6f4 Make the Equip script function "use" items (drink potion, use alchemy, etc) 2015-09-07 22:09:08 +02:00
scrawl
8aaba0af6f Fix journal page navigation bug introduced by 7dd09dd637 (Fixes #2899) 2015-08-30 17:38:21 +02:00
Jordan Ayers
cd5bef958f Remove dead code from alchemywindow. 
Also align some braces.
 2015-08-24 07:43:30 -05:00
Marc Zinnschlag
a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-08-23 12:11:30 +02:00
scrawl
52d8bc555c Add missing checks to see if spell still exists when loading a savegame (Bug #2883) 2015-08-21 14:24:49 +02:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
scrawl
af3b0cd883 Improve some error messages 2015-08-21 00:31:43 +02:00
Marc Zinnschlag
d436dc332b Merge remote-tracking branch 'jeffreyhaines/gametimetracker' 2015-08-20 20:39:44 +02:00
Jeffrey Haines
f94d3237fc Removed unused cmake import 2015-08-19 13:28:01 -04:00
Jeffrey Haines
61bb55aff4 Removed long int parameter 2015-08-19 13:23:40 -04:00
Jeffrey Haines
d91f197119 Time played display setting 2015-08-19 11:31:43 -04:00
Jeffrey Haines
69729046bf Updated parameter name to reflect units 2015-08-19 10:11:40 -04:00
Jeffrey Haines
e86891d6e1 Time played displayed in save/load menus 2015-08-19 10:05:08 -04:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
scrawl
9fad33cd14 Don't reset the item model's sort/filter options in updatePlayer (Fixes #2863) 2015-08-16 17:49:53 +02:00
scrawl
c8d6679a25 Remove an unused function 2015-08-16 17:40:20 +02:00
scrawl
afb3d94ba4 Fix cell names in the save/load menu not being localised (Fixes #2840) 2015-08-16 01:55:14 +02:00
scrawl
c25dacb480 Fix "Level" string in the save/load menu not being localised (Bug #2840) 2015-08-16 01:53:58 +02:00
scrawl
7dd09dd637 Fix being able to flip journal pages with the mousewheel when the options overlay is active (Fixes #2855) 2015-08-15 20:44:15 +02:00
scrawl
c57e72fe03 Adjust the sleep interruption chance (Fixes #2781) 2015-08-15 16:09:53 +02:00
scrawl
e8c9d3ea2a Fix cell names on world map not always being translated (Fixes #2832) 2015-08-13 17:08:21 +02:00
scrawl
0d8f07d563 Properly apply changes when backing out of chargen dialogs (Fixes #2627) 2015-08-13 17:08:21 +02:00
Marc Zinnschlag
d2cd151f77 Merge remote-tracking branch 'kunesj/master' 2015-07-20 09:45:14 +02:00
Jiří Kuneš
a14a3c82de added description of new syntax to the onRetrieveTag function comment 2015-07-19 19:52:50 +02:00
scrawl
1156668843 Render certain map markers on top of the player arrow (Fixes #2559) 2015-07-19 00:45:02 +02:00
Jiří Kuneš
a5b4e087c5 define owned colours in settings.cfg 2015-07-18 22:17:46 +02:00
Jiří Kuneš
cbc44b33ba define crosshair owned colour in openmw_hud_box.skin.xml 2015-07-18 21:29:38 +02:00
scrawl
77f1387da8 Include cleanup 2015-07-18 20:36:28 +02:00
Jiří Kuneš
75f5972898 show owned - better settings 2015-07-18 17:13:20 +02:00
Jiří Kuneš
df077f8649 color tooltip red when taking item would result in crime 2015-07-18 16:56:57 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2015-07-18 12:22:37 +02:00
Marc Zinnschlag
edde1fb727 Merge remote-tracking branch 'scrawl/master' 2015-07-18 11:40:36 +02:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in 
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
 2015-07-18 03:09:04 +02:00
scrawl
6e493500c9 Show custom map markers on the tooltip of the world map marker (Fixes #2711) 2015-07-18 00:14:11 +02:00
scrawl
41bed4c7d9 Use multimap to speed up custom map marker code 2015-07-17 20:49:10 +02:00
Jiří Kuneš
4a6d806127 fixed comment, save settings to member variable, removed usless include, changed variable to const 2015-07-17 20:30:00 +02:00
Jiří Kuneš
e68b388d16 removed setCrosshairOwned from windowmanager 2015-07-17 19:13:45 +02:00
Jiří Kuneš
c019f8e23d use correct mechanics manager 2015-07-17 18:49:47 +02:00
Jiří Kuneš
15107ca5cf crosshair owned - settings option 2015-07-17 17:48:38 +02:00
Jiří Kuneš
66edae9b93 change collor of crosshair 2015-07-17 17:29:00 +02:00
Jiří Kuneš
72728b9c01 disable cusor when item/container is owned 2015-07-17 16:32:35 +02:00
scrawl
91d71d0fcd Disable MyGUI's scrollbar autorepeat (Fixes #2779) 
We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.
 2015-07-17 03:39:09 +02:00
scrawl
f8d360190d Remove an unneeded virtual 2015-07-15 19:10:09 +02:00
scrawl
992b770315 Don't set OnPcEquip for items that failed to equip (Fixes #2776) 2015-07-15 18:52:23 +02:00
scrawl
de6dc21552 Create hardware cursors in advance (Fixes #2660) 2015-07-13 23:36:25 +02:00
scrawl
dca4704b4b Print exceptions in CharacterCreation::spawnDialog 2015-07-13 18:40:05 +02:00
scrawl
f1b52c964a Select the current resolution in resolution list on game start (Fixes #2768) 2015-07-13 18:00:41 +02:00
scrawl
24ae1d5ace Fix some issues found by coverity 2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson
b1cc74dd9a Explicity instantiate MWMechanics::Stat 2015-07-09 14:41:37 +02:00
Alexander "Ace" Olofsson
3655ef16af Explicitly instantiate ESM::StatState 2015-07-07 19:19:37 +02:00
scrawl
bf9c62fa42 Fix for some coverity scan defects 2015-07-02 20:46:34 +02:00
scrawl
b90fc8ad92 Fix for various Viewer::frame calls resetting the simulationTime 2015-06-14 18:19:53 +02:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +02:00
scrawl
d4c45efb2b Remove useless #undef's for windows now that we have NOMINMAX flag 2015-06-12 04:39:44 +02:00
scrawl
0330d3d61e Restore the "transparent" loading screen 2015-06-07 21:21:57 +02:00
scrawl
f3cbe7b9da Hide FPS widget since it currently doesn't work, use F3 instead 2015-06-07 19:38:59 +02:00
scrawl
e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-06-07 15:23:54 +02:00
Stanislav Bas
49512a2b57 Correct the explanation for the Console::acceptCommand() 2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba Add the explanation to Console::acceptCommand() 2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f Reset Console editbox before command execution 2015-06-05 22:00:02 +03:00
Stanislav Bas
c40987338d Scrollbars don't save their positions between openings 2015-06-04 23:09:40 +03:00
scrawl
30ab15e605 Fix -Wunused-private-field clang warnings 2015-06-04 20:42:05 +02:00
scrawl
e23775e338 Fix -Woverloaded-virtual clang warnings 2015-06-04 20:31:28 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
7bacb9418d Various math code ported to osg 2015-06-03 19:41:19 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
Stanislav Bas
959fe3eb87 Reset the scrollbar position in the topic list when DialogueWindow is closed 2015-06-01 23:49:40 +03:00
scrawl
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
8e0a988289 Icon fix 2015-06-01 01:32:02 +02:00
Stanislav Bas
5dc6cdeb99 Scroll to the top of the topic list when dialog is started 2015-06-01 01:14:11 +03:00
Marc Zinnschlag
9f0ccdc37a Merge remote-tracking branch 'scrawl/master' 2015-05-31 11:05:43 +02:00
scrawl
6d3528af70 Port global map exploration 2015-05-29 01:49:52 +02:00
scrawl
7a1408cfed Restore display of global map overlay, no exploration yet 2015-05-28 18:49:24 +02:00
scrawl
72d0a69132 Fix global map markers not being cleared on a new game 2015-05-28 18:44:34 +02:00
scrawl
c811ac6afe Port fog of war 
Not optimized yet, need to work on fog texture's DataVariance.
 2015-05-28 03:50:49 +02:00
scrawl
6555ee8d80 Minor include cleanup 2015-05-28 02:37:35 +02:00
scrawl
025a1a7866 Restore savegame screenshot display 2015-05-28 02:34:38 +02:00
scrawl
723beb1cac Move IncrementalCompileOperation to SceneManager 2015-05-26 20:20:18 +02:00
scrawl
3dcb167066 Map rendering 2015-05-26 16:40:44 +02:00
scrawl
da24e298ee Fix -Wreorder warnings 2015-05-23 22:44:00 +02:00