David Cernat
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
7 years ago
Koncord
916ada108f
[General] Modernize Log utility
...
* Reverse Log levels
* Add LOG_TRACE
* Spawn instance of Log in Get() function
7 years ago
AnyOldName3
c1a871ff1f
Make indentation consistent.
7 years ago
AnyOldName3
daf7d8451c
Switch to a more reliable method of passing the git-version targt the data it needs
7 years ago
AnyOldName3
e3142b9643
Add missing variables to those forwarded to the git-version target
7 years ago
David Cernat
76a4abd7c0
Merge pull request #325 from TES3MP/master while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
7 years ago
David Cernat
dd25c7db4e
Merge pull request #324 from OpenMW/master
...
Add OpenMW commits up to 24 Oct 2017
7 years ago
scrawl
0c6ef17fb5
Add explicit variant of 'OnActivate'
7 years ago
David Cernat
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
Marcin Baszczewski
46b015d3d9
Fix assert with empty setting value
...
Local value could be empty, so it's important to check it size before read first char.
7 years ago
Marc Zinnschlag
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
7 years ago
Koncord
d702845026
[General] Fix Clang warnings in Log.hpp
7 years ago
David Cernat
b20df4b7cd
Merge pull request #316 from TES3MP/master
...
Add master commits up to 17 Oct 2017
7 years ago
David Cernat
184c5f2b29
Merge pull request #315 from OpenMW/master
...
Add OpenMW commits up to 17 Oct 2017
7 years ago
scrawl
7f8d996eff
Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support
...
Launcher and wizard ampersand escape support
7 years ago
David Cernat
17a8e32782
Merge pull request #314 from TES3MP/master
...
Add master commits up to 16 Oct 2017
7 years ago
David Cernat
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
scrawl
136ef1f738
Fix incomplete settings in recreateShaders()
7 years ago
scrawl
03554b2f4b
Fix some style issues flagged by cppcheck
7 years ago
scrawl
50d7eb8e54
Fix crash when adding a NULL object to the cache
7 years ago
scrawl
97ec38affb
Merge pull request #1492 from drummyfish/master
...
fix rain/snow moving with player (issue #2698 )
7 years ago
AnyOldName3
49dbb4a9ca
Add a third copy of a comment where I felt clarification was missing
7 years ago
AnyOldName3
7329e6a9ef
Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher.
7 years ago
AnyOldName3
28ff677337
Save 'data=...' lines correctly when exiting the wizard
7 years ago
Miloslav Číž
65977b910e
wrap weather around in all directions
7 years ago
Miloslav Číž
380a5799dd
use bbox as wrap range & apply to all particle systems
7 years ago
Miloslav Číž
33a1459b11
search for particle system by class name
7 years ago
Kyle Cooley
11eae16645
Get rid of duplicate function, fix flag checking
7 years ago
scrawl
5fbdb64bb9
Add OPENMW_DECOMPRESS_TEXTURES environment variable to decompress textures in software if not supported by graphics hardware
...
Disabled by default due to requiring new functionality that was just added to OSG 3.6 or OpenMW/OSG.
7 years ago
scrawl
f3ca9832b0
Merge pull request #1500 from akortunov/extraspell
...
Implement ExtraSpell magic effect
7 years ago
Andrei Kortunov
30b05b557b
ExtraSpell magic effect: a basic implementation
7 years ago
AnyOldName3
c9e86a8ebc
Remove superfluous argument
7 years ago
AnyOldName3
f9a3562ccd
Remove duplicate macro definition and fix warning
7 years ago
AnyOldName3
2652a89df4
Fix mismatched indentation that apparently the .editorconfig file doesn't handle automatically
7 years ago
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
Koncord
6cb9c3c713
[General] Remove explicit specifier
7 years ago
Koncord
5c79e7106f
[Browser] Minor improvements
7 years ago
David Cernat
4845599bda
Merge pull request #308 from TES3MP/master while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/main.cpp
7 years ago
David Cernat
182f8c1f06
[General] Print client version on startup
7 years ago
David Cernat
61b1a59814
[General] Move server's version printing method to Utils
7 years ago
David Cernat
7a38a0b223
Merge pull request #305 from TES3MP/master
...
Add master commits up to 6 Oct 2017
7 years ago
David Cernat
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
Marc Zinnschlag
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
7 years ago
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
7 years ago
David Cernat
841a4f90c1
Merge pull request #301 from TES3MP/master
...
Add master commits up to 28 Sep 2017
7 years ago
scrawl
44720bf41a
Allow MWList items to retain key focus
7 years ago
scrawl
b9341925f2
Set AutoSizedEditBox as Static by default
...
Would look very odd anyway to use it for editable text, with the widget resizing as you type.
7 years ago
scrawl
c88c535e0e
Fix HBox/VBox not using Client widget with MyGUI <= 3.2.2
7 years ago
David Cernat
ddf0dfed55
Merge pull request #298 from OpenMW/master
...
Add OpenMW commits up to 26 Sep 2017
7 years ago
scrawl
be7bdec2ed
Merge pull request #1471 from crussell187/nif_stream_optimization
...
first pass on optimization of nif parsing functions from the file stream
7 years ago
scrawl
19e07fad30
Remove redundant Services enum
7 years ago
scrawl
82a211ba03
Fix duplicate code
7 years ago
scrawl
76ddf8d794
Support Up/DownArrow keys to change NumericEditBox value
7 years ago
scrawl
1ad14b232f
Adjust ImageButton to accept key focus and use the 'highlighted' texture
7 years ago
scrawl
e7ad012977
Pass repeat key events to the GUI
...
For example, one can scroll to the last element in a list by holding down the 'Down Arrow' key.
7 years ago
scrawl
2494c22d66
Merge pull request #1470 from MiroslavR/convertmprj
...
ESS-Importer: Convert magic projectiles
7 years ago
825de71b29
removed an iostream include used for debug prints from nifstream.hpp
7 years ago
30a213a9b3
updates for nifstream optimization including fixing the non-x86 path for little endian reads
7 years ago
David Cernat
b5ce3cebbc
Merge pull request #297 from TES3MP/master
...
Add master commits up to 22 Sep 2017
7 years ago
David Cernat
73e7aa838d
Merge pull request #296 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
7 years ago
8834066dea
make streaming to a type array in nif a direct copy from the file into the vector
7 years ago
090a8408b8
made nif basic type read optimizations more portable
7 years ago
c72aa19d6d
first pass on optimization of nif parsing functions from the file stream
7 years ago
scrawl
58f9688433
Use client coordinates in HBox/VBox
7 years ago
scrawl
fb975d02db
Use client coordinates in HBox/VBox
7 years ago
MiroslavR
f15de6d3ca
ESS-Importer: Convert magic projectiles ( Closes #2320 )
7 years ago
David Cernat
76f1a61538
Merge pull request #295 from TES3MP/master
...
Add master commits up to 20 Sep 2017
7 years ago
David Cernat
7f0ea7d01f
Merge pull request #294 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/character.cpp
7 years ago
David Cernat
4d4eb1bb9f
Merge pull request #292 from OpenMW/master
...
Add OpenMW commits up to 18 Sep 2017
7 years ago
Chris Robinson
021627bdf8
Mark some functions with override
...
Fixes some Clang warnings about overriding a virtual function without the
override keyword.
7 years ago
Kyle Cooley
50d9d9f78f
Get rid of some templates, exceptions instead of assert, and other small changes.
7 years ago
Andrei Kortunov
4bb349a525
Use default 0 precision in the float formatting (bug #4096 )
7 years ago
Kyle Cooley
2abf7f1752
Remove unnecessary cache dump
7 years ago
David Cernat
cccbe753d7
[General] Update version to 0.7-alpha
7 years ago
Koncord
045dc566ea
Merge branch 'master' into new-script-api
7 years ago
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
Kyle Cooley
09e645a0e0
Fix careless mistake.
7 years ago
Kyle Cooley
25d4a0370f
Changes to land data access in tables, also update Land once per frame in scene view.
7 years ago
Kyle Cooley
d030b595f8
Fix potential segfault, cleanup, get rid of warnings.
7 years ago
Kyle Cooley
72cb405de2
Some bug fixes, changes to land load code.
7 years ago
Kyle Cooley
2eacc2f093
Changes to land creation, add ability to specifically clear terrain cache
7 years ago
Kyle Cooley
ab607f3028
Tweaks to land loading, land cloning, terrain signals, placeholder land update handling
7 years ago
Andrei Kortunov
538498230b
Declare mClient variable
7 years ago
scrawl
dca31b7ffa
Remove redundant _boundingBoxComputed which no longer exists in osg master ( Fixes #4075 )
7 years ago
Kyle Cooley
d3014cf394
Temporary fix for adding new lands, cloned lands will still reference old data though
7 years ago
David Cernat
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
7 years ago
David Cernat
ccb15cc09e
[Client] When players die, make guards willing to arrest them again
7 years ago
Kyle Cooley
7cc95a11a4
Add more land table columns
7 years ago
Koncord
f5e23d5fc6
[General] Empty strings should be sent too
7 years ago
scrawl
2e58024f1c
Fix intersections with Rig/MorphGeometry, was caused by an issue in the LineSegmentIntersector not respecting the cullingActive flag of a drawable.
7 years ago
Koncord
d904628103
[General] Avoid limitation of 512 symbols in RakString Ctor
7 years ago
Koncord
510e657c93
Merge branch 'master' into new-script-api
7 years ago
Koncord
060ebe3d4a
[Server] Init isWerewolf variable
...
Comment unused code
7 years ago
scrawl
5e790b567e
Fix node path issue
...
Needs to be set so that the 'cullingActive' flag of the node path's end can be checked
7 years ago
scrawl
4bef8260ab
Add const qualifiers
7 years ago
scrawl
5d524a6a10
Add custom version of MorphGeometry replacing osgAnimation
...
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
7 years ago
scrawl
f1ebb129c1
Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry
7 years ago
scrawl
209e139aa8
Move double buffering implementation inside RigGeometry
...
The double buffering is an implementation detail so it should be handled as such, rather than mandating the scene graph to be structured in a certain way.
Override accept(NodeVisitor&) instead of using callbacks.
7 years ago
Kyle Cooley
9e41f1340a
Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture
7 years ago
scrawl
45f7563a55
Revert "Revert "Check for a Geometry node when attaching bodyparts""
...
Issue with shaders has been fixed with b9931fb71c
This reverts commit a1e3fb7604
.
7 years ago