Commit Graph

508 Commits (c++11)

Author SHA1 Message Date
Marc Zinnschlag ff108b4c6b replaced boost::shared_ptr with std::shared_ptr 10 years ago
scrawl 882e359008 Move attackStrength to the CharacterController, where it should have been to begin with
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
10 years ago
scrawl 7bacb9418d Various math code ported to osg 10 years ago
scrawl 2a85a22dba Write savegame screenshot 10 years ago
scrawl de8e5f0db1 Restore projectiles 10 years ago
scrawl a066b24303 Restore WeaponAnimation 10 years ago
scrawl c811ac6afe Port fog of war
Not optimized yet, need to work on fog texture's DataVariance.
10 years ago
scrawl 3dcb167066 Map rendering 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
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 85345e663a Restore getHitContact 10 years ago
scrawl 8bcfac1ea3 Fix adjustPosition not always working correctly (Fixes #2563)
moveObject was returning an incorrect Ptr for cell movements.
10 years ago
scrawl 7a3bc69df7 Readded sound listener 10 years ago
scrawl 19988d5e45 Remove RefData::getHandle 10 years ago
scrawl 47758c11cd Readded collision objects and movement physics 10 years ago
scrawl 9cf9c2876e Pathgrid rendering 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 223e3a53f5 Move OEngine::Gui::Layout to MWGui 10 years ago
scrawl 7809caf9dc Dead code removal 10 years ago
scrawl 68f93294da Port EffectManager 10 years ago
scrawl d00c75d428 Remove more outdated TODO comments. 10 years ago
scrawl 48ea6286fd Book/scroll window refactoring 10 years ago
scrawl 37a6d7da76 WindowManager refactoring 10 years ago
dteviot 407cd50890 fixed warning C4099:
type name first seen using 'class' now seen using 'struct'
10 years ago
scrawl 2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
10 years ago
scrawl 97cc2522c0 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
10 years ago
Digmaster 1e4a845b6f Minor code cleanup 10 years ago
Marc Zinnschlag 4c5bba2947 Merge remote-tracking branch 'dteviot/SpellCastingFixes' 10 years ago
dteviot 8d7de7d1ec Telekinesis allows safe opening of traps (Fixes #1916)
When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests.
10 years ago
scrawl 3ccf4642b4 Implement ToggleScripts 10 years ago
Marc Zinnschlag e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 10 years ago
Alexander "Ace" Olofsson f2c5060cc0 Fix cstdint issue on travis GCC build 10 years ago
Alexander "Ace" Olofsson d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 10 years ago
MiroslavR 1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 10 years ago
scrawl bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 10 years ago
scrawl aa6ebcd75c Change stolen items handling to match MW (Fixes #1443, Fixes #2290) 10 years ago
scrawl 27dc49a135 Rewrite game settings manager
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
scrawl 7542fb5cd9 Show map notes on door marker leading to the cell with the note (Fixes #2284) 10 years ago
scrawl f4c8064d39 Fix camera not being attached properly when player becomes vampire (Fixes #2319) 10 years ago
scrawl c883a73d30 Several warning fixes 10 years ago
scrawl 5104a5a023 Add missing setFactionReaction instruction, use absolute storage instead of difference
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).

This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
10 years ago
scrawl c3f3f8b3d0 Use only Cell records for saving progress bar (Fixes #2259) 10 years ago
scrawl 579f5d232f Move interactive messageBox to separate function 10 years ago
dteviot 7fe2f86d06 Slaughter fish attacks when player only knee deep in water (Fixes #2076) 10 years ago
scrawl 4e92f6ab48 Add commandline option to load a save game on startup 10 years ago
scrawl de9d347018 Fix on touch area effect spells (Fixes #2233) 10 years ago
scrawl 9e5dfb6e98 Update crime system according to research wiki for more accurate attack responses 10 years ago
scrawl f3738e9a98 Say an "intruder" voice dialogue for trespassing crimes (Fixes #1082)
Seems to be broken in the original engine, but according to the TES-CS help this is how the intruder voices should be used. There are legitimate entries for "intruder" in the game's files, so we might as well use them.
10 years ago