scrawl
b7cd62e4de
Revert "Remove user preference setting option."
...
This reverts commit d3b7cf44d3
.
10 years ago
scrawl
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
Stanislav Bas
281088c93b
Add check for an empty sound field to SoundGens verifier
10 years ago
Stanislav Bas
2c15ad5e0c
Add SoundGens verifier
10 years ago
cc9cii
5b6984d8d8
Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656 .
10 years ago
Marc Zinnschlag
c560f8b8a2
Merge remote-tracking branch 'smbas/fix-regionmap-colors'
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
Stanislav Bas
a294e24a85
Reset ColorEditor checked state after the popup is hidden
10 years ago
Stanislav Bas
b06d1f008f
Redraw the color editor immediately after the color is updated
10 years ago
Stanislav Bas
f19d07b404
Rename ColorPickerDelegate to ColorDelegate
10 years ago
Stanislav Bas
650e37dba1
RegionMap uses proper colors
10 years ago
Stanislav Bas
e516d37cbf
MapColourColumn::set() uses the correct color value
10 years ago
Stanislav Bas
caeba1b887
Draw the frame around rect in ColorEditor and ColorPickerDelegate
10 years ago
Stanislav Bas
eb5180ba86
Save selected color in a model when picking is finished
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
Stanislav Bas
4096d2851c
Remove outdated ColorEditButton files
10 years ago
scrawl
d4c45efb2b
Remove useless #undef's for windows now that we have NOMINMAX flag
10 years ago
scrawl
4b5c2398a1
Remove QTextCodec::setCodecForCStrings
...
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
10 years ago
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
scrawl
7407bbdac9
Add a function for SDL error handling
10 years ago
scrawl
800bd511f6
Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649 )
10 years ago
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
scrawl
d03880fbf0
Compile fix for old boost versions
10 years ago
scrawl
76bdf7a5b7
Add night-eye effect
10 years ago
Stanislav Bas
e257c915bf
Add color picker popup to choose color
10 years ago
scrawl
6051c47eef
Fix for incorrect QString -> path conversion
10 years ago
scrawl
712cef36b0
Minor cleanup
10 years ago
scrawl
f81c3bcd6d
Fix for broken InitWorldSpaceParticles on projectile effects
10 years ago
scrawl
c94c87d409
Attach effects to the insert node instead of the object root (Bug #2654 )
10 years ago
scrawl
c7493eb45c
Fix bug with invisibility effect for meshes w/ vertex colors
10 years ago
dteviot
cb8ca2f03a
Moved logic for building a Sync'ed path from AiCombat to PathFinding.
...
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
10 years ago
dteviot
6d7e6cd30c
AiTravel logic merged into AiPackage.
10 years ago
Marc Zinnschlag
8d22d26669
Merge remote-tracking branch 'cc9cii/scrollbar-fix'
10 years ago
scrawl
15453e3d90
Use MyGUI::UString for unicode conversion
10 years ago
Stanislav Bas
ef88b28c26
Create a custom item editor for color columns
10 years ago
scrawl
f511cb08ff
Compatibility with bullet versions < 2.81
10 years ago
Stanislav Bas
d7fb497255
Color values are displayed as colored rectangles in tables
10 years ago
Alexander "Ace" Olofsson
cd42448cd6
Windows build fixes and CMakeLists cleanup
...
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
10 years ago
Marc Zinnschlag
f3e040b531
Merge remote-tracking branch 'cc9cii/filter-fix'
10 years ago
cc9cii
893ad11be1
Fix missing columns in tables. Should resolve Bug #2624 .
...
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
10 years ago
scrawl
0330d3d61e
Restore the "transparent" loading screen
10 years ago
scrawl
f3cbe7b9da
Hide FPS widget since it currently doesn't work, use F3 instead
10 years ago
scrawl
bf02c7f6e4
Sun visibility fix
10 years ago
scrawl
508c57d6e2
addEffect crash fix for objects with no model
10 years ago
scrawl
16e080e252
Fix the physics debug drawer lagging a frame behind
10 years ago
scrawl
b33fe8fb62
Fix the inventory listener bug
10 years ago
scrawl
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
10 years ago
Stanislav Bas
c9a8d53240
Merge remote-tracking branch 'upstream/master'
10 years ago
Marc Zinnschlag
211f6a39b8
Merge remote-tracking branch 'cc9cii/keep-comments'
10 years ago
Marc Zinnschlag
d90aff4303
Merge remote-tracking branch 'smbas/feature-id-completion'
10 years ago
cc9cii
d3b7cf44d3
Remove user preference setting option.
10 years ago
scrawl
0a411cbd7c
Enable particle lighting
10 years ago
Stanislav Bas
d63b01dde3
Checkboxes in the table view use a combobox editor
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
Stanislav Bas
49512a2b57
Correct the explanation for the Console::acceptCommand()
10 years ago
Stanislav Bas
d2293867ba
Add the explanation to Console::acceptCommand()
10 years ago
Stanislav Bas
58e2d3711f
Reset Console editbox before command execution
10 years ago
cc9cii
5c37079f0c
Include only the columns that are visible for sorting. Should resolve Bug #2611 .
10 years ago
scrawl
4c09ecef72
Normalize fixes
10 years ago
scrawl
1fd48e6f81
Fix not being able to move during ashstorm
10 years ago
scrawl
700000cbca
Error handling fix
10 years ago
scrawl
403ce30a35
Graceful handling for failing to create SDL window
10 years ago
scrawl
ddfed35d1c
Object placement raycasts should use the rendering meshes
10 years ago
Stanislav Bas
c40987338d
Scrollbars don't save their positions between openings
10 years ago
scrawl
a0b0ae9bd1
Remove an unused variable
10 years ago
scrawl
958b34771a
Fix clang warnings about 'typename' outside of a template
10 years ago
scrawl
30ab15e605
Fix -Wunused-private-field clang warnings
10 years ago
scrawl
e23775e338
Fix -Woverloaded-virtual clang warnings
10 years ago
scrawl
141e9d36a4
Get rid of unused DialogueManager::mScriptVerbose
10 years ago
scrawl
78ac37b52a
Remove BOOST_STATIC_ASSERT to fix clang warnings
10 years ago
scrawl
93656aa6cf
Add a header missing from CMakeLists
10 years ago
scrawl
869f8a329a
Cloud scrolling fix
10 years ago
scrawl
ce0d93caed
Fix for "GlobalMap trying to erase an inactive camera" spam in main menu
10 years ago
scrawl
91eea1258c
doc.hpp fix
10 years ago
scrawl
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
scrawl
b70383d127
Remove last remains of Ogre math
10 years ago
scrawl
364b785e8f
ESSImporter image conversions port to osg::Image
10 years ago
scrawl
2eec0caca0
Remove dependency on Ogre::StringConverter
10 years ago
scrawl
cc6d5a3ba0
Fix player setup bug
10 years ago
scrawl
7bacb9418d
Various math code ported to osg
10 years ago
scrawl
0cc9b1bb40
Remove dependency on OgrePlatform.h
10 years ago
scrawl
1ba3fa4169
Remove leftovers of the old OpenCS navigation
10 years ago
scrawl
e642f20a65
Restore screenshot key functionality
10 years ago
scrawl
2a85a22dba
Write savegame screenshot
10 years ago
scrawl
24551c7bab
Fix for savegame incompatibility with master branch
10 years ago
Stanislav Bas
bd46ddcf47
Correct the return type in IdTree::data() for Display_Role
10 years ago
Stanislav Bas
b25cc6bc55
IdCompletionManager uses Display type instread of ColumnId for creating completers
10 years ago
scrawl
41cce5240f
Delete remaining files that won't be of any use
10 years ago
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl
292fa0b5e3
Unify raycasting techniques for "on touch" magic
...
We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.
10 years ago
scrawl
cee1db532f
Improve area orb positioning for "on touch" spells
10 years ago
scrawl
cd47dff196
Minor cleanup
10 years ago
scrawl
2883ecc19a
Fix the hilarious bug of NPCs falling to their deaths in interiors
10 years ago
scrawl
cdd0623009
Terrain rendering
10 years ago
Stanislav Bas
4e759370de
Change Display_String to the proper display type where appropriate
10 years ago
Stanislav Bas
f84c36b500
CommandDelegate: extract a display type from a model if it isn't specified
10 years ago
scrawl
58ebf57154
Apply a comment that got lost in the endless depths of my git stash
10 years ago
scrawl
8c50f8ed26
Fix for lights with no mesh
10 years ago
scrawl
5a7f2a4f1f
Restore light attenuation settings
10 years ago
scrawl
01944c33f5
Basic water rendering
10 years ago
scrawl
adc8e0b93e
Merge branch 'smbas-master'
10 years ago
Stanislav Bas
2c4025ec72
Rename the method isCompleterExistFor() to hasCompleterFor()
10 years ago
Stanislav Bas
959fe3eb87
Reset the scrollbar position in the topic list when DialogueWindow is closed
10 years ago
scrawl
de8e5f0db1
Restore projectiles
10 years ago
scrawl
c85764b654
Wireframe mode
10 years ago
Marc Zinnschlag
b866e11873
Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'
10 years ago
scrawl
7f9f9a32d2
InitWorldSpaceParticles fix
10 years ago
scrawl
987918ca15
NpcAnimation::setAlpha
10 years ago
scrawl
bed31996c9
Camera raycast
10 years ago
scrawl
2869424847
Fix first person camera for beast races
10 years ago
scrawl
f88079fddd
Restore the isOnGround hack
10 years ago
scrawl
ccd95419e5
Restore various raycasting
10 years ago
scrawl
8e0a988289
Icon fix
10 years ago
scrawl
e306853570
Fix chargen crash
10 years ago
scrawl
84fd682e4e
Fix for unnecessary exceptions when opening sounds
...
This would throw often during normal play, even though the throws are caught and ignored, can be annoying when the debugger is set to 'catch throw'.
10 years ago
Stanislav Bas
5dc6cdeb99
Scroll to the top of the topic list when dialog is started
10 years ago
scrawl
5b846ebc71
Camera precision fix
10 years ago
scrawl
ed4863ad7d
Restore ranged weapon aiming
10 years ago
scrawl
71bafcb52b
Restore head tracking
10 years ago
Stanislav Bas
dbe61115b2
Fix the mistyping header guard in the idcompletiondelegate.hpp
10 years ago
Stanislav Bas
e636101725
Add missing new lines at the ends of files
10 years ago
Stanislav Bas
9e405b69fa
Create the custom completer popup to avoid the problem with the wrong height of the default popup
10 years ago
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
60f55997fd
Rotate first person meshes, sneak camera offset in first person
10 years ago
scrawl
a066b24303
Restore WeaponAnimation
10 years ago
Stanislav Bas
994c6833bc
Add missing columns for the ID completion
10 years ago
Stanislav Bas
e943d17b29
Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes
10 years ago
Stanislav Bas
602f33bd91
Add ColumnId role to the IdTree data methods
10 years ago
Stanislav Bas
5e8718d8b2
Add the ID completion delegate factory to the delegate factory collection
10 years ago
scrawl
7f2dd21c66
Fix for StartScript regression ( Fixes #2590 )
10 years ago
Stanislav Bas
33e36ee922
Add the ID completion delegate
10 years ago
Stanislav Bas
19cc6b83e5
Integrate the Id completion manager into the Document class
10 years ago
Stanislav Bas
87a1f9f9aa
Add ID completion manager
10 years ago
cc9cii
c4aa3d3ee3
Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained.
10 years ago
Marc Zinnschlag
88d5aed62d
removed code that interfered with the default window size on Linux ( Fixes #2568 )
10 years ago
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
10 years ago
cc9cii
01eba7b721
Extra check for thread affinity.
10 years ago
cc9cii
76196d815d
Update user preference setting value via an event message queue.
10 years ago
Marc Zinnschlag
17747a2dd9
Merge remote-tracking branch 'cc9cii/highlight-colours'
10 years ago
scrawl
988a9cad58
getHitContact Head exception fix
10 years ago
scrawl
cc3bfe2bb2
Restore collision tracker
10 years ago
scrawl
b2fe21dd3b
Minor cleanup
10 years ago
scrawl
fd50be0fb8
Restore various gameplay
10 years ago
cc9cii
0aaac59cc3
Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588 .
10 years ago
scrawl
5c7ecb9c1d
string::compare exception fix
10 years ago
scrawl
af2f26d04d
Particle fixes
10 years ago
cc9cii
9cbda0ffad
Allow users to select syntax highlighting colours. Should resolve Feature #2507 .
10 years ago
cc9cii
393cee406f
Use signals for user preference setting updates.
10 years ago
cc9cii
ce421b230b
Move scrollbar to newly opened subview. Should resolve Bug #2576 .
10 years ago
scrawl
7e715decd3
Color fix
10 years ago
scrawl
6d3528af70
Port global map exploration
10 years ago
cc9cii
734e52d1c8
Move the user preference check to the preparation step before the running of the operation.
10 years ago
cc9cii
9ad69d9085
Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585 .
10 years ago
cc9cii
6821cb4133
Use the tree model rather than a nested proxy for the dialogue only listing (i.e. non table) items. Should resolve Bug #2586 .
...
- QDataWidgetMapper requires the rootindex to be set, which was not possible with the nested proxy model.
10 years ago
scrawl
7a1408cfed
Restore display of global map overlay, no exploration yet
10 years ago
scrawl
72d0a69132
Fix global map markers not being cleared on a new game
10 years ago
scrawl
9ee63dc3f4
Change stats viewer key to f3
10 years ago
scrawl
5f7a82e0da
Fog of war fix
10 years ago
scrawl
f4ee805e3b
Object animation fix
10 years ago
scrawl
c811ac6afe
Port fog of war
...
Not optimized yet, need to work on fog texture's DataVariance.
10 years ago
scrawl
5628a2b823
Camera zoom fix
10 years ago
scrawl
8b3054aa8b
Fix for player collision cleanup issue
10 years ago
scrawl
6555ee8d80
Minor include cleanup
10 years ago
scrawl
025a1a7866
Restore savegame screenshot display
10 years ago
cc9cii
00c165d3a5
Add user preference option to check unused or redundant pathgrid points. Also resolve namespace clash issue in osx.
10 years ago
scrawl
1f00174c02
Use a btCollisionWorld instead of btDiscreteDynamicsWorld
...
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
10 years ago
scrawl
fe439e53ff
Bullet include cleanup
10 years ago
Marc Zinnschlag
b6878c2e0c
improved error handling in LocalScripts::add
10 years ago
Marc Zinnschlag
baaf801521
Merge remote-tracking branch 'cc9cii/loadcell-fix'
10 years ago
cc9cii
674a124bc6
Don't use local type as a template parameter.
10 years ago
cc9cii
3a31468af0
Pathgrid record verifier. Feature #2000 .
10 years ago
cc9cii
6966555377
Object verifier check to see if the script used by that object actually exists. Should resolve Bug #2582 .
10 years ago
cc9cii
b7044ac119
Fix crash loading some addon files. Should resolve Bug #2583 .
...
- This may be a bug within QSortFilterProxyModel
- It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers.
10 years ago
scrawl
2f97649540
Fix for cleanup issue when exiting after a failed savegame load ( Fixes #2580 )
10 years ago
scrawl
723beb1cac
Move IncrementalCompileOperation to SceneManager
10 years ago
scrawl
099f93f00d
Sky fixes
10 years ago
scrawl
c4951d1e73
Map rotation fix
10 years ago
scrawl
3dcb167066
Map rendering
10 years ago
Marc Zinnschlag
99dbd82a44
Merge remote-tracking branch 'cc9cii/fix-dialogue-subview-crash'
10 years ago
Marc Zinnschlag
ae1a606876
Merge remote-tracking branch 'cc9cii/selective-refresh'
10 years ago
cc9cii
f06ddd47c4
Return the correct range for a given topic. Should resolve Bug #2569 .
10 years ago
cc9cii
aafcaf32c5
Qualify the scope of Flag_Dialogue. (another one)
10 years ago
cc9cii
2f29c2c077
Qualify the scope of Flag_Dialogue.
10 years ago
cc9cii
ec808843c3
Do not rebuild the dialogue subview unless required. Should resolve Bug #2581 .
...
The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview. Changes in this commit include:
- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list
10 years ago
cc9cii
95f740ec40
Give CSVWorld::EditWidget::mMainWidget a chance to clean up its children. Should resolve Bug #2578 .
10 years ago
Marc Zinnschlag
5f41ef4809
Merge remote-tracking branch 'cc9cii/master'
10 years ago
cc9cii
3c82e6d034
Retrieve the correct index for the type of record being un-deleted.
10 years ago
cc9cii
e6d2821b78
Refresh table filters when the model is updated. Should resolve Bug #2579 .
10 years ago
Marc Zinnschlag
6402b82823
Merge remote-tracking branch 'cc9cii/master'
10 years ago
Marc Zinnschlag
07ce7b95cf
Merge remote-tracking branch 'cc9cii/npc-additional-data'
10 years ago
cc9cii
22420c3a83
Close DialogueSubView if the corresponding record is deleted. Should resolve Bug #2575 .
...
- ToDo: Doesn't seem to shrink the widget width properly (when horizontal scrollbar is active)
10 years ago
cc9cii
c721e340d8
Merge branch 'master' into npc-additional-data
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
10 years ago
cc9cii
21af1913e1
Ensure ColumnId names are unique.
10 years ago
scrawl
76dd3e4034
Fix lip animation regression
10 years ago
scrawl
1fd9fba7a3
Fix debug drawer crash
10 years ago
scrawl
95465a1489
Player raycast fix
10 years ago
scrawl
d84990be85
Restore getCollisions
10 years ago
scrawl
8b322fcd06
Implement getFacedObject using osgUtil::IntersectionVisitor
10 years ago
scrawl
c2131e7c31
Make near clip distance configurable
10 years ago