Commit Graph

246 Commits (c++11)

Author SHA1 Message Date
Marc Zinnschlag c5ae95aedd Merge branch 'master' into c++11
Conflicts:
	apps/openmw/mwworld/store.hpp
10 years ago
Marc Zinnschlag 91d1bab4ac replaced NULL with nullptr 10 years ago
Alexander "Ace" Olofsson 3655ef16af Explicitly instantiate ESM::StatState 10 years ago
scrawl 4c09ecef72 Normalize fixes 10 years ago
scrawl b70383d127 Remove last remains of Ogre math 10 years ago
scrawl de8e5f0db1 Restore projectiles 10 years ago
scrawl fd50be0fb8 Restore various gameplay 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 5abeab21ed Various integer/floating point roll adjustments based on wiki 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 bd8f0248f0 Player rendering 10 years ago
scrawl 0ff7b2ff11 MechanicsManager, frame update 10 years ago
scrawl 8c810e3620 Move rng to components 10 years ago
scrawl e49b8fe690 Fix persuasion mechanics using player stats instead of NPC's (Fixes #2475) 10 years ago
scrawl c92592493e OpenMW: create a window and render the starting cell(s) 10 years ago
scrawl 4e69e7cc0f OpenMW compiles and runs w/o render window 10 years ago
scrawl 5cb61fa01c Don't mark gold as stolen, adjust stolen tooltip (Fixes #2465) 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 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
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 431f540791 ESSImport: fix NPC factions 10 years ago
scrawl c883a73d30 Several warning fixes 10 years ago
scrawl 708dbc2518 Crime fix 10 years ago
scrawl a8ae0dec52 Implement AiWander fast-forward (Feature #1125) 10 years ago
scrawl a62fe38a1b Fix unsafe use of BaseNode 10 years ago
scrawl 768c4a5757 Update crime response to pickpocket attempts (thanks Hrnchamd) 10 years ago
scrawl 7f0d71f8f4 Swap use of iDispAttackMod/fDispAttacking (thanks Hrnchamd) 10 years ago
scrawl edc128572d Add MWMechanics::Actor class for temporary actor state, move AiState there 10 years ago
scrawl 9e5dfb6e98 Update crime system according to research wiki for more accurate attack responses 10 years ago
scrawl 2410d79410 Fix iFightAttack and iFightAttacking being swapped
Looks like the research wiki page was incorrect, the higher value (iFightAttack) being for the victim makes more sense, is consistent with iDispAttackMod/fDispAttacking, and seems to be how the original game behaves as well.
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
scrawl 866fdfe8bd Crime system improvements
- If someone saw the crime, they will notify everyone else in range, even if the Alarm rating of the witness is 0.
- Pickpocket and selling stolen items now works properly, i.e. honors the victim's Alarm rating instead of always being reported.
10 years ago
scrawl 1910327469 Implement disposition changes due to crimes 10 years ago
scrawl 35d2bfabca Adjust NPC response to pickpocket attempts (Fixes #2219) 10 years ago
scrawl 2b78e9795d Implement Calm effect removing combat packages (Fixes #1985) 10 years ago
scrawl d034a079e6 Allow equipping twohanded weapon and shield at the same time (Fixes #1785)
The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.
10 years ago
scrawl 109a3f78a1 Adjust AiFollow distance for groups of multiple followers (Fixes #1637) 10 years ago
scrawl 83dcf9ce4b Overwrite existing records in IndexedStore (Fixes #2182) 10 years ago
scrawl 46d93f1b08 Crime update: NPCs can report crimes if they didn't see the crime, but were alerted by someone who saw it and did not report it themselves. 10 years ago
scrawl 507cbcfae3 Remove incorrect implementation of the iAlarm* GMSTs, not used by vanilla MW (Fixes #2064)
According to Hrnchamd, these are unused. The real mechanics are not fully documented, but from a quick test only NPCs with an alarm value of 100 will report crimes.
10 years ago
scrawl 45f14f0704 Fix stolen faction-owned items not being confiscated 10 years ago
scrawl 7f18f85a1d Forgot const 10 years ago
scrawl 02dec787fd Cache GMSTs in getDerivedDisposition 10 years ago
scrawl e868a48a63 Don't trigger OnPcHitMe for friendly hits (Fixes #1950)
Don't consider actors as followers if they are also in combat with the follow target
10 years ago
scrawl 40ce5add59 Don't report crime for attacking an NPC that is already in combat with another NPC (Fixes #1908, Fixes #1821) 10 years ago
Marc Zinnschlag 2a48c377a8 Merge remote-tracking branch 'miroslavr/master' 10 years ago
scrawl c19f89976e Add missing Hit voice dialogue for friendly hits 10 years ago
MiroslavR 23e6d52844 Fix UI not updating initially for zero stats 10 years ago