Commit Graph

770 Commits (move)

Author SHA1 Message Date
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
Stanislav Bas 163c12d3eb Merge remote-tracking branch 'upstream/master' 10 years ago
Stanislav Bas 196be7283d Reset an activated reference after activation's exectution (Fix #1738) 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 47758c11cd Readded collision objects and movement physics 10 years ago
scrawl c819180aa1 Minor cleanup 10 years ago
scrawl 9d86e5b028 GetSpellEffects returns true for active abilities (Fixes #2530) 10 years ago
scrawl 283b252142 Stub InputManager 10 years ago
scrawl 9cf9c2876e Pathgrid rendering 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
Marc Zinnschlag 056bc66c6c Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 10 years ago
Scott Howard e2ef8c4022 fix -Wnewline-eof warnings 10 years ago
dteviot 36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
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
Marc Zinnschlag ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 10 years ago
Marc Zinnschlag 907ac5ef7f Merge remote-tracking branch 'scrawl/master' 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
Marc Zinnschlag 2e31f01585 Merge remote-tracking branch 'maqifrnswa/bug2407' 10 years ago
scrawl 8931ddf428 Remove unneeded casts 10 years ago
Scott Howard d01e8cc97d PositionCell/PlaceItemCell: add console message if cell doesn't exist 10 years ago
Marc Zinnschlag bf92d5cde9 removed redundant mScript field in ESM::StartScript 10 years ago
Scott Howard 53213bf236 if cell doesn't exist, PositionCell and PlaceItemCell warn std::err but still execute, bug #2407 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
scrawl 3ccf4642b4 Implement ToggleScripts 10 years ago
Marc Zinnschlag e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 10 years ago
Alexander "Ace" Olofsson fce404acc5 Remove some including of mwbase/world.hpp
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
10 years ago
Alexander "Ace" Olofsson d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 10 years ago
Alexander "Ace" Olofsson df5a08b6de Move manualref code out of header 10 years ago
MiroslavR 2223a69ab8 Fix getpcinjail returning 0 when the console is open 10 years ago
MiroslavR 9bbe6f8c5e Remove todo 10 years ago
MiroslavR 1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 10 years ago
scrawl ae77eacd7e Skill progress refactoring 10 years ago
scrawl 6ea59c93ab Ignore the object scale in Move instruction (Fixes #2275) 10 years ago
scrawl 6d097fbfbd Normalise spelling of "levelled" throughout the code 10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
scrawl 7d76f1a113 PlaceAt count argument should spawn independent references (Fixes #2283) 10 years ago
scrawl 2346c3528d Remove NpcStats::mProfit and store it in the script instead
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
10 years ago
scrawl 431f540791 ESSImport: fix NPC factions 10 years ago
scrawl 9d3f0b2ed5 Remove some unused code, include cleanup 10 years ago
scrawl b1bd236345 ESSImport: convert script local variables
Had to add special reading code to openmw, because the variable names are not stored.
10 years ago
scrawl a619cff615 Implement EnableLevelupMenu to trigger level-up 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 1780bcc238 Print RefNum in BetaComment 10 years ago
Marc Zinnschlag 289a912817 Merge remote-tracking branch 'scrawl/master' 10 years ago
dteviot 7aa0f887c0 Minor changes to ESM::RefNum
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
10 years ago
scrawl 579f5d232f Move interactive messageBox to separate function 10 years ago
scrawl 363d1f9207 Merge remote-tracking branch 'upstream/master' 10 years ago
scrawl 0a2dd4c6cb Fix unsafe use of BaseNode in Move script instruction 10 years ago
scrawl 4aed5158cc Support region names in cell dialogue filter (Fixes #2113) 10 years ago
Alexander "Ace" Olofsson 462b41a3a8 Missing files, aka; Why you shouldn't stresscommit 10 years ago
Alexander "Ace" Olofsson 0af5c7b379 Starting to clean up some heavy includes 10 years ago
scrawl 31d28e727f Implement leveled list script functions (Fixes #1546) 10 years ago
Marc Zinnschlag 1f74d8cca5 Merge remote-tracking branch 'scrawl/scripttest' 10 years ago
scrawl ba65c6cc7f Add --script-all-dialogue switch to compile all dialogue scripts (Fixes #1659) 10 years ago
scrawl 2601b26217 Merge branch 'master' of https://github.com/OpenMW/openmw 10 years ago
scrawl 7892ed35f3 PlaceItem, PlaceItemCell: Make sure references are placed above terrain (Bug #2078) 10 years ago
scrawl 886903d70e Implement HitAttemptOnMe function (Bug #2078) 10 years ago
scrawl 5f00a3d5c3 Reset lastHitObject when it is retrieved rather than every frame
This seems to be how vanilla MW does it.
10 years ago
scrawl be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 10 years ago
scrawl d955017079 Don't report script operation status via messageBox (Bug #1942) 10 years ago
scrawl 7e8ca3fff1 Fix object movement between cells producing a stale Ptr within the script execution (Bug #1942) 10 years ago
Digmaster c37881ead1 Joystick Support 10 years ago
scrawl 855fe33c59 Add vanilla-compatible range limiting for playloopsound (Fixes #244, Fixes #1342) 10 years ago
scrawl f49fde3d5d Add support for undeleting references (Fixes #2193)
Deleted references should be accessible via an explicit reference, and can be undeleted using "setdelete 0". Also the Resurrect function implicitely undeletes the given reference.
10 years ago
scrawl 2952a0e2aa Make Resurrect function reset most of the runtime state (Fixes #2181) 10 years ago
scrawl b9d0552166 Fix positionCell rotation argument when used on the player
This fixes the player's initial orientation on the starting boat, to properly face Jiub.
10 years ago
scrawl 8103d25b09 Make ToggleMenus close open windows (Fixes #2045) 10 years ago
MiroslavR 6e1a11f322 Queue screen fade operations invoked by scripts 10 years ago
scrawl 5f5fcc2fef Make PlayGroup use an indefinite number of loops (Fixes #2156) 10 years ago
scrawl 4fd3a994e9 Add model and script information to BetaComment 10 years ago
scrawl d7220cdc2f Do not allow decrease below zero in modCurrentMagicka and modCurrentHealth (Fixes #2158) 10 years ago
MiroslavR a4d0068e29 Make forcegreeting no-op for disabled references (Fixes #2093) 10 years ago
Marc Zinnschlag 7785e3a0bc fixed for potential crash during saved game loading 10 years ago
Marc Zinnschlag ac58dd735b do not crash on exceptions while adding startup scripts 10 years ago
scrawl f7ba1dbfc8 Add error handling for getPcRank and similar defines (Fixes #2071) 10 years ago
scrawl aa02974d3b Fix Journal instruction for non-existing journal indices (Fixes #2063) 10 years ago
scrawl dab05471be Reset crime when bounty is reset to 0 by a script (Fixes #2057) 10 years ago
MiroslavR ed3a3f717f Handle getdistance on objects inside a container (Fixes #2046) 10 years ago
MiroslavR 925fa8d193 Reset ownership of items dropped via 'drop' instruction (Fixes #2053) 10 years ago
Marc Zinnschlag c97845d35d better script compiler diagnostics 10 years ago
Marc Zinnschlag 984b586bb1 fix for implicit references 10 years ago
Marc Zinnschlag 8afdf0f46b dagoth fix 10 years ago
scrawl 69bbbefc09 setDynamic workaround for broken endgame scripts (Fixes #2016) 10 years ago
Marc Zinnschlag eb45793eab Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage' 10 years ago
Thoronador 4d62541b62 fix usage of numeric_limits static functions min() and max()
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
10 years ago
scrawl 8cb09e89ed Make spells cast by scripts always succeed (Fixes #1993) 10 years ago
scrawl 8097d9801d Fix HasSoulgem function to return number of soulgems 10 years ago
scrawl c4fa671381 Don't allow raising faction rank if the next rank has no name (Fixes #1975) 10 years ago
scrawl c010c28337 Implement ToggleWorld instruction 10 years ago
scrawl 7252cb63a6 Fix cppcheck issues 10 years ago
scrawl 603e558fb7 Fix broken getCollidingPc / getCollidingActor (cppcheck) 10 years ago
scrawl 04c79d5f1e Fix case issue when setting companion's profit on the script 10 years ago