mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
Code Issues Releases Wiki Activity
21770 commits 38 branches 54 tags 122 MiB
Commit graph

414 commits

Author SHA1 Message Date
David Cernat
6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
 2018-07-14 03:57:05 +03:00
David Cernat
6c1173d598 [Client] Rename searchPtrViaRefIndex into searchPtrViaUniqueIndex 2018-07-13 04:33:54 +03:00
David Cernat
09da24f1ea [General] Rename all instances of refNumIndex into refNum 
This creates symmetry with mpNum and should cause less confusion in the future.
 2018-07-13 04:12:03 +03:00
Andrei Kortunov
3d1daaebab Rework manual spellcasting (e.g. via scripts) 2018-07-12 16:24:25 +04:00
David Cernat
0f30e21312 [Client] Add searchPtrViaRefIndex method to World to easily find objects 2018-07-10 11:30:32 +03:00
David Cernat
a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2018-07-04 01:52:29 +03:00
Thunderforge
7cbc4eeb49 Adding missing override keywords 
Prevents compiler warnings such as this:

```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void onOpen();
                     ^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
        virtual void onOpen() {}
                     ^
```
 2018-07-01 19:17:50 -05:00
Miloslav Číž
477e1437d2 Resolve conflicts 2018-06-14 15:30:28 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360 2018-06-13 21:16:28 +02:00
Miloslav Číž
c3d7ee5a9e Resolve merge conflicts 2018-06-13 08:22:37 +02:00
Miloslav Číž
db8aaa74d6 Start cell border debug drawing 2018-06-13 01:48:31 +02:00
David Cernat
2a3c74bfcc Merge pull request #447 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 2018-06-08 06:01:00 +03:00
Andrei Kortunov
24863f620b RotateWorld: rotate around world axis (bug #4426) 2018-05-30 16:35:52 +04:00
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master 
Add OpenMW commits up to 27 May 2018
 2018-05-27 16:10:16 +03:00
scrawl
cfdf99f601
Revert "Merged pull request #1573" 
This reverts commit 7324bd368f, reversing
changes made to 810e4416f6.
 2018-05-26 11:39:30 +00:00
scrawl
99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix" 
This reverts commit da47fc79f5, reversing
changes made to 7324bd368f.
 2018-05-26 11:35:48 +00:00
David Cernat
3b5fb9cd6b [General] Make it possible to set year via WorldTime 2018-05-25 03:33:12 +03:00
David Cernat
4acf93b7db [General] Make it possible to set days passed via WorldTime 2018-05-24 14:02:04 +03:00
David Cernat
74c2a0b311
Merge pull request #438 from OpenMW/master 
Add OpenMW commits up to 24 May 2018
 2018-05-24 12:16:11 +03:00
Bret Curtis
da47fc79f5
Merge pull request #1701 from akortunov/standfix 
Do not apply queue movement for standing actors
 2018-05-23 22:35:08 +02:00
Marc Zinnschlag
7324bd368f Merged pull request #1573 2018-05-23 17:00:29 +02:00
David Cernat
8d36d0d945 [General] Make it possible to change world's time scale via WorldTime 2018-05-23 08:31:25 +03:00
Capostrophic
867a5938ca Don't reset sneaking camera offset while in GUI (fixes #4420) 2018-05-20 10:24:20 +03:00
David Cernat
7f00005f04 [Client] Fix GCC build 
Based on 71040659ac
 2018-05-10 07:16:33 +03:00
Andrei Kortunov
3636cf2015 Do not apply queue movement for standing actors 2018-05-05 22:41:26 +04:00
Andrei Kortunov
22fb1f3403 Play spellcasting effects from objects 2018-04-30 17:12:06 +04:00
David Cernat
ac82124a5d Merge pull request #395 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
 2018-03-29 07:28:30 +03:00
scrawl
c02920bcd1
Merge pull request #1634 
Conflicts:
	apps/openmw/mwworld/worldimp.hpp
 2018-03-20 22:48:20 +00:00
Andrei Kortunov
53ef345680 Update magic effect particles after building new animation (bug #2254) 2018-03-19 10:43:22 +04:00
Andrei Kortunov
a0a30cdbf5 AI: hide torches during bad weather (bug #4334) 2018-03-19 08:03:53 +04:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360 2018-02-25 11:25:19 +01:00
David Cernat
60f686ee43 [General] Implement setting of physics framerate as part of GameSettings 2018-02-14 05:53:44 +02:00
David Cernat
4496625154
Merge pull request #381 from OpenMW/master 
Add OpenMW commits up to 31 Jan 2018
 2018-01-31 05:03:28 +02:00
scrawl
b1b8e31562
Use unique_ptr over new/delete (Fixes #4305) 2018-01-30 22:05:16 +00:00
David Cernat
420dab10e1 [General] Track objects directly placed by players in ObjectPlace 
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).

Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
 2018-01-28 17:46:51 +02:00
Miloslav Číž
4fc532d873 reference screenshot settings only from one place 2017-11-11 14:32:28 +01:00
Miloslav Číž
319ed2f9b8 disable 360 screenshots in vanity/preview mode 2017-11-10 15:23:44 +01:00
Miloslav Číž
d4fd08a63f save 360 screenshots in the configured directory 2017-11-09 16:49:46 +01:00
Miloslav Číž
7feba7e498 basic setup for 360 screenshots 2017-11-07 13:07:11 +01:00
David Cernat
3a9e5e3a7b Merge pull request #319 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwworld/worldimp.hpp
 2017-10-22 20:27:44 +03:00
AnyOldName3
03fc3353b9 Tidy up indentation 2 2017-10-19 16:34:50 +01:00
AnyOldName3
f3e6b26e6b Tidy up indentation 2017-10-19 16:34:11 +01:00
AnyOldName3
2abff22c08 Make MWWorld::World final to enable compiler optimisations 2017-10-18 13:48:31 +01:00
AnyOldName3
7440cf37bc Remove redundant virtual keywords implied by override keywords 2017-10-18 13:37:37 +01:00
AnyOldName3
69da89be39 Mark a method I missed out the first time as override 2017-10-18 13:05:04 +01:00
AnyOldName3
2aad5bed7a Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos 2017-10-18 05:06:09 +01:00
David Cernat
ddf0dfed55 Merge pull request #298 from OpenMW/master 
Add OpenMW commits up to 26 Sep 2017
 2017-09-26 21:54:55 +03:00
MiroslavR
f15de6d3ca ESS-Importer: Convert magic projectiles (Closes #2320) 2017-09-20 18:58:56 +02:00
David Cernat
fbec0d9443 [Client] Remove inertia from players who are teleported via a packet 2017-08-04 21:43:01 +03:00
David Cernat
b8b3856c73 Merge pull request #244 from OpenMW/master 
Add OpenMW commits up to 19 Jul 2017
 2017-07-19 20:49:56 +03:00