Marc Zinnschlag
|
8fc0bdfac7
|
Merge remote-tracking branch 'cc9cii/keep-config-comments'
|
10 years ago |
cc9cii
|
6b28955f31
|
Fix attempt to erase using a const_iterator.
|
10 years ago |
|
cc9cii
|
36aa4aa9bd
|
If a removed 'content=' item has comments, keep them in config file for later use.
|
10 years ago |
|
Marc Zinnschlag
|
e17f7ac81a
|
Merge remote-tracking branch 'cc9cii/master'
|
10 years ago |
|
cc9cii
|
c22c9c271d
|
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535.
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
|
10 years ago |
scrawl
|
28caeadef4
|
Improve error message for not found records
|
10 years ago |
|
scrawl
|
de98d991b4
|
Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2.
Conflicts:
components/config/gamesettings.cpp
|
10 years ago |
|
scrawl
|
c54a225467
|
Revert "Allow space characters in front of comments."
This reverts commit 4902c66792.
|
10 years ago |
|
scrawl
|
3bfe167bc0
|
Revert "Fix loop where there was a potential for double entry."
This reverts commit a439f49c4d.
|
10 years ago |
|
cc9cii
|
b81454d226
|
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668.
|
10 years ago |
|
scrawl
|
89c2a7e26b
|
Fix for possibly missing library on windows
|
10 years ago |
|
scrawl
|
e13a938896
|
Add support to build with Qt5 (Task #2665)
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
|
10 years ago |
|
scrawl
|
c04f6cf167
|
Remove unused code
|
10 years ago |
|
scrawl
|
cf95d3fc35
|
Refactor cmake scripts, reducing the amount of find_package(Boost)
|
10 years ago |
|
scrawl
|
fc5176dc38
|
Refactor cmake scripts, reducing the amount of find_package(Qt4)
|
10 years ago |
|
cc9cii
|
8e8da724f5
|
Remove unnecessary comment entry in the config file.
|
10 years ago |
|
cc9cii
|
a439f49c4d
|
Fix loop where there was a potential for double entry.
|
10 years ago |
|
cc9cii
|
4902c66792
|
Allow space characters in front of comments.
|
10 years ago |
|
cc9cii
|
15fe5d88e2
|
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535.
- controlled via a checkbox in launcher settings
|
10 years ago |
|
Marc Zinnschlag
|
67f04e0ba1
|
Merge remote-tracking branch 'origin/master'
|
10 years ago |
|
Marc Zinnschlag
|
ee2763f2d4
|
Allow 5th parameter for PlaceAtMe (numeric value, ignored) (Fixes #2591)
|
10 years ago |
Stanislav Bas
|
6cb221f8d0
|
Some minor changes to MWList
|
10 years ago |
|
Stanislav Bas
|
959fe3eb87
|
Reset the scrollbar position in the topic list when DialogueWindow is closed
|
10 years ago |
|
Stanislav Bas
|
5350ce59ef
|
MWList doesn't scroll to the very bottom when it's shown for first time
|
10 years ago |
|
Stanislav Bas
|
5dc6cdeb99
|
Scroll to the top of the topic list when dialog is started
|
10 years ago |
|
Marc Zinnschlag
|
d7cd4203ad
|
Merge remote-tracking branch 'k1ll/mingw'
|
10 years ago |
|
cc9cii
|
5fd107a95c
|
Fix crash with array out of bounds when refNum index is incorrect.
|
10 years ago |
Rohit Nirmal
|
396fba7fa9
|
Silence -Wreorder warnings, and remove -Wno-reorder.
|
10 years ago |
|
cc9cii
|
7f12fc4770
|
Fix for Bug #2544. Add a default mNpdtType to ESM::Npc::blank().
|
10 years ago |
|
Marc Zinnschlag
|
107bf818e7
|
Revert "Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83"
This reverts commit 27751db99a.
Conflicts:
libs/openengine/bullet/physic.cpp
|
10 years ago |
|
Marc Zinnschlag
|
0c27869089
|
Merge remote-tracking branch 'scrawl/bullet283'
|
10 years ago |
|
scrawl
|
27751db99a
|
Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83
|
10 years ago |
dteviot
|
b0c4be2316
|
Multi-select + context menu. (Fixes #2480)
Content selector, added multi-select + context menu to allow check/uncheck the multi-selected items.
|
10 years ago |
|
Marc Zinnschlag
|
83a7eea2a9
|
Merge remote-tracking branch 'scrawl/master'
|
10 years ago |
k1ll
|
8e094d6fa5
|
Add static bullet to components
|
10 years ago |
|
k1ll
|
b194af4ab2
|
Add static qt to components
|
10 years ago |
|
k1ll
|
a230050ec8
|
Boost tr1 unordered map does not work with mingw
|
10 years ago |
|
k1ll
|
00b7712a59
|
Fix shlwapi include case and add the lib for linking when building for windows
|
10 years ago |
|
Marc Zinnschlag
|
ba57a648db
|
Merge remote-tracking branch 'rohit-n/reorder'
|
10 years ago |
|
Marc Zinnschlag
|
607a16eb01
|
removed leftover ignoreRefNum argument
|
10 years ago |
|
Rohit Nirmal
|
997347b01e
|
Silence -Wreorder warnings.
|
10 years ago |
|
Marc Zinnschlag
|
f1c0847897
|
Merge remote-tracking branch 'cc9cii/moveref'
|
10 years ago |
|
Marc Zinnschlag
|
e69687b0f2
|
silenced a warning (potentially unintialised variable)
|
10 years ago |
|
cc9cii
|
7673be6d0f
|
Loading of moved refs complete.
|
10 years ago |
|
cc9cii
|
e668b35b02
|
Fix typo.
|
10 years ago |
|
cc9cii
|
dcce59f76c
|
Pass MovedCellRef info to RefCollection. Still has debugging code.
|
10 years ago |
|
cc9cii
|
acb800b8f9
|
Resolve merge issues and fix typos.
|
10 years ago |
|
cc9cii
|
f1a58994c6
|
Merge branch 'master' into moveref
Conflicts:
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/ref.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
components/esm/cellref.hpp
|
10 years ago |
|
dteviot
|
4607c4b581
|
Add Modified DateTime to plug-in tooltip. (Fixes #2479)
|
10 years ago |
|
scrawl
|
20af2b67a8
|
Change the triangle pattern used for terrain (Fixes #2459)
|
10 years ago |