David Cernat
68837aaf4a
Add OpenMW commits up to 15 Oct 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/mwgui/containeritemmodel.cpp
# apps/openmw/mwgui/tradewindow.cpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwworld/actionteleport.cpp
# apps/openmw/mwworld/containerstore.cpp
4 years ago
Assumeru
72549651e0
Rework container resolution ( #3006 )
...
* Rework container resolution
* add optional argument to getCount
* remove now-redundant changes
* undo worldimp changes
* move save-fixing code to InventoryState
* replace Rng instances with Seeds
4 years ago
Andrei Kortunov
822764d0fa
Rework fixed strings handling
4 years ago
David Cernat
0eedf8fd9f
Add OpenMW commits up to 30 Sep 2020
...
# Conflicts:
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/summoning.cpp
# components/CMakeLists.txt
4 years ago
Andrei Kortunov
9f1fbd56a3
Fix SummonKey comparison function
4 years ago
Andrei Kortunov
67eace1028
Use struct instead of tuple
4 years ago
Andrei Kortunov
924f634bda
Support for multiple summons with same ID in the single spell
4 years ago
David Cernat
baa9446cd1
Add OpenMW commits up to 4 Aug 2020
4 years ago
Evil Eye
6ad20ec9c7
Mutate base records when adding/removing spells
4 years ago
David Cernat
5eb7eb8d88
Add OpenMW commits up to 4 Jul 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/charactercreation.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/character.cpp
5 years ago
Andrei Kortunov
d0fe15b095
Use meaningful names instead of mSkill1 and mSkill2
5 years ago
David Cernat
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
5 years ago
bzzt lost a hitlab login
26ab176389
profiling
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
David Cernat
e5b1843089
Add OpenMW commits up to 11 Jun 2020
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/activespells.cpp
# apps/openmw/mwmechanics/aiactivate.cpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/creaturestats.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/statsextensions.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
36a2308acd
Add OpenMW commits up to 30 May 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwscript/interpretercontext.cpp
5 years ago
Andrei Kortunov
d997842f8d
Use FourCC to declare all ESM record names
5 years ago
Bret Curtis
cd97d0c61c
Merge branch 'master' into automove
5 years ago
Roman Siromakha
27a113167c
Merge pull request #2890 from akortunov/position
...
Do not store object position, if it is the same as in CellRef
5 years ago
Andrei Kortunov
75e7a3e8b1
Do not store object position, if it is the same as in CellRef
5 years ago
elsid
5209f5ff6d
Mark all derived classes from ESM::ObjectsState and overriden functions as final
5 years ago
David Cernat
62df188fd4
Add OpenMW commits up to 16 May 2020
...
# Conflicts:
# CI/before_script.linux.sh
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwscript/globalscripts.cpp
# apps/openmw/mwscript/interpretercontext.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/cellstore.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
# components/interpreter/context.hpp
5 years ago
Capostrophic
1873da4c91
Don't save to or read automove state from saved games ( #5452 )
5 years ago
Bret Curtis
204d2acf25
Merge pull request #2092 from akortunov/float_stats
...
Store attributes and skills values as floats
5 years ago
Andrei Kortunov
81805b7263
Introduce a separate class to control world date and time
5 years ago
Andrei Kortunov
5468fcb29f
Store attributes and skills values as floats (bug #4021 )
5 years ago
Andrei Kortunov
3dce225f28
Implement vanilla-style corprus handling (bug #3714 , bug #4623 )
5 years ago
Andrei Kortunov
b5833f3c59
Use real time to update spell effects instead of game timestamps (bug #5165 )
5 years ago
Andrei Kortunov
e6ca95174a
Optimize characters data in savegame
5 years ago
Andrei Kortunov
d5806fd0ed
Fix merge conflicts
5 years ago
Bret Curtis
42cba092b7
Merge pull request #2716 from akortunov/png
...
Store fog of war as a PNG image instead of TGA
5 years ago
Bret Curtis
4b30bf5699
Merge pull request #2829 from Capostrophic/logging
...
Log some more things
5 years ago
unknown
3b4782959e
Allow targeting non-unique actors with StartScript (bug #2311 )
5 years ago
Capostrophic
aa5161f99e
Log some more things
5 years ago
David Cernat
a20f8e77dc
Add OpenMW commits up to 25 Apr 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
5 years ago
Bret Curtis
e7795f2bf7
Merge pull request #2775 from Capostrophic/dooractivation
...
Only disarm traps with keys when the door/container is locked (bug #5370 )
5 years ago
Bret Curtis
8c2f3ff007
clean up code; purge const_cast
5 years ago
Capostrophic
bbed9a70c5
Ignore traps of initially unlocked refs with assigned keys
5 years ago
David Cernat
25a632c650
Add OpenMW commits up to 13 Apr 2020
...
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
5 years ago
Capostrophic
ad333e88fe
Handle enchantment autocalc flag as a flag (bug #5363 )
5 years ago
Andrei Kortunov
028760e108
Merge pull request #2758 from akortunov/warnfix
...
Fix some issues, found by CoverityScan
5 years ago
Capostrophic
5732b8e026
Use std::fill instead of loops to reset some arrays to defaults
5 years ago
Capostrophic
27d4fe9ee1
Fix ESM::Land oversights
5 years ago
Andrei Kortunov
a68d9aed4c
Fix issues, found by CoverityScan
5 years ago
elsid
ef4a7089e4
Use template specialization for writeHNT to write raw arrays
...
To avoid passing explicit size argument where it's possible.
5 years ago
David Cernat
7bc3298ed4
Add OpenMW commits up to 1 Apr 2020
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# apps/openmw/mwphysics/physicssystem.cpp
5 years ago
Andrei Kortunov
e20d156904
Do not write empty trade time
5 years ago
Bret Curtis
79517f3f42
Merge pull request #2724 from akortunov/factions
...
Cleanup ownership for items in containers
5 years ago
Andrei Kortunov
ea30e27370
Cleanup ownership for items in containers
5 years ago
Andrei Kortunov
dea2018d9f
Do not use dynamic casts when using ObjectState
5 years ago
Andrei Kortunov
94df2114c1
Store fog of war as a PNG image instead of TGA (bug #5108 )
5 years ago
David Cernat
85fb1d1a0b
Add OpenMW commits up to 19 Feb 2020
...
# Conflicts:
# apps/openmw/mwworld/scene.cpp
5 years ago
David Cernat
f0f76516d8
Add OpenMW commits up to 4 Feb 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
5 years ago
Capostrophic
216a5d27c6
Avoid working with AMBI subrecord in tools unnecessarily (bug #5269 )
5 years ago
David Cernat
60b6f92fa3
Add OpenMW commits up to 13 Jan 2020
...
# Conflicts:
# apps/openmw/mwmechanics/actors.cpp
5 years ago
capostrophic
89055f1c6c
Generate WNAM upon saving terrain
5 years ago
capostrophic
0467e8ee15
Avoid heap corruption while reading SCVR (bug #4680 )
5 years ago
David Cernat
a58f09fd6c
Add OpenMW commits up to 2 Jan 2020
...
# Conflicts:
# apps/openmw/mwmechanics/enchanting.cpp
# apps/openmw/mwworld/scene.cpp
5 years ago
Alexei Dobrohotov
2693598d82
Merge pull request #2642 from akortunov/warnfix2
...
Add safety checks for door state
5 years ago
Andrei Kortunov
24044b08e0
Do not store gold-specific value for everything
5 years ago
Andrei Kortunov
88a695f251
Add safety checks for door state
5 years ago
David Cernat
ca9cd90a4d
Add OpenMW commits up to 20 Dec 2019
...
# Conflicts:
# apps/openmw/mwworld/scene.cpp
5 years ago
Assumeru
737aa1e4e8
Remove FactionID editing from OpenCS ( #2636 )
...
* Remove FactionID editing
* remove useless comments
* rename FactionID to Unknown
5 years ago
Assumeru
dfbe0021a5
Change rescaling to be more inline with vanilla ( fixes #5214 ) ( #2635 )
...
* move rescaling to loadData
* clamp on save
5 years ago
Capostrophic
4b38bab0d9
Make sure empty cell name subrecords are saved (bug #5222 )
5 years ago
David Cernat
5762a36fc2
Add OpenMW commits up to 7 Nov 2019
...
# Conflicts:
# apps/openmw/mwmechanics/aifollow.hpp
5 years ago
Andrei Kortunov
6eb8e0cf4d
Display magic effects according to research page
5 years ago
Bret Curtis
0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images"
5 years ago
Bret Curtis
36614dba2a
Merge pull request #2453 from akortunov/fog_compression
...
Store raw data about fog of war instead of RGBA images
5 years ago
David Cernat
54301f5f89
Add OpenMW commits up to 29 Oct 2019
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
# apps/openmw/mwworld/inventorystore.cpp
5 years ago
Andrei Kortunov
b2e12f0a73
Attempt to fix a regression - crash on ARM
5 years ago
Andrei Kortunov
2fc819cdae
Encode ID's in all places to UTF-8 (bug #3977 )
5 years ago
David Cernat
4a34666c59
Add OpenMW commits up to 7 Oct 2019
...
# Conflicts:
# apps/openmw/mwmechanics/aiactivate.cpp
5 years ago
Nelsson Huotari
2fdaacf23c
remove for array, just std::swap
5 years ago
Nelsson Huotari
e35ed960ee
for -> std::copy
5 years ago
Nelsson Huotari
7f030fc3ee
copy mWnam record in copy constructor and custom assignment operator
5 years ago
Andrei Kortunov
b360deaec3
Store raw data about fog of war instead of RGBA images (bug #5108 )
5 years ago
David Cernat
353e7d530a
Add OpenMW commits up to 18 Aug 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
ed05125f6a
Add OpenMW commits up to 2 Aug 2019
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
5 years ago
David Cernat
b57c0bcafe
Add OpenMW commits up to 6 June 2019
...
# Conflicts:
# apps/openmw/mwgui/hud.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/waitdialog.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
5181c601c0
Add OpenMW commits up to 2 May 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.cpp
5 years ago
David Cernat
f671c0bddc
Add OpenMW commits up to 1 Apr 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/trainingwindow.cpp
# apps/openmw/mwgui/travelwindow.cpp
# apps/openmw/mwgui/waitdialog.cpp
5 years ago
David Cernat
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
5 years ago
David Cernat
95a5607509
Add OpenMW commits up to 22 Feb 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
5 years ago
David Cernat
6205ff6b04
Add OpenMW commits up to 30 Jan 2019
...
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
5 years ago
David Cernat
6fdef4fd0a
Add OpenMW commits up to 1 Jan 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
cbba81df03
Add OpenMW commits up to 14 Nov 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/inventorystore.cpp
5 years ago
David Cernat
fba07194cf
Add OpenMW commits up to 29 Oct 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
056591b957
Add OpenMW commits up to 14 Sep 2018
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
889bcec7f8
Add OpenMW commits up to 1 Sep 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwclass/creature.cpp
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/difficultyscaling.cpp
# apps/openmw/mwscript/transformationextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
84cab59057
Add OpenMW commits up to 19 Aug 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
5 years ago
Andrei Kortunov
f0cef772fa
Refactor weapon types behaviour
...
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
5 years ago
Andrei Kortunov
b9a1e4d796
Merge pull request #2425 from Capostrophic/esm
...
Signedness fixes
6 years ago
Capostrophic
3aa65273c5
Signedness fixes
6 years ago
Evil Eye
698c90b3ee
fix builds against MyGUI master
6 years ago
Alexei Dobrohotov
2c956398c1
Actually fix bug 4938
6 years ago
Capostrophic
7814bd1b76
Support eight possible blood types (feature #4958 )
6 years ago
Capostrophic
4b6fc5f720
Make sure the record hasn't ended in getHString hack (bug #4938 )
6 years ago
elsid
c91deaf7af
Use std::vector::data method to avoid reference binding to null pointer
6 years ago
Andrei Kortunov
943279abbb
Consider land texture with given ID and index as override for base texture with the same ID and index (bug #4736 )
6 years ago
Bret Curtis
56d5fc788c
Merge pull request #2163 from Capostrophic/hello
...
AI data handling minor revisions
6 years ago