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