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

4536 commits

Author SHA1 Message Date
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
Marc Zinnschlag
e7684c4677 some random cleanup 2013-03-29 09:04:02 +01:00
Chris Robinson
c5f0556451 Handle light linear/quadratic settings 2013-03-28 20:57:33 -07:00
Glorf
cc8f7f238e Enchanted item base ptr fix 2013-03-29 00:55:29 +01:00
Glorf
eb88463b94 Some enchanting fixes 2013-03-28 23:39:20 +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
406488d086 Soulgem value should be multiplied by the trapped soul 2013-03-27 17:39:49 +01:00
scrawl
6f1575d42a CELL record corrections 2013-03-27 17:27:43 +01:00
scrawl
efe6a3ebee Fix compile error & warnings 2013-03-26 18:01:01 +01:00
scrawl
2ecd2f4ecd Merge branch 'next' into HEAD 2013-03-26 17:44:53 +01:00
Marc Zinnschlag
82f1cee116 added is-playable column to class 2013-03-26 09:51:39 +01:00
Marc Zinnschlag
ea3b14f2d2 added skill columns to class 2013-03-26 09:43:13 +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
65cda580db added attributes to class table 2013-03-25 14:31:46 +01:00
Marc Zinnschlag
c7275965b8 added basic class record table 2013-03-25 13:22:06 +01:00
Marc Zinnschlag
f2969e7143 fixed access to records flagged as deleted 2013-03-25 12:56:52 +01:00
Marc Zinnschlag
f39f694638 various global variable fixes in editor 2013-03-25 11:59:25 +01:00
Marc Zinnschlag
6c76e97bbc fixed day count in rest dialogue 2013-03-25 11:53:02 +01:00
Marc Zinnschlag
1078386fd7 Merge branch 'skills' into next 2013-03-25 11:07:14 +01:00
Marc Zinnschlag
dc67ddf39b added verifier stage for skill records 2013-03-25 11:07:04 +01:00
Marc Zinnschlag
739e7e7298 improved record access from ID collection 2013-03-25 11:06:40 +01:00
Marc Zinnschlag
7450554ef1 fixed a broken UniversalId constructor 2013-03-25 11:04:41 +01:00
Marc Zinnschlag
10c5f29075 added attribute column to skills 2013-03-24 15:50:29 +01:00
Marc Zinnschlag
114f99ddbf add skill records when creating a new base file 2013-03-24 15:10:03 +01:00
Marc Zinnschlag
4208d52b1a added use value columns to skills 2013-03-24 14:51:48 +01:00
Marc Zinnschlag
7cae61a202 Merge remote-tracking branch 'psi29a/master' into next 2013-03-23 18:51:05 +01:00
Bret Curtis
962b504129 add dpkg information for mwiniimporter, this blocked debian/ubuntu buildd from building 2013-03-23 16:20:10 +01:00
Marc Zinnschlag
0ce962e815 added specialisation column to skill table 2013-03-23 13:13:53 +01:00
Marc Zinnschlag
92f0098911 added new constructors for EnumDelegateFactory 2013-03-23 13:13:34 +01:00
scrawl
a2ca679beb Added PC repair feature 2013-03-23 08:16:46 +01:00
scrawl
78f3f19f62 Thrown weapons, arrows and bolts shouldn't have item health 2013-03-22 14:28:50 +01:00
scrawl
20774f8f81 Added merchant repair feature 2013-03-22 14:13:10 +01:00
scrawl
8e2f9f5186 Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips 2013-03-22 12:24:09 +01:00
Marc Zinnschlag
feaf2b43fb disabled and deleted objects where not correctly ignored during adding objects to a cell when it became active 2013-03-22 09:44:59 +01:00
scrawl
918cdcffc2 Split up components/esm/loadlocks 2013-03-22 05:50:54 +01:00
Marc Zinnschlag
8e472cc624 added description column to skill table 2013-03-21 14:38:06 +01:00
Marc Zinnschlag
fefe061294 added basic support for skills to editor 2013-03-21 14:31:32 +01:00
Marc Zinnschlag
947ab6635b removed automatic detection of setting modified to the same value of base with subsequent setting modifiction state to base only (can cause problems with implicitly added records) 2013-03-21 14:29:31 +01:00
Marc Zinnschlag
a955068853 added universal IDs for skills 2013-03-21 13:40:55 +01:00
Marc Zinnschlag
9464f45d57 fixed an encoding problem. I hate you QString. I hate you so much 2013-03-21 12:47:22 +01:00
Marc Zinnschlag
cafbabde45 fixed broken loading of single files into the editor 2013-03-21 12:13:32 +01:00
Marc Zinnschlag
ebb1dab8e1 removed debugging leftovers 2013-03-21 10:19:07 +01:00
Marc Zinnschlag
d05508db52 switching editor id tables from QAbstractTableModel to QAbstractItemModel (in preparation for record types like containers) 2013-03-21 10:07:25 +01:00
Marc Zinnschlag
cd84b68e4b silencing some warnings 2013-03-20 20:55:48 +01:00
Marc Zinnschlag
775f9e8402 Merge remote-tracking branch 'potatoesmaster/dialogue' into next 2013-03-20 20:53:14 +01:00
Emanuel Guevel
6783ff6748 Workaround to have dialogues until actor detection is implemented for NPCs 2013-03-20 20:10:55 +01:00
Emanuel Guevel
8de93db488 Coding style consistence 2013-03-20 20:10:55 +01:00
Emanuel Guevel
f25b56ac88 Add dialogue function: NotLocal 2013-03-20 20:10:54 +01:00
Emanuel Guevel
ad3478c8f2 Fix inverted dialogue functions (NotClass etc.) 
The comparison present is useless for these functions.
 2013-03-20 20:10: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
2509b34ace Enabled bloodmoon weather 2013-03-20 02:48:10 +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
scrawl
21cc7483e4 Fix broken weather transitions 2013-03-20 01:20:56 +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
pvdk
e76d03dcc4 Added a warning message to the importer dialog 2013-03-19 12:01:54 +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
0092a2f437 Merge remote-tracking branch 'pvdk/firstrunfix' 2013-03-18 20:09:10 +01:00
Marc Zinnschlag
c53d7ba6d6 Merge remote-tracking branch 'pvdk/resolutionfix' 2013-03-18 19:59:20 +01:00
Marc Zinnschlag
e4ed5b836e added ondeath script function 2013-03-18 11:04:47 +01:00
Marc Zinnschlag
fd2c07a6f4 delete death events on adding an actor to the scene 2013-03-18 10:54:47 +01:00
Marc Zinnschlag
61cb0f98a6 keep track of death events 2013-03-18 10:47:09 +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
5922637c58 Unblocked Solstheim weather that should work now. 2013-03-17 20:12:26 +01:00
Glorf
f3fd3a7691 Much more moons fallbacks 2013-03-17 19:36:14 +01:00
Glorf
1369090a80 More moons fallbacks, minor weather fixes 2013-03-17 14:50:02 +01:00
Glorf
6165cd2c6b Moons fallbacks partially implemented 2013-03-17 14:22:30 +01:00
Glorf
ea7f386e7d Access to Fallback via getFallback 2013-03-17 13:50:15 +01:00
greye
52ed451ae7 fix eraseStatic() assumptions 2013-03-17 08:36:15 +04:00
scrawl
c07b3ea61d Text defines for npc race, class, and faction should use the translated name 2013-03-17 04:20:30 +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
e8b08326dc Corrected Id, Race, Class, Faction and Cell select functions to do the exact opposite as before. That is how they are displayed in the CS, anyway. 2013-03-16 20:52:05 +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
pvdk
75be474005 Use the resolution QRegExp cap() instead of converting ints back and forth 2013-03-16 13:45:23 +01:00
pvdk
d1860f2d6c Removed color information from Direct3D resolutions 2013-03-16 13:40:29 +01:00
pvdk
c15d920133 Fixed the first run dialog, makes sure Morrowind.ini is found 2013-03-16 01:46:28 +01:00
scrawl
485b6c855a Fix NPC race height not being applied 2013-03-15 16:44:35 +01:00
Marc Zinnschlag
66a2df68db some cleanup 2013-03-15 10:26:04 +01:00
Glorf
727a598cbe Last tabulator died 2013-03-15 10:32:03 +01:00
Glorf
542c1bcc53 Some other tabulators deleted 2013-03-15 10:28:39 +01:00
Glorf
e1c6c3fe02 Tabulators deleted 2013-03-15 10:22:02 +01:00
Glorf
521bebd2f4 Fallback system rewritten, added light fallbacks 2013-03-15 10:17:30 +01:00
Marc Zinnschlag
4de2a741ed Merge remote-tracking branch 'scrawl/master' 2013-03-15 09:58:24 +01:00
pvdk
110dd5d0ee Possible fix for the resolutions not appearing with Direct3D Renderer 2013-03-15 01:56:39 +01:00
scrawl
3e9cd0e2e3 Fix the back button on generate class result dialog advancing creation stage 2013-03-14 22:33:51 +01:00
Marc Zinnschlag
ef72894b81 Merge remote-tracking branch 'scrawl/alwaysrun' into next 2013-03-14 22:11:12 +01:00
scrawl
7ab236337b Dialogue responses should be random only for persuasion results 2013-03-14 21:33:00 +01:00
scrawl
b36295cbb3 Removed a leftover 2013-03-14 21:10:22 +01:00
scrawl
5b943a965f Handle always run in the inputmanager, instead of using forced stance. 2013-03-14 21:08:19 +01:00
scrawl
2d8f0949a4 Always run key (Y) 2013-03-14 20:27:16 +01:00
scrawl
beab20cb42 Fix message boxes not opening if they opened as a result of object activation 2013-03-14 19:53:57 +01:00
gus
9efb073617 clean up + correct a bug 2013-03-14 18:05:00 +00:00
gus
80804fac35 check if the NPC is close from a non loaded cell. If yes, AITravel is simply ended. 2013-03-14 17:16:37 +00:00
greye
d30b38f336 fix Store<T>::eraseStatic() 2013-03-14 19:28:17 +04:00
Marc Zinnschlag
73278edf7e Merge remote-tracking branch 'scrawl/collision' into next 2013-03-14 13:29:31 +01:00
scrawl
84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 2013-03-14 03:04:02 +01:00
scrawl
c4a42f2e1f Fix infinite recursion on shutdown caused by incorrect onWidgetDestroy listener 2013-03-13 23:17:25 +01:00
scrawl
e4717d7c92 Merge branch 'next' of git://github.com/zinnschlag/openmw into next 2013-03-13 19:46:05 +01:00
scrawl
17fb0f5a69 Merge branch 'master' of git://github.com/zinnschlag/openmw 2013-03-13 19:45:47 +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
gus
f943580138 Somehow manages to get from one cell to another, but this looks wrong... And I don't know how morrowind do it, because aitravel is completly buggy 2013-03-12 17:44:22 +00:00
Marc Zinnschlag
25fd7a41eb Merge remote-tracking branch 'scrawl/next' into next 2013-03-12 18:13:57 +01:00
scrawl
4c588cbab6 Levelup dialog is now dynamic; added level descriptions 2013-03-12 17:18:47 +01:00
Marc Zinnschlag
10fad47a81 some cleanup 2013-03-12 14:51:16 +01:00
Marc Zinnschlag
170451cb79 Merge remote-tracking branch 'graffy76/saveOnClose' into next 2013-03-12 14:47:42 +01:00
Marc Zinnschlag
75bd30844d added optional format sub-record to tes3 record 2013-03-12 14:33:35 +01:00
graffy76
50abb22162 Fix to allow application closing from multiple views and a single view. 2013-03-12 06:28:13 -05:00
Marc Zinnschlag
9e68a420ae restructuring tes3 record structs 2013-03-12 08:15:20 +01:00
Marc Zinnschlag
ce67fbdfca Merge remote-tracking branch 'pvdk/encoding' 2013-03-12 07:02:44 +01:00
Marc Zinnschlag
0b51e89b78 Merge remote-tracking branch 'pvdk/uifix2' 2013-03-12 07:01:41 +01:00
pvdk
31ba332647 Moved Windows icon to files/launcher 2013-03-12 04:05:14 +01:00
pvdk
f574c37e93 Added encoding flag to ini importer arguments 2013-03-12 04:00:43 +01:00
scrawl
41a958cd4e Fix hardcoded beast races in MWClass::Npc::getModel 2013-03-12 02:50:23 +01:00
scrawl
46d8f3ce5a Fix hardcoded race IDs 2013-03-12 02:44:03 +01:00
scrawl
eeb60edb65 Properly check for the Beast flag instead of hardcoding beast races 2013-03-12 02:09:54 +01:00
scrawl
543f573739 Fix the firstguard armor mod 2013-03-12 02:02:59 +01:00
pvdk
81604613b5 Narrowed down includes to improve compile time 2013-03-12 01:29:13 +01:00
scrawl
bcdab2aeab Fix wrong padding breaking local map for cells where the bounds center is far from the origin 2013-03-11 19:32:39 +01:00
Marc Zinnschlag
2e1a1fd11a removing some remains of the removed GMST fixing feature 2013-03-11 16:30:47 +01:00
Marc Zinnschlag
64d517dd79 removed unused file type information from esm component 2013-03-11 14:42:49 +01:00
graffy76
96b62940b3 Fixes docked subviews becoming tabbed and application closure when 
closing one of several views.
 2013-03-11 06:38:27 -05:00
Marc Zinnschlag
a0df25c631 Merge remote-tracking branch 'pvdk/uifix' 2013-03-11 10:10:48 +01:00
Pieter van der Kloet
b4d408af5d Added actions to datafiles.ui and implemented them in the launcher 2013-03-11 01:48:01 +01:00
Pieter van der Kloet
fc1940257a Fixed issue with new profile dialog being too small 2013-03-11 01:23:24 +01:00
Pieter van der Kloet
091c569fbe Fixed issue with the combobox dropdown looking weird 2013-03-11 01:20:30 +01:00
pvdk
52e5dcc7f0 Some fixes to the way data paths are saved and settings are handled 2013-03-10 21:12:26 +01:00
Marc Zinnschlag
f6d2dec973 Merge remote-tracking branch 'glorf/master' 2013-03-10 17:28:57 +01:00
gus
bbc4c23f7e AITravel now works correctly on exterior cells. As long as NPC don't try to leave cell, it's ok. 2013-03-10 15:07:22 +00: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
graffy76
ce91ef36ea Fix for warnings on close, leaves all views open until a decision is 
made
 2013-03-10 07:49:43 -05:00
Glorf
d5ca00c927 Another fix 2013-03-10 12:11:38 +01:00
Marc Zinnschlag
bdec87e51b some cleanup 2013-03-10 11:30:50 +01:00
Glorf
81338d3b23 Weather code fixes 2013-03-10 11:30:24 +01:00
Marc Zinnschlag
65c382116f Merge remote-tracking branch 'glorf/master' 2013-03-10 11:24:23 +01:00
Marc Zinnschlag
6cef7fb610 rescale all objects to the range of [0.5, 2] when a cell becomes active 2013-03-10 10:00:20 +01:00
Glorf
a68c55fea5 Merge branch 'master' of git://github.com/zinnschlag/openmw 2013-03-10 00:29:42 +01:00
Glorf
aebd9a3700 Weather to pull 2013-03-10 00:24:14 +01:00
Marc Zinnschlag
549678394c Merge remote-tracking branch 'potatoesmaster/fallback-archives' 2013-03-09 23:01:42 +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
Marc Zinnschlag
fbaad8e105 Merge remote-tracking branch 'potatoesmaster/strfix' 2013-03-09 21:33:32 +01:00
Emanuel Guevel
289bbc64f7 Load fallback archives listed in openmw.cfg at startup 2013-03-09 21:14:11 +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
Marc Zinnschlag
2cc20c67cb Merge remote-tracking branch 'scrawl/raycasting' 2013-03-09 14:34:29 +01:00
scrawl
5c94c654d4 Fix wrong rotation of objects dropped on the ground 2013-03-09 13:27:24 +01:00
scrawl
c8b31b4745 Remove an outdated message 2013-03-09 13:26:00 +01:00
graffy76
c17821e6c8 Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose 2013-03-08 20:08:56 -06:00
Emanuel Guevel
c020665cf2 Fix appending int to string in an exception message 2013-03-09 01:00:03 +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
Marc Zinnschlag
d396785008 Merge remote-tracking branch 'scrawl/master' 2013-03-08 11:00:20 +01:00
graffy76
03c7f18112 Fixes for save-on-close message boxes 2013-03-07 17:48:05 -06:00
scrawl
285b4bf726 Allow zooming camera in vanity or preview mode with the mousewheel 2013-03-08 00:12:56 +01:00
Emanuel Guevel
1223a2e105 Bsatool: extract and extractall modes 2013-03-07 21:21:00 +01:00
Emanuel Guevel
3adf3f5121 Revive bsatool 2013-03-07 21:13:10 +01:00
Marc Zinnschlag
17e406e58c Merge remote-tracking branch 'mikesc/bug586' 2013-03-07 20:48:58 +01:00
Michal Sciubidlo
f2f4b6e2d5 Make MWWorld::getInterior case insensitive. 
Interior cells names can use different mix of uppercase/lowercase in different places.
getInterior() should return same cell in all cases. Fixes bug #586.
 2013-03-07 20:15:01 +01:00
Marc Zinnschlag
2a9d15cd9f Merge remote-tracking branch 'scrawl/master' 2013-03-07 16:42:07 +01:00
scrawl
66a754e9aa Fix tooltip position when hovering the crosshair over NPCs 2013-03-07 15:25:22 +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
Marc Zinnschlag
a994a23f4e file loading fixes 2013-03-07 07:56:29 +01:00
Pieter van der Kloet
9145fb210b Merge remote-tracking branch 'upstream/master' into opencsui 2013-03-07 03:02:03 +01:00
Pieter van der Kloet
7504ae675b Implemented a file dialog for the editor using launcher .ui 2013-03-07 03:00:59 +01:00
gus
01908dbcc2 little improvement 2013-03-06 21:17:33 +00:00
gus
5fc7103425 First attempt at pathfinding using boost::graph 2013-03-06 20:31:47 +00:00
scrawl
8be9627c8d Fix method signatures 2013-03-06 21:26:41 +01:00
scrawl
f7d8f6456f Stats should never go below 0 2013-03-06 20:45:11 +01:00
Marc Zinnschlag
642653d10e World constructor fixes 2013-03-06 19:57:00 +01:00
Marc Zinnschlag
7e100c36b5 Merge remote-tracking branch 'gus/AI' 2013-03-06 19:05:55 +01:00
Marc Zinnschlag
ef86a693c3 Merge remote-tracking branch 'scrawl/sneak' 2013-03-06 18:59:37 +01:00
Marc Zinnschlag
69eb5aa99a Merge remote-tracking branch 'scrawl/master' 2013-03-06 18:59:02 +01:00
gus
5938e19362 Clean up 2013-03-06 17:31:57 +00:00
scrawl
66d2d3522f Race selection preview: render only the head, and focus the camera on its node 2013-03-06 18:03:47 +01:00
scrawl
268bb23590 Implemented sneaking animation 2013-03-06 16:58:56 +01:00
scrawl
39411eda7b Fix the spell buying window listing already owned spells 2013-03-06 15:11:40 +01:00
Pieter van der Kloet
c9859382bf Made the launcher write the custom resolution to file, cleaned resolution parsing 2013-03-06 01:35:32 +01:00
gus
d3bf3812a4 changing rotation order (fix some misoriented objects) 2013-03-05 20:16:57 +00:00
gus
8b6f0e0770 Correct orientation sign 2013-03-05 18:28:57 +00:00
Marc Zinnschlag
d839a4c6c2 Merge remote-tracking branch 'scrawl/graphics' 2013-03-05 16:31:22 +01:00
scrawl
fe7b2732d8 Avoid manually updating render targets from within frameRenderingQueued 2013-03-05 14:24:29 +01:00
scrawl
2486ec6cb9 Material fixes (vertex colors, alpha) 2013-03-05 13:51:48 +01:00
Marc Zinnschlag
46de45b9a2 added var type column to globals 2013-03-05 11:37:13 +01:00
Marc Zinnschlag
dc3edc6024 Merge branch 'vartype' 2013-03-05 10:59:08 +01:00
Marc Zinnschlag
1489570b09 change variant in info record to new type 2013-03-05 10:34:03 +01:00
Marc Zinnschlag
ba4907fbaf use new Variant type for GMSTs 2013-03-05 08:02:27 +01:00
Pieter van der Kloet
770d8af931 Forgot to add the DataFilesPage .ui 2013-03-05 03:57:27 +01:00
Pieter van der Kloet
75cf009101 Finished implementing the .ui file for the DataFilesPage 2013-03-05 03:47:57 +01:00
Pieter van der Kloet
4c9d0563fe WIP: Implementing the .ui for the DataFilesPage 2013-03-05 03:13:39 +01:00
Pieter van der Kloet
fb5213a754 Made the GraphicsPage use a .ui file and added support for custom res 2013-03-05 02:17:28 +01:00
Marc Zinnschlag
8a887a0aef Merge remote-tracking branch 'potatoesmaster/tradewindow' 2013-03-04 19:42:51 +01:00
Marc Zinnschlag
ac810faa7e Merge remote-tracking branch 'scrawl/master' 2013-03-04 19:36:58 +01:00
Marc Zinnschlag
a93034b0a9 Merge remote-tracking branch 'k1ll/store_segfault_fix' 2013-03-04 19:27:14 +01:00
scrawl
d5c6c221c1 Books/scrolls: Fix the take button incorrectly showing 2013-03-04 17:28:01 +01:00
scrawl
ca707aa65f Transparency should be evaluated per subentity, not per NIF 2013-03-04 16:57:00 +01:00
scrawl
cab5315a8e Disable mipmaps generation 2013-03-04 16:28:20 +01:00
Marc Zinnschlag
a1ac20c6f3 changed global variable records to new variant type 2013-03-04 14:32:59 +01:00
Marc Zinnschlag
65081f5520 added variant class 2013-03-04 14:32:23 +01:00
gus
3384d92761 oups introduced a bug.. 2013-03-04 12:28:43 +00:00
gus
48b3f1e0cf Clean up. But still a little hacky 2013-03-04 12:08:35 +00:00
Emanuel Guevel
8e07638699 Update the trading offer on "max sale" button click 2013-03-04 12:24:41 +01:00
graffy76
6911868f2a File->close and File->exit menu items added. Exit uses 
closeAllWindows() to ensure ViewManager::closeRequest is called on the
last open window.  Exit will close all open windows but the last one in
cases of active save operation or modified file.
 2013-03-03 15:58:26 -06:00
scrawl
f1d35b73b8 Cleanup 2013-03-03 19:52:20 +01:00
scrawl
359ae06fcf Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 19:35:26 +01:00
scrawl
c9fefc7f5d Simpler, more lightweight underwater effect, changed colors to match vanilla better 2013-03-03 19:28:11 +01:00
Marc Zinnschlag
123a111580 Merge remote-tracking branch 'scrawl/master' 2013-03-03 17:13:05 +01:00
scrawl
f0e3463e9b Disable assertion for comparing iterators from different containers (Bug #605) 2013-03-03 16:50:10 +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
Marc Zinnschlag
5595675664 Merge remote-tracking branch 'scrawl/effects' 2013-03-03 15:33:23 +01:00
scrawl
05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:14:20 +01:00
scrawl
002830e13b Make sure render textures are inactive when in a cell without water 2013-03-03 15:11:45 +01:00
scrawl
867b22ce19 Fix a terrain glitch 2013-03-03 15:11:19 +01:00
scrawl
11f21a1988 Weather update should be before renderer update 2013-03-03 15:10:40 +01:00
gus
5951abfae2 fix some script instructions 2013-03-03 13:59:38 +00:00
gus
7fb2ff18a3 Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public) 2013-03-03 13:06:45 +00:00
gus
e1882dce32 correcting a bug: player orientation wasn't stored correctly, and objects orientation wasn't properly retrived. 2013-03-03 13:02:41 +00: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
6f05c4229f Implemented potion & ingredient effect stacking 2013-03-03 12:41:37 +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
graffy76
eb90bd71ba Fixed triggering confirmation messages boxes when more than one view is 
open.
 2013-03-02 21:34:55 -06:00
Pieter van der Kloet
0a6e3701ab Made the Play page use a .ui file too 2013-03-03 01:49:41 +01:00
Pieter van der Kloet
f2193bb1ba Made the mainwindow use a .ui file and removed the stylesheet 2013-03-03 00:48:09 +01:00
Pieter van der Kloet
2b6bb9657b Added Qt Designer .ui files 2013-03-02 23:49:31 +01:00
Pieter van der Kloet
a3c5c868ec Merge remote-tracking branch 'upstream/master' into launcherui 2013-03-02 23:01:53 +01:00
Nathan Jeffords
109dff2d29 renamed high level NIF files... 2013-03-02 13:23:09 -08:00
k1ll
dde43e8c87 Some cleanup 2013-03-02 21:46:31 +01:00
graffy76
bf6c855e6d Final changes to implement save-on-close features 2013-03-02 12:49:26 -06:00
Nathan Jeffords
d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 2013-03-02 10:46:12 -08:00
k1ll
9acd4061cc Fix dangling static references in mShared 2013-03-02 17:04:17 +01:00
graffy76
9193ddc9d3 Merge branch 'master' into saveOnClose 2013-03-02 09:24:42 -06:00
graffy76
a2e36594c9 Completed "abort save on close" feature 2013-03-02 09:22:44 -06:00
graffy76
f85be6a744 80% complete save-on-close feature 2013-03-02 07:57:41 -06:00
scrawl
e1957e4ee9 Potion effects should be hidden until discovered 2013-03-02 13:34:26 +01:00
Marc Zinnschlag
0f4f91605a some cleanup 2013-03-02 11:19:48 +01:00