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

3479 commits

Author SHA1 Message Date
scrawl
c920f95d1e
Don't incorrectly discard root node transformation (Fixes #4272) 2017-12-31 23:49:43 +00:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master 
Conflicts:
	CMakeLists.txt
	README.md
	files/mygui/openmw_trade_window.layout
 2017-11-29 22:37:50 +00:00
Andrei Kortunov
94c0e3ed10 Move toUpper() from StringUtils to the JournalViewModel 2017-11-23 19:37:45 +04:00
Andrei Kortunov
67acb83b62 Add missing include 2017-11-21 13:27:33 +04:00
Andrei Kortunov
5f41f7c48d Clean code up a bit 2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b Convert topic name to Unicode 2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3 Merge from upstream master 2017-11-21 09:39:54 +04:00
scrawl
9fda3b6db4 Fix NumericEditBox behavior broken by switch to std::stoi 
For some reason stoi doesn't throw an error for '1foo' while 'foo1' does.

Now the edit box flat out rejects any non-digit key events.
 2017-11-20 23:20:03 +00:00
Andrei Kortunov
a391990f2a Provide multibyte toLower() and single chars comparator 2017-11-20 21:30:46 +04:00
Miloslav Číž
3ae5310567 use loading screen to freeze the screen 2017-11-16 22:08:33 +01:00
Alexander Stillich
93e9df15c9 Fixed parameter naming 2017-11-11 22:58:02 +00:00
Alexander Stillich
52b3507a2b Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 2017-11-11 22:58:02 +00:00
Alexander Stillich
09aac22782 Added StringUtil::replaceAll() 2017-11-11 22:58:01 +00:00
Alexander Stillich
92aaff3b78 Fixed escaping @ in boost program options filter 2017-11-11 22:57:59 +00:00
Miloslav Číž
e804c4a011 remove no longer used method 2017-11-11 13:54:14 +01:00
scrawl
a5ba1caed1
Merge pull request #1541 from astillich/4189 
Fixed escaping @ in boost program options filter
 2017-11-10 23:08:54 +00:00
scrawl
a5adc5b018 Add NPC base skeleton files to the optimizer blacklist (Fixes #4159) 2017-11-10 22:51:32 +00:00
Miloslav Číž
d763e9fe46 add settings for spherical screenshots 2017-11-09 20:25:29 +01:00
scrawl
244cc5b861 Reduce error spam 2017-11-08 00:24:03 +00:00
scrawl
7b4add2ae4 Fall back to non-shader material if creating the shader fails 
Also fixes an uncaught exception that will break the whole game.
 2017-11-08 00:24:03 +00:00
Alexander Stillich
43b5c2e36b Fixed parameter naming 2017-11-07 23:20:10 +01:00
Alexander Stillich
70d578d050 Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 2017-11-07 23:10:58 +01:00
Alexander Stillich
af3e1f92ec Added StringUtil::replaceAll() 2017-11-07 23:06:23 +01:00
Alexander Stillich
7d39c5450c Fixed escaping @ in boost program options filter 2017-11-05 22:14:16 +01:00
David Walley
41dc82abad Update Links to Documentation in settings.cfg files (#1523) 
* Update settings-default.cfg

* Update settings.cpp
 2017-10-28 16:05:30 +00:00
AnyOldName3
c1a871ff1f Make indentation consistent. 2017-10-24 23:31:40 +01:00
AnyOldName3
daf7d8451c Switch to a more reliable method of passing the git-version targt the data it needs 2017-10-24 23:29:18 +01:00
AnyOldName3
e3142b9643 Add missing variables to those forwarded to the git-version target 2017-10-24 23:10:50 +01:00
scrawl
0c6ef17fb5 Add explicit variant of 'OnActivate' 2017-10-23 23:33:06 +00:00
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.
 2017-10-22 10:10:04 +02:00
Marc Zinnschlag
bdabace7e2 Merge remote-tracking branch 'aesylwinn/LLmerge' 2017-10-19 14:24:58 +02:00
scrawl
7f8d996eff Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support 
Launcher and wizard ampersand escape support
 2017-10-16 21:09:04 +00:00
scrawl
136ef1f738 Fix incomplete settings in recreateShaders() 2017-10-15 17:24:23 +02:00
scrawl
03554b2f4b Fix some style issues flagged by cppcheck 2017-10-15 17:06:58 +02:00
scrawl
50d7eb8e54 Fix crash when adding a NULL object to the cache 2017-10-15 17:06:58 +02:00
scrawl
97ec38affb Merge pull request #1492 from drummyfish/master 
fix rain/snow moving with player (issue #2698)
 2017-10-15 09:04:48 +00:00
AnyOldName3
49dbb4a9ca Add a third copy of a comment where I felt clarification was missing 2017-10-15 02:05:22 +01:00
AnyOldName3
7329e6a9ef Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher. 2017-10-15 01:59:21 +01:00
AnyOldName3
28ff677337 Save 'data=...' lines correctly when exiting the wizard 2017-10-15 00:07:46 +01:00
Miloslav Číž
65977b910e wrap weather around in all directions 2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd use bbox as wrap range & apply to all particle systems 2017-10-14 21:42:19 +02:00
Miloslav Číž
33a1459b11 search for particle system by class name 2017-10-14 21:41:47 +02:00
Kyle Cooley
11eae16645 Get rid of duplicate function, fix flag checking 2017-10-14 15:09:12 -04:00
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.
 2017-10-14 18:28:46 +00:00
scrawl
f3ca9832b0 Merge pull request #1500 from akortunov/extraspell 
Implement ExtraSpell magic effect
 2017-10-14 14:01:49 +00:00
Andrei Kortunov
30b05b557b ExtraSpell magic effect: a basic implementation 2017-10-14 16:55:00 +04:00
AnyOldName3
c9e86a8ebc Remove superfluous argument 2017-10-12 18:16:44 +01:00
AnyOldName3
f9a3562ccd Remove duplicate macro definition and fix warning 2017-10-12 02:45:50 +01:00
AnyOldName3
2652a89df4 Fix mismatched indentation that apparently the .editorconfig file doesn't handle automatically 2017-10-11 22:10:52 +01:00
AnyOldName3
f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 2017-10-11 21:58:55 +01:00
Marc Zinnschlag
dd17f70068 Merge remote-tracking branch 'aesylwinn/landrecords' 2017-10-03 13:32:02 +02:00
scrawl
64e27c032b Merge pull request #1481 from scrawl/keyfocus 
WindowManager overhaul & improved keyboard support
 2017-09-28 22:34:05 +00:00
scrawl
44720bf41a Allow MWList items to retain key focus 2017-09-27 12:56:00 +00:00
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.
 2017-09-27 12:55:53 +00:00
scrawl
c88c535e0e Fix HBox/VBox not using Client widget with MyGUI <= 3.2.2 2017-09-27 12:55:50 +00:00
scrawl
be7bdec2ed Merge pull request #1471 from crussell187/nif_stream_optimization 
first pass on optimization of nif parsing functions from the file stream
 2017-09-25 22:43:34 +00:00
scrawl
19e07fad30 Remove redundant Services enum 2017-09-25 19:52:20 +02:00
scrawl
82a211ba03 Fix duplicate code 2017-09-25 17:47:30 +02:00
scrawl
76ddf8d794 Support Up/DownArrow keys to change NumericEditBox value 2017-09-25 00:47:07 +02:00
scrawl
1ad14b232f Adjust ImageButton to accept key focus and use the 'highlighted' texture 2017-09-24 19:08:11 +02:00
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.
 2017-09-24 19:08:11 +02:00
scrawl
2494c22d66 Merge pull request #1470 from MiroslavR/convertmprj 
ESS-Importer: Convert magic projectiles
 2017-09-23 22:55:56 +00:00
825de71b29 removed an iostream include used for debug prints from nifstream.hpp 2017-09-23 11:10:05 -05:00
30a213a9b3 updates for nifstream optimization including fixing the non-x86 path for little endian reads 2017-09-22 21:08:25 -05:00
8834066dea make streaming to a type array in nif a direct copy from the file into the vector 2017-09-21 23:47:09 -05:00
090a8408b8 made nif basic type read optimizations more portable 2017-09-21 22:37:19 -05:00
c72aa19d6d first pass on optimization of nif parsing functions from the file stream 2017-09-20 23:53:12 -05:00
scrawl
58f9688433 Use client coordinates in HBox/VBox 2017-09-20 22:24:19 +00:00
scrawl
fb975d02db Use client coordinates in HBox/VBox 2017-09-20 22:41:50 +02:00
MiroslavR
f15de6d3ca ESS-Importer: Convert magic projectiles (Closes #2320) 2017-09-20 18:58:56 +02:00
Chris Robinson
021627bdf8 Mark some functions with override 
Fixes some Clang warnings about overriding a virtual function without the
override keyword.
 2017-09-18 01:51:11 -07:00
Kyle Cooley
50d9d9f78f Get rid of some templates, exceptions instead of assert, and other small changes. 2017-09-17 20:29:51 -04:00
Andrei Kortunov
4bb349a525 Use default 0 precision in the float formatting (bug #4096) 2017-09-17 15:07:04 +04:00
Kyle Cooley
2abf7f1752 Remove unnecessary cache dump 2017-09-15 12:19:12 -04:00
Kyle Cooley
09e645a0e0 Fix careless mistake. 2017-09-09 23:18:09 -04:00
Kyle Cooley
25d4a0370f Changes to land data access in tables, also update Land once per frame in scene view. 2017-09-09 15:37:52 -04:00
Kyle Cooley
d030b595f8 Fix potential segfault, cleanup, get rid of warnings. 2017-09-09 11:48:13 -04:00
Kyle Cooley
72cb405de2 Some bug fixes, changes to land load code. 2017-09-08 21:03:52 -04:00
Kyle Cooley
2eacc2f093 Changes to land creation, add ability to specifically clear terrain cache 2017-09-08 14:37:03 -04:00
Kyle Cooley
ab607f3028 Tweaks to land loading, land cloning, terrain signals, placeholder land update handling 2017-09-08 00:51:46 -04:00
Andrei Kortunov
538498230b Declare mClient variable 2017-09-06 15:59:54 +04:00
scrawl
dca31b7ffa Remove redundant _boundingBoxComputed which no longer exists in osg master (Fixes #4075) 2017-09-04 19:35:42 +00:00
Kyle Cooley
d3014cf394 Temporary fix for adding new lands, cloned lands will still reference old data though 2017-09-04 15:13:45 -04:00
Kyle Cooley
7cc95a11a4 Add more land table columns 2017-09-03 20:00:19 -04:00
scrawl
2e58024f1c Fix intersections with Rig/MorphGeometry, was caused by an issue in the LineSegmentIntersector not respecting the cullingActive flag of a drawable. 2017-09-03 14:14:15 +00:00
scrawl
5e790b567e Fix node path issue 
Needs to be set so that the 'cullingActive' flag of the node path's end can be checked
 2017-09-01 22:12:40 +00:00
scrawl
4bef8260ab Add const qualifiers 2017-09-01 21:42:36 +00:00
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.
 2017-09-01 21:42:36 +00:00
scrawl
f1ebb129c1 Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry 2017-09-01 21:42:35 +00:00
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.
 2017-09-01 21:42:34 +00:00
Kyle Cooley
9e41f1340a Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture 2017-08-31 22:09:49 -04:00
scrawl
45f7563a55 Revert "Revert "Check for a Geometry node when attaching bodyparts"" 
Issue with shaders has been fixed with b9931fb71c

This reverts commit a1e3fb7604.
 2017-08-31 21:40:35 +00:00
scrawl
b9931fb71c Set the shader on the node containing the StateSet 2017-08-31 21:39:21 +00:00
scrawl
a1e3fb7604 Revert "Check for a Geometry node when attaching bodyparts" 
This reverts commit 3fc8634206.
 2017-08-29 22:40:19 +00:00
scrawl
3fc8634206 Check for a Geometry node when attaching bodyparts (Fixes #3957) 2017-08-29 12:55:42 +00:00
scrawl
bc82c6a35d Use white color if told to use nonexisting vertexcolors (Fixes #3833) 2017-08-27 21:22:44 +00:00
scrawl
5d2fe5e887 Implement lightmode/vertmode of NiVertexColorProperty 2017-08-27 21:22:17 +00:00
scrawl
4fba157d3b Implement releaseGLObjects for cached resources 2017-08-26 19:29:12 +00:00
Kyle Cooley
d3d04171f9 Fix seg fault, undo changes BsaArchive 2017-08-22 15:06:56 -04:00
Kyle Cooley
8c4b12a603 VFS changes, one VFS and resource system per document. 
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
 2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211 Code cleanup and more cache clearing 2017-08-21 18:58:38 -04:00
Kyle Cooley
679a284735 Use scoped lock instead of directly locking/unlocking mutex 2017-08-21 13:33:11 -04:00
Kyle Cooley
3b9326d238 Clear terrain cache and reload terrain 2017-08-20 22:34:41 -04:00
Kyle Cooley
b62cb0e2a4 Clear out GPU texture/stateset cache 2017-08-20 19:55:16 -04:00
Kyle Cooley
7914fd5c9c Re-index BSAs 2017-08-20 19:36:21 -04:00
Kyle Cooley
d7744e8b16 A bit of cleanup 2017-08-20 19:07:23 -04:00
Kyle Cooley
5950b26912 Update scene assets 2017-08-19 19:36:45 -04:00
Kyle Cooley
742bd00ec6 Clear cached resources 2017-08-19 15:26:46 -04:00
Kyle Cooley
d31ed83b54 Preliminary asset reloading 2017-08-19 03:43:31 -04:00
Thunderforge
54fe645703 Removing erroneous comment since Qt is not relevant here 2017-08-09 23:12:43 -05:00
Thunderforge
464c64a306 Swap the OIS Ctrl and Meta keys on macOS to match Qt 2017-08-09 20:03:27 -05:00
scrawl
cef415509f Revert "Merge redundant input events" 2017-08-06 20:54:20 +00:00
Julian
3cfd9af945 merge redundant input events 2017-08-02 18:54:16 +02:00
scrawl
c9d9461d3e Add Spacer class derived from AutoSizedWidget 
Using a normal widget as a spacer with HStretch/VStretch may not work properly because for widgets not derived from AutoSizedWidget, the HBox/VBox treat the widget's current size as the requested minimum size. This leads the layout to break when resized more than once.

The new class sets HStretch and VStretch to true by default to save some typing.
 2017-07-31 16:20:29 +02:00
PlutonicOverkill
5049fe4320 Pause game when minimised on Windows 2017-07-20 21:31:05 +12:00
scrawl
3e03a0d7bd Terrain: remove ref argument that is now always true 2017-07-19 16:24:35 +02:00
scrawl
ac78d01b2b Terrain: use the main camera's viewpoint for intersection tests 
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
 2017-07-19 13:11:44 +02:00
scrawl
ffb6dff6aa Merge pull request #1338 from akortunov/valuefix 
Change mValue type for clothes to unsigned short (bug #3960)
 2017-07-18 10:13:51 +00:00
Andrei Kortunov
2bd105f5e2 Change mValue type for clothes to unsigned short (fixes #3960) 2017-07-18 11:51:19 +04:00
scrawl
40dc1dd6f5 Fix checking a variable before it's assigned (Bug #3950) 2017-07-10 23:50:24 +02:00
scrawl
be940656db Add '0' as an alias for 'OFF' for OPENMW_OPTIMIZE 2017-07-10 23:49:42 +02:00
scrawl
54bb1b13cb Change NCO/NCC flags to NC* (Fixes #3915) 2017-06-20 00:36:17 +02:00
Allofich
42402976e3 Fixes for building in MSVC 2017-06-13 19:38:12 +09:00
Bret Curtis
c6805314c2 be explicit about what we are trying to catch instead of catching everything and fixed up formatting 
use Allman style brackets not K&R style, additional formatting for fallback.cpp which needed some love

revert allman formatting changes
 2017-06-12 00:32:29 +02:00
Bret Curtis
7c758a6293 std::stof can not handle comma in us localization and can not handle period in french localization, using std::replace is not a solution, going back to boost::lexical_cast 2017-06-12 00:32:28 +02:00
Bret Curtis
f0b21cca22 use own inline hash_combine function 2017-06-12 00:32:28 +02:00
David Carlier
8a5c62de97 needs this head for getuid 2017-06-10 14:50:43 +01:00
Bret Curtis
c781d1f8ed purge unnecessary imports 
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
 2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2 replace and purge boost::function 2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702 replace boost::bind 2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96 remove boost/tuple 2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c purge the rest of boost::shared and any other boost related things that no longer are required 
put boost system back in, clean others up

revert Qt

add back boost fstream
 2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104 replace boost::shared_ptr in extern and components 2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 2017-06-09 16:49:25 +02:00
Julian Ospald
5d85fa9220
Fix build with osg >= 3.5.6 2017-05-28 17:30:01 +02:00
scrawl
813af876f6 Use a partial binary search in isReservedName (Fixes #3835) 2017-05-07 23:28:56 +02:00
scrawl
8d84869432 Fix commit 8f71b65d38 (don't overwrite the previous user data) 
This resulted in a crash/corruption because the KeyframeController, for performance reasons, does not check that the expected user data is there and of correct type.

(Fixes #3829)
 2017-05-05 05:27:00 +02:00
scrawl
45d9e38616 Fix check for default material 2017-04-22 14:27:45 +02:00
Allofich
e095817ac2 Treat =< and => as == in scripts 
(Fixes #3744)
 2017-04-21 22:26:13 +09:00
Allofich
ff3e307059 Pass parameters by const reference 2017-04-20 23:47:03 +09:00
scrawl
8f71b65d38 sceneutil/attach: inherit the UserDataContainer to avoid the resource cache from being cleared incorrectly 2017-04-14 15:04:53 +02:00
MiroslavR
c962b6dd6d Fix correctActorModelPath to work properly when both backward and forward slashes are used in the path (Fixes #3822) 2017-04-09 18:34:36 +02:00
MiroslavR
395e97cf40 Remove evil "implicit GetJournalIndex" hack from expression parser 2017-04-03 01:44:26 +02:00
Allofich
3780d94214 Cast LAND_SIZE to integer to avoid linking error 2017-03-28 01:57:31 +09:00
Allofich
2a505b427d Remove second LAND_SIZE definition 2017-03-27 03:45:53 +09:00
scrawl
f676b62711 Remove unused variable 2017-03-23 19:35:07 +01:00
scrawl
c992cb6e82 Fix texture not being applied on rendering the composite map (Fixes #3791) 2017-03-19 19:15:22 +01:00
MiroslavR
06dc94552f Log a warning if size in SCHD (script header) does not match SCDT (bytecode) size instead of failing 2017-03-18 15:42:24 +01:00