Commit graph

515 commits

Author SHA1 Message Date
Alexander "Ace" Olofsson
f675d8d039 Merge branch 'master' 2012-06-11 19:09:10 +02:00
Marc Zinnschlag
6ec2a2091c Issue #305: Allow the use of = as a synonym for == 2012-06-07 12:16:03 +02:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
scrawl
10cfe0f5bc Issue #295: Class creation dialogs tooltips; plus tons of other improvements 2012-05-27 06:39:10 +02:00
scrawl
689cf7ce05 ConfirmationDialog 2012-05-23 05:28:25 +02:00
scrawl
343bbaf0fd integrated video settings in the settings file, the launcher is now useless 2012-05-22 03:36:03 +02:00
Marc Zinnschlag
7938566004 Merge remote branch 'scrawl/graphics'
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
2012-05-21 11:24:36 +02:00
scrawl
8f2c8bbea4 Merge branch 'master' into graphics 2012-05-21 09:50:46 +02:00
scrawl
8ce4727424 skill tooltips 2012-05-21 01:58:11 +02:00
scrawl
a284bfb4d0 Merge branch 'master' into inventoryGUI 2012-05-19 15:07:37 +02:00
gugus
6f87493df6 fix collision bug i think. It disable collision for quiet a lot of objects (maybe a little to much) 2012-05-17 15:46:38 +02:00
scrawl
630241c8e2 load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum. 2012-05-17 13:12:38 +02:00
scrawl
471f6467ec Merge branch 'master' into graphics
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2012-05-13 16:18:22 +02:00
scrawl
ddb0a91994 addition to last commit 2012-05-13 12:19:49 +02:00
Lukasz Gromanowski
d9e39bd90e Changed order of plugins.cfg file paths.
Changed order of plugins.cfg file paths - before when plugins.cfg file
was found in global path then it was used as default one. Now the behavoiur
is opposite if plugins.cfg file exists in local path then it is used as
default one.
2012-05-11 21:32:38 +02:00
Alexander "Ace" Olofsson
b1af18e98d Merged next 2012-04-29 09:28:07 +02:00
Alexander "Ace" Olofsson
0c9dfcc017 Some changes 2012-04-29 09:26:03 +02:00
scrawl
4ce83badc9 flickering lights 2012-04-28 20:42:53 +02:00
scrawl
8231cab599 correct case for dialogue topics 2012-04-17 23:47:50 +02:00
Marc Zinnschlag
afa859a6a6 Merge remote branch 'jhooks/clothingarmor'
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
2012-04-15 22:06:05 +02:00
Alexander "Ace" Olofsson
a74aeace73 Can now save strings with proper encoding, byte-perfect clones up until land records 2012-04-14 00:14:04 +02:00
scrawl
95f87a8abf more or less complete list for morrowind.bsa (thanks to artorius) 2012-04-12 16:33:36 +02:00
Alexander "Ace" Olofsson
f16a9ce5ed Working on making output identical to input. 2012-04-12 14:00:58 +02:00
Jason Hooks
7fce57f335 Getting started with a new branch 2012-04-11 20:16:22 -04:00
scrawl
a727bcd4a4 override nif transparency settings (part 1) 2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
Jason Hooks
74deb5588d Post merge 2012-04-08 20:41:49 -04:00
Alexander "Ace" Olofsson
290d09de64 Switching creature and npc to using the same id storage as the rest of the records 2012-04-08 18:32:40 +02:00
Alexander "Ace" Olofsson
f0c32ba7d3 Fixed saving cell ref data with wrong name 2012-04-08 18:01:54 +02:00
Alexander "Ace" Olofsson
fc8c75ab89 Esmtool can now clone an esm file in such a way that it can read it back again afterwards. 2012-04-08 17:04:52 +02:00
Alexander "Ace" Olofsson
0fd48c4229 Extended the esmtool a bit and prepared all records for saving. 2012-04-08 11:51:52 +02:00
scrawl
cdea19206c Revert "more accurate fog, TODO: apply this to the terrain"
This reverts commit 96c37d3e7c.
2012-04-07 22:47:39 +02:00
scrawl
96911ada95 restored render queue of transparent objects, they are now part of the mrt textures
this fixes some issues with transparent objects not visible in the refraction
2012-04-07 22:37:15 +02:00
scrawl
044d649edd Merge branch 'master' into water 2012-04-07 17:16:35 +02:00
scrawl
96c37d3e7c more accurate fog, TODO: apply this to the terrain 2012-04-07 16:55:32 +02:00
Lukasz Gromanowski
e21e8c221d Added explicit cast to char in ToUTF8::windows_XXXX tables.
Added explicit cast to char, without that gcc 4.7 (with default settings)
is showing a lot of:

narrowing conversion of ‘...’ from ‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Wnarrowing]

warnings.
2012-04-07 13:08:25 +02:00
Alexander "Ace" Olofsson
47013799ea Fleshing out the esm writer a bit 2012-04-06 22:25:33 +02:00
Alexander "Ace" Olofsson
b81ac363fc Write names with a small sanity check 2012-04-06 21:28:58 +02:00
Alexander "Ace" Olofsson
7c1e417f9a Niceify-ing it (Yes, that's a word) 2012-04-06 21:14:52 +02:00
Alexander "Ace" Olofsson
ba602929ef Adding basic save functions to all record types. 2012-04-06 21:04:30 +02:00
scrawl
622fb568cf removed MRT setting and figure it out automatically 2012-04-05 19:27:54 +02:00
scrawl
88c50c5171 Merge branch 'master' into water 2012-04-05 15:38:46 +02:00
Marc Zinnschlag
01500e979a another fix for optional arguments 2012-04-05 15:00:49 +02:00
Marc Zinnschlag
6fd3d5c776 Merge remote branch 'lgro/master' 2012-04-04 23:19:30 +02:00
Lukasz Gromanowski
ea8e5cb6f8 Issue #225: Land struct is not copyable.
Disabled copy constructor and assignment operator in Land structure.
2012-04-04 21:39:21 +02:00
Lukasz Gromanowski
cd2789b15a Revert "Issue #225: Correction to commit ae98904."
This reverts commit 0e5c90d3e7.
2012-04-04 21:05:19 +02:00
scrawl
006970fd79 add MRT code to shaders 2012-04-04 19:53:41 +02:00
Jason Hooks
57299571d5 Preparing for clothes/armor 2012-04-02 22:08:46 -04:00
Lukasz Gromanowski
0e5c90d3e7 Issue #225: Correction to commit ae98904.
Changed pointer to LandData struct to simple member variable.
2012-04-02 23:50:53 +02:00
scrawl
2b4b941192 Merge branch 'master' into gamesettings 2012-04-02 15:21:10 +02:00