dteviot
77a1d947cc
extracted MWMechanics::getPlayer()
10 years ago
scrawl
af3b0cd883
Improve some error messages
10 years ago
Marc Zinnschlag
d436dc332b
Merge remote-tracking branch 'jeffreyhaines/gametimetracker'
10 years ago
Jeffrey Haines
f94d3237fc
Removed unused cmake import
10 years ago
Jeffrey Haines
61bb55aff4
Removed long int parameter
10 years ago
Jeffrey Haines
d91f197119
Time played display setting
10 years ago
Jeffrey Haines
69729046bf
Updated parameter name to reflect units
10 years ago
Jeffrey Haines
e86891d6e1
Time played displayed in save/load menus
10 years ago
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl
9fad33cd14
Don't reset the item model's sort/filter options in updatePlayer ( Fixes #2863 )
10 years ago
scrawl
c8d6679a25
Remove an unused function
10 years ago
scrawl
afb3d94ba4
Fix cell names in the save/load menu not being localised ( Fixes #2840 )
10 years ago
scrawl
c25dacb480
Fix "Level" string in the save/load menu not being localised (Bug #2840 )
10 years ago
scrawl
7dd09dd637
Fix being able to flip journal pages with the mousewheel when the options overlay is active ( Fixes #2855 )
10 years ago
scrawl
c57e72fe03
Adjust the sleep interruption chance ( Fixes #2781 )
10 years ago
scrawl
e8c9d3ea2a
Fix cell names on world map not always being translated ( Fixes #2832 )
10 years ago
scrawl
0d8f07d563
Properly apply changes when backing out of chargen dialogs ( Fixes #2627 )
10 years ago
Marc Zinnschlag
d2cd151f77
Merge remote-tracking branch 'kunesj/master'
10 years ago
Jiří Kuneš
a14a3c82de
added description of new syntax to the onRetrieveTag function comment
10 years ago
scrawl
1156668843
Render certain map markers on top of the player arrow ( Fixes #2559 )
10 years ago
Jiří Kuneš
a5b4e087c5
define owned colours in settings.cfg
10 years ago
Jiří Kuneš
cbc44b33ba
define crosshair owned colour in openmw_hud_box.skin.xml
10 years ago
scrawl
77f1387da8
Include cleanup
10 years ago
Jiří Kuneš
75f5972898
show owned - better settings
10 years ago
Jiří Kuneš
df077f8649
color tooltip red when taking item would result in crime
10 years ago
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
Marc Zinnschlag
edde1fb727
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
10 years ago
scrawl
6e493500c9
Show custom map markers on the tooltip of the world map marker ( Fixes #2711 )
10 years ago
scrawl
41bed4c7d9
Use multimap to speed up custom map marker code
10 years ago
Jiří Kuneš
4a6d806127
fixed comment, save settings to member variable, removed usless include, changed variable to const
10 years ago
Jiří Kuneš
e68b388d16
removed setCrosshairOwned from windowmanager
10 years ago
Jiří Kuneš
c019f8e23d
use correct mechanics manager
10 years ago
Jiří Kuneš
15107ca5cf
crosshair owned - settings option
10 years ago
Jiří Kuneš
66edae9b93
change collor of crosshair
10 years ago
Jiří Kuneš
72728b9c01
disable cusor when item/container is owned
10 years ago
scrawl
91d71d0fcd
Disable MyGUI's scrollbar autorepeat ( Fixes #2779 )
...
We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.
10 years ago
scrawl
f8d360190d
Remove an unneeded virtual
10 years ago
scrawl
992b770315
Don't set OnPcEquip for items that failed to equip ( Fixes #2776 )
10 years ago
scrawl
de6dc21552
Create hardware cursors in advance ( Fixes #2660 )
10 years ago
scrawl
dca4704b4b
Print exceptions in CharacterCreation::spawnDialog
10 years ago
scrawl
f1b52c964a
Select the current resolution in resolution list on game start ( Fixes #2768 )
10 years ago
scrawl
24ae1d5ace
Fix some issues found by coverity
10 years ago
Alexander "Ace" Olofsson
b1cc74dd9a
Explicity instantiate MWMechanics::Stat
10 years ago
Alexander "Ace" Olofsson
3655ef16af
Explicitly instantiate ESM::StatState
10 years ago
scrawl
bf9c62fa42
Fix for some coverity scan defects
10 years ago
scrawl
b90fc8ad92
Fix for various Viewer::frame calls resetting the simulationTime
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
scrawl
d4c45efb2b
Remove useless #undef's for windows now that we have NOMINMAX flag
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
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
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
Stanislav Bas
c40987338d
Scrollbars don't save their positions between openings
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
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
scrawl
7bacb9418d
Various math code ported to osg
10 years ago
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
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
8e0a988289
Icon fix
10 years ago
Stanislav Bas
5dc6cdeb99
Scroll to the top of the topic list when dialog is started
10 years ago
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
6d3528af70
Port global map exploration
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
c811ac6afe
Port fog of war
...
Not optimized yet, need to work on fog texture's DataVariance.
10 years ago
scrawl
6555ee8d80
Minor include cleanup
10 years ago
scrawl
025a1a7866
Restore savegame screenshot display
10 years ago
scrawl
723beb1cac
Move IncrementalCompileOperation to SceneManager
10 years ago
scrawl
3dcb167066
Map rendering
10 years ago
scrawl
da24e298ee
Fix -Wreorder warnings
10 years ago
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
scrawl
d1b6289cad
Don't teleport followers when using teleportation spells
10 years ago
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
scrawl
c4452afd89
Inventory item picking
10 years ago
scrawl
72c1f37527
Port CharacterPreview
10 years ago
scrawl
75ace9f8b5
Global map base layer
10 years ago
scrawl
1b41f6c4c5
Sleep interruption fix
10 years ago
scrawl
bec9abd319
Remove name extension for internal MyGUI textures
...
Since they're no longer loaded from disk, the extension makes no sense.
10 years ago
scrawl
49df07ea7f
Implement UI scaling factor
10 years ago
scrawl
842ff4d874
Catch exception for not found videos
10 years ago
scrawl
24bb2e152c
Apply texture filter setting changes
10 years ago
scrawl
a18663c8b3
Improve MyGUI texture updates
10 years ago
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
scrawl
5abeab21ed
Various integer/floating point roll adjustments based on wiki
10 years ago
scrawl
58a2ad663c
Fix regression of sleep interruption chance
10 years ago
scrawl
c819180aa1
Minor cleanup
10 years ago
scrawl
3b8b217888
Fix no punishment for stealing when taking an item with the inventory opened
10 years ago
scrawl
033719ccd7
Correct the icon used for custom map markers
10 years ago
scrawl
ca53457a1c
Correct the map icons used for detect spells ( Fixes #2519 )
10 years ago
scrawl
52a4456cf7
LoadingScreen update
10 years ago
scrawl
5db0639983
IncrementalCompileOperation tweak
10 years ago
scrawl
cf0fc43004
GUI shutdown fix
10 years ago
scrawl
483dc9de45
Stop viewer threading before changing MyGUI textures
10 years ago
scrawl
00f4f78717
Give a name to video streams for logging purposes
10 years ago
scrawl
c1edc30ad7
Dead code removal
10 years ago
scrawl
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago
scrawl
f0789352c6
Silence error message
10 years ago
scrawl
5a759f8b0d
GUI cleanup fix
10 years ago
scrawl
9de575ad42
Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen
...
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
10 years ago
scrawl
37e3118d21
FontLoader cleanup fix
10 years ago
scrawl
283b252142
Stub InputManager
10 years ago
scrawl
31ead3a9f4
Increase loading screen FPS
...
Now that it's rendered in a background thread, we can have a smooth loading bar at virtually no performance cost.
10 years ago
scrawl
351fd842fd
Port loading screen
10 years ago
Marc Zinnschlag
83a7eea2a9
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
d772da3720
Main menu background videos
10 years ago
scrawl
dc9b27acfe
Create manual GUI textures
10 years ago
scrawl
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
10 years ago
scrawl
82c4d01b37
Add back resource handling workarounds to the gui code
10 years ago
scrawl
b0804734e5
Port VideoWidget
10 years ago
scrawl
223e3a53f5
Move OEngine::Gui::Layout to MWGui
10 years ago
scrawl
6afb0e43ef
Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69
10 years ago
scrawl
a59940a2c7
Move MyGUI platform to components
10 years ago
scrawl
db7fe1952d
Move MyGUI texture to a separate file
10 years ago
scrawl
62847f0489
Use node masks to separate Scene and GUI
10 years ago
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
10 years ago
scrawl
a27446c8fb
Remove unused headers
10 years ago
scrawl
7809caf9dc
Dead code removal
10 years ago
scrawl
15164e20f7
Cleanup fix
10 years ago
scrawl
42d6c6140c
Add mygui backend by chris
10 years ago
scrawl
8c810e3620
Move rng to components
10 years ago
scrawl
26766b8e0a
Dead code removal
10 years ago
scrawl
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
scrawl
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
scrawl
c92592493e
OpenMW: create a window and render the starting cell(s)
10 years ago
dteviot
fe69dc2863
Made LineInfo a struct, as requested by Scrawl.
10 years ago
dteviot
52de622e97
provide incremental update of SpellWindow ( Fixes #2411 )
...
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
10 years ago
dteviot
6b6bed520d
removed redundant calls.
10 years ago
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
scrawl
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
scrawl
5cb61fa01c
Don't mark gold as stolen, adjust stolen tooltip ( Fixes #2465 )
10 years ago
scrawl
d573458896
Fix case sensitivity bug in default head/hair selection ( Fixes #2453 )
10 years ago
Marc Zinnschlag
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
10 years ago
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
10 years ago
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
10 years ago
scrawl
f603a68144
Allow binding Hand To Hand in quick keys menu ( Fixes #2024 )
10 years ago
scrawl
7fd1c2c2e2
CharacterCreation refactoring
10 years ago
scrawl
48ea6286fd
Book/scroll window refactoring
10 years ago
scrawl
37a6d7da76
WindowManager refactoring
10 years ago
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
10 years ago
dteviot
ca8c8c6aa4
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
10 years ago
dteviot
e6cd8484a2
fixing MSVC 2013 warning C4244: & C4305
...
fixes for mistakes in last commit.
10 years ago
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
10 years ago
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
10 years ago
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
10 years ago
dteviot
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
10 years ago