cc9cii
488bc76da5
Fix saving land data.
2015-03-13 22:06:55 +11:00
Marc Zinnschlag
056bc66c6c
Merge remote-tracking branch 'scrawl/master'
2015-03-12 10:29:39 +01:00
scrawl
5f051b5bf2
Remove comment about GMST cleaning which was removed.
2015-03-12 00:32:57 +01:00
scrawl
16ddfbca14
Remove some outdated todo comments
2015-03-12 00:27:01 +01:00
scrawl
304277429f
Rename variable to not show up in search for "TODO" comments.
2015-03-12 00:21:46 +01:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
2015-03-09 03:15:11 +01:00
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
2015-03-08 18:29:12 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
2015-03-07 18:34:29 +01:00
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
2015-03-07 11:04:54 +13:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
dteviot
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
2015-03-06 21:36:42 +13:00
cc9cii
d28f257ada
Fix for bug #2428 . Set default flag value (mandatory) for containers.
2015-03-06 11:53:46 +11:00
dteviot
80fe24207c
correction from Scrawl.
...
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-05 20:21:22 +13:00
Marc Zinnschlag
4e1c086d6a
load start up script records
2015-03-03 14:31:59 +01:00
Marc Zinnschlag
bf92d5cde9
removed redundant mScript field in ESM::StartScript
2015-03-03 13:04:57 +01:00
scrawl
a8cb4e807b
Warning fix
2015-03-03 11:24:23 +01:00
scrawl
17e3069896
Minor efficiency fix
2015-03-02 22:33:37 +01:00
scrawl
f6509fe53e
Another crash fix for land record without data
2015-03-02 22:23:00 +01:00
Marc Zinnschlag
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
2015-03-02 20:01:31 +01:00
scrawl
0ad514b29b
Fix collision for nodes with MRK extra data ( Fixes #2415 )
2015-03-02 01:03:03 +01:00
cc9cii
1ee6153940
Remove unnecessary boolean passing between objects.
2015-03-02 06:51:31 +11:00
cc9cii
c4625b94e5
Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.
2015-03-01 12:52:43 +11:00
dteviot
5e2839977b
file extension comparison needs to be case insensitive.
2015-02-28 20:25:03 +13:00
dteviot
54e3ebde63
addon list in launcher shows addon files with no dependencies ( Fixes #2348 )
...
Also, game files must end with ".esm" or ".omwgame".
2015-02-28 17:13:21 +13:00
Marc Zinnschlag
44d1f43b2b
Merge remote-tracking branch 'sandstranger/fixes-for-android'
2015-02-27 10:34:41 +01:00
Marc Zinnschlag
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
2015-02-26 19:05:30 +01:00
sylar
70398e2f9f
change Jni name method
2015-02-26 18:30:14 +04:00
dteviot
9d61457956
AddOn files can be checked if game file is checked, but dependencies do not exist.
2015-02-25 20:54:52 +13:00
dteviot
6878e317a7
launcher: decouple Combo Box model from Plug-ins model.
...
fixes bug reported by scrawl
1. openmw.cfg had content files in order 'Bloodmoon.esm, Tribunal.esm, Morrowind.esm'
2. Blank_ESM_2.0.esm is in the Data Files directory
3. Do an ini file import.
4. Imported profile will have Blank_ESM_2.0.esm as the game file. Should be Morrowind.esm.
Root cause: Game File combo box and Plugins Grid shared same data model, so changing plug-in file order also changed order of Game File combo box.
2015-02-24 20:06:06 +13:00
dteviot
63af9d848a
Add constraint: Bloodmoon.esm requires Tribunal.esm.
2015-02-23 19:58:31 +13:00
dteviot
6dc202cba3
Removed unneeded parameter from ContentModel::setContentList()
2015-02-23 19:41:41 +13:00
scrawl
387969bf42
Remove an old .gitignore
2015-02-22 18:05:46 +01:00
dteviot
accc078e0e
Morrowind.ini import progress bar. ( Fixes #2344 )
...
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
2015-02-22 08:46:12 +13:00
Marc Zinnschlag
8686ffcedb
Merge remote-tracking branch 'scrawl/master'
2015-02-17 11:55:12 +01:00
Marc Zinnschlag
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
2015-02-15 09:52:13 +01:00
scrawl
96a295c44f
Fix for deleting all items in a levelled list
2015-02-13 17:37:56 +01:00
scrawl
8b417c06db
Fix missing clear in ESM::Spell::load ( Fixes #2368 )
2015-02-13 17:26:33 +01:00
scrawl
a139e4efb0
Grey out completed quests in journal quests list
2015-02-13 16:51:34 +01:00
Kamil Bar
3b7a23aa72
Fixed charge checks for light and other objects, corrected CellRef charge union comments
2015-02-13 13:11:10 +01:00
scrawl
49d912e5b6
Don't rely on subrecord order part 2
...
Nice side effects:
- Subrecord name comparison now uses magic number instead of string (faster)
- Improves the error message for unknown subrecords: will print the record in question instead of failing to read the next record with a strange error
2015-02-12 05:43:22 +01:00
slothlife
cfe81bafe8
Remove setting CMAKE_BUILD_TYPE to Debug
...
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
2015-02-11 21:46:00 -06:00
scrawl
9009889d24
Don't rely on subrecord order when reading ( Fixes #2361 )
2015-02-10 23:19:33 +01:00
scrawl
3ccf4642b4
Implement ToggleScripts
2015-02-10 20:25:57 +01:00
jacmoe
ee574e08ef
MIT License header added to all terrain component files.
2015-02-09 20:16:29 +01:00
scrawl
03257ecae5
QString encoding fix
2015-02-09 20:15:41 +01:00
scrawl
4c6b9f8266
Remove redundant decoder in ContentModel
2015-02-06 01:27:17 +01:00
scrawl
cff0127ce7
Update comment on merging levelled lists
2015-02-06 01:27:17 +01:00
