mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 11:53:51 +00:00
Code Issues Releases Wiki Activity
6088 commits 38 branches 54 tags 122 MiB
Commit graph

4324 commits

Author SHA1 Message Date
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
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
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
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
Marc Zinnschlag
401903c9ce Merge remote-tracking branch 'lazydev/master' 2013-03-02 11:11:41 +01:00
lazydev
ccb7ed93b3 fix for https://bugs.openmw.org/issues/593 2013-03-02 03:54:25 +04:00
Marc Zinnschlag
3961fb36d4 Merge remote-tracking branch 'chris/transparency-fixes' 2013-03-01 23:18:35 +01:00
Chris Robinson
e6b547b9ba Merge remote-tracking branch 'zini/master' into transparency-fixes 2013-03-01 13:32:30 -08:00
scrawl
ef1678e47e Oops, rotation center should be dynamic 2013-03-01 22:32:02 +01:00
Chris Robinson
238a8feb18 Fix transparency checks 2013-03-01 13:27:25 -08:00
scrawl
d8f2d0195a Got rid of the texture rotation hack by rendering the cursor manually. 2013-03-01 18:45:52 +01:00
scrawl
1d988676fe Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this. 2013-02-28 22:56:29 +01:00
Chris Robinson
1168f15361 Don't disable depth writes when blending is enabled 2013-02-28 12:17:58 -08:00
scrawl
b7ab12e7cf Workaround to prevent the map drawing on top of the world button 2013-02-28 21:12:13 +01:00
scrawl
3efbb5e728 Don't try to render a map in empty cells 2013-02-28 20:27:35 +01:00
Marc Zinnschlag
038c5c3e82 Merge remote-tracking branch 'mikesc/bug574' 2013-02-28 20:21:38 +01:00