1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 13:15:33 +00:00
Commit graph

3129 commits

Author SHA1 Message Date
David Cernat
ed05125f6a Add OpenMW commits up to 2 Aug 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
2019-08-22 15:38:15 +03:00
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
2019-08-22 11:42:02 +03:00
David Cernat
5181c601c0 Add OpenMW commits up to 2 May 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
2019-08-22 08:40:32 +03:00
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
2019-08-21 23:54:39 +03:00
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
2019-08-21 19:04:04 +03:00
David Cernat
95a5607509 Add OpenMW commits up to 22 Feb 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
2019-08-21 17:29:24 +03:00
David Cernat
6205ff6b04 Add OpenMW commits up to 30 Jan 2019
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
2019-08-21 15:48:07 +03:00
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
2019-08-21 14:37:54 +03:00
David Cernat
68886e7539 Add OpenMW commits up to 2 Dec 2018
# Conflicts:
#	.travis.yml
#	README.md
2019-08-21 13:08:56 +03:00
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
2019-08-21 09:04:36 +03:00
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
2019-08-20 13:15:00 +03:00
David Cernat
056591b957 Add OpenMW commits up to 14 Sep 2018
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-20 12:14:57 +03:00
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
2019-08-20 11:31:51 +03:00
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
2019-08-20 10:06:15 +03:00
capostrophic
5341ca4e22 [Regression] Avoid locale-related conversion issues in editor 2019-08-01 11:47:31 +03:00
Axel Vestin
c0f66ac70c Fixes Albemic typo in OpenMW-CS 2019-07-06 00:13:30 +02:00
Nat Meo
bcc5142b32 Issue #4202: Open .omwaddon files without needing to open openmw-cs first. 2019-07-02 16:07:38 +00:00
Nat Meo
af1e5e01b4 Issue #5005: Instance window via Scene window 2019-07-01 23:26:05 +00:00
Capostrophic
5cd781b3eb Experimental folder handling rewrite 2019-05-31 20:01:46 +03:00
Alexei Dobrohotov
44a07efc27
Fix trapped soul object verifier warning 2019-05-29 02:54:19 +03:00
Capostrophic
548d336933 Editor: Don't accept overflowing input in NPC fields 2019-04-30 20:41:23 +03:00
Capostrophic
05d94d35f9 Make disabled shadow defines map static 2019-04-29 19:31:46 +03:00
Capostrophic
9f9b7cb0ae Init shadow defines in the editor too for a good measure 2019-04-29 19:21:37 +03:00
Capostrophic
158f4e23cb Make sure forcePPL and clamp are defined in the editor 2019-04-29 19:21:37 +03:00
Nat Meo
a3b7a12fe7 Bug #4971: OpenMW-CS: Make rotations display as degrees instead of radians 2019-04-25 14:26:28 -04:00
Capostrophic
7814bd1b76 Support eight possible blood types (feature #4958) 2019-04-14 18:48:31 +03:00
Capostrophic
85e99182ce Revise light source configuration (bug #4965)
Set up attenuation less awkwardly
Use global attenuation settings for magic light source
Use constant attenuation settings
2019-04-10 22:31:31 +03:00
Bret Curtis
7808cbbfe8
Merge pull request #2292 from akortunov/fallback
Make fallback map static to simplify constructors
2019-04-07 17:43:59 +02:00
Nelsson Huotari
4c4fb0d955 Add include 2019-04-06 10:38:59 +03:00
Nelsson Huotari
69f900349c Remove unnecessary include 2019-04-06 10:07:07 +03:00
Nelsson Huotari
ee4a8d2166 Add various coordinate conversion functions 2019-04-05 01:54:10 +03:00
Andrei Kortunov
a302ec9c65 Make fallback map static to simplify constructors 2019-03-29 15:30:49 +04:00
elsid
fa7b304e78
Use auto for map value_type in range-based for loops
To avoid implicit call of copy constructor for
pair<const K, V> to pair<K, V> conversion.
2019-03-21 23:09:42 +03:00
Chris Djali
e14682e353
Merge pull request #2273 from AnyOldName3/conformant-comparator
Use irreflexive, asymmetric comparator as required by the spec.
2019-03-20 23:55:03 +00:00
AnyOldName3
32da9a8ab1 Use irreflexive, asymmetric comparator as required by the spec. 2019-03-20 23:32:01 +00:00
elsid
ccb325c663
Add override to fix warnings 2019-03-20 00:19:26 +03:00
Bret Curtis
433893e733
Merge pull request #2256 from unelsson/instance_viewcell
Editor: Implement exterior cell view from Instances table
2019-03-16 20:47:40 +01:00
Nelsson Huotari
2b674cedaa Implement view cell from r-type hint 2019-03-16 14:38:51 +02:00
Capostrophic
44da71fdb3 Restructure script verifier message 2019-03-05 20:47:19 +03:00
Bret Curtis
dc1c2358b9
Merge pull request #2089 from akortunov/qthelp
Editor: Add basic info window
2019-02-25 16:40:11 +01:00
Bret Curtis
3316938dfc
Merge pull request #2182 from Capostrophic/format
Replace Boost format and replace_all where possible
2019-02-24 20:17:31 +01:00
Capostrophic
e70cc10305 Some more de-boosting 2019-02-24 03:20:20 +03:00
Capostrophic
594ea39f5d Revise AI data handling
Make Hello 16-bit unsigned as it's intended to be
Get rid of redundant mHasAI boolean
Always save AI data subrecord
Adjust creature and NPC default rating values to Morrowind defaults
2019-02-23 21:00:47 +03:00
Bret Curtis
f8b34bf7f1 Merge branch 'preview_levelled_item' into 'master'
Fixes #4703 Disable preview for item leveled list

Closes #4703

See merge request OpenMW/openmw!57
2019-02-23 07:49:18 +00:00
Bret Curtis
9e8bc29e3b
Merge pull request #2105 from Capostrophic/colorpicker
[0.45.0 regression] Editor: Fix color picker oddities
2019-02-06 10:07:21 +01:00
Capostrophic
e47f1ef3e3 Fix some color picker regressions
Don't assign invalid color returned when the color picker is closed by Cancel as the new color
Restore "picking finished" signal to make value saving work again
2019-02-05 18:02:47 +03:00
Bret Curtis
ffa3596fe4
Merge pull request #2152 from akortunov/headfix
[0.45 regression] Editor: hide hairs when helmet is used
2019-02-05 15:36:34 +01:00
Bret Curtis
bc1fbd5400
Merge pull request #2088 from akortunov/faction_table
Editor: Implement faction ranks table
2019-02-04 14:51:07 +01:00
Andrei Kortunov
9e4a339ad3 Daytime node switch support (feature #4836) 2019-02-02 10:50:15 +04:00
Andrei Kortunov
11c17ad9d5 Hide hairs when replace the Head bodypart by item's one in the editor 2019-01-30 10:18:48 +04:00