florent.teppe
166717d601
Makes sure threads are only stopped once ,and that they will be re-started
2022-08-13 00:34:01 +02:00
florent.teppe
16a4b5716b
adds missing include
2022-08-12 18:52:31 +02:00
florent.teppe
b14cc673bc
adds missing decleration
2022-08-12 18:47:29 +02:00
florent.teppe
decfbc5387
Fix threading issues
2022-08-12 18:37:19 +02:00
florent teppe
baadc06e98
Merge branch 'master' into 'SHADER_HOT_RELOAD'
...
# Conflicts:
# apps/openmw/mwrender/postprocessor.hpp
2022-08-09 09:26:55 +00:00
glassmancody.info
c513ec7824
null check
2022-08-08 12:53:20 -07:00
glassmancody.info
2cea4f3172
stop excessive allocations with lightmanager callback
2022-08-07 17:04:03 -07:00
florent.teppe
603b30e117
Added some variable names to make it clearer what their function was
...
avoid having lost of ->first and ->second that aren't meaningfull
2022-08-07 22:56:32 +02:00
cody glassman
ac4b29be08
cleanup default shaders and remove confusing main shader
2022-08-07 06:42:48 -07:00
florent.teppe
3ab0a99154
Hot reload done only once every 200 ms, no point in beeing faster
...
it may also help with bugs where the file is still locked and can't be opened
2022-08-04 13:37:12 +02:00
florent.teppe
cc9d436413
includes now work when the same shader has different defines
2022-08-04 13:00:32 +02:00
florent.teppe
7b78bf4b66
Fix files with different defines weren't added to the hot reload manager
2022-08-04 12:46:39 +02:00
florent.teppe
a1c8dc9d45
C++17 compat ?
2022-08-04 09:50:02 +02:00
florent.teppe
cdd95f7889
replaced empty function body by default
2022-08-04 09:25:25 +02:00
florent.teppe
9a475b0c97
fixed blank lines and missing breaks
2022-08-04 09:19:41 +02:00
florent.teppe
b6d7293a12
Removed weird lines that I thought were necessary to please the compiler
2022-08-04 09:13:25 +02:00
florent.teppe
68d0698924
Fixed cyclical included check
2022-08-04 09:09:26 +02:00
florent.teppe
aa51d6de2a
Missing chrono include ?
2022-08-04 00:14:53 +02:00
elsid
da0a1ac9ba
Do compile time checks in compile time instead of tests
2022-08-03 21:47:00 +02:00
florent.teppe
f78fa989ee
fixed include, cleaned comments and indentation
2022-08-03 20:50:39 +02:00
florent.teppe
31d412527d
forgot memory include
2022-08-03 20:17:53 +02:00
florent.teppe
6b38d62223
Added lua bindings to toggle hot reload (disabled by default) or to trigger a reload
2022-08-03 19:56:19 +02:00
florent.teppe
4e7c1c5bef
Added break when the operation failed
2022-08-03 19:21:48 +02:00
florent.teppe
8d194a1601
Shaders: rudimentary hot reloader on shaders
...
every frame we poll the files and check if they are older or newer than the last test, if they are newer we find all the shader that included that file and update them
2022-08-03 19:12:45 +02:00
Alexei Kotov
014de72644
Use NiParticleSystemController's color for the initial particle color
2022-08-03 14:36:51 +03:00
glassmancody.info
651916694c
use correct indexed color mask
2022-08-01 07:56:16 -07:00
psi29a
454684bad3
Merge branch 'custom_actor_collision_shape_type' into 'master'
...
Support cylinder and rotating box collision shape types for actors (#6138 )
Closes #6138
See merge request OpenMW/openmw!2043
2022-08-01 11:00:23 +00:00
psi29a
04fcfcc79d
Merge branch 'master' into 'bigpeepeventsenergy'
...
# Conflicts:
# components/sdlutil/sdlinputwrapper.cpp
2022-08-01 07:55:51 +00:00
Alexei Kotov
f9fdcfe4a7
Prevent mouse movement events from being queued in loading screens (bug #4374 )
2022-08-01 06:54:36 +03:00
Alexei Kotov
bb2fa1cbfa
Break SDL_PeepEvents loop on error (bug #6890 )
2022-08-01 06:24:45 +03:00
psi29a
9ba3ab2be9
Merge branch 'post_fog' into 'master'
...
[Postprocessing] API to work with fog
See merge request OpenMW/openmw!2212
2022-07-31 17:33:08 +00:00
Andrei Kortunov
5bfca57835
Add a way to check if water is enabled in post processing shaders
2022-07-31 10:33:18 +04:00
Andrei Kortunov
888f4d2ac1
Add a post processing API to work with fog
2022-07-30 21:44:18 +04:00
elsid
8b8e4f78b6
Support cylinder and rotating box collision shape types for actors
...
Cylinder collision shape should give the best consistency between physics
simulation and pathfinding. Rotating box is already used by some actors, so
add it to have the same collision shape type for all actors.
2022-07-30 14:28:21 +02:00
psi29a
c54822acf9
Merge branch 'locale_menu' into 'master'
...
Add a way to configure locale settings in-game
See merge request OpenMW/openmw!2179
2022-07-28 07:23:55 +00:00
elsid
8cecc55d64
Fix inserting texture to map
...
Avoid using invalidated iterator after erase call.
Use insert_or_assing instead of operator[] because OSGTexture doesn't have a
default constructor.
2022-07-27 20:01:13 +02:00
psi29a
2964e0d4fd
Merge branch 'font_cleanup' into 'master'
...
Remove code which became redundant due to changes in way how we load bitmap fonts
See merge request OpenMW/openmw!2190
2022-07-27 09:28:30 +00:00
Andrei Kortunov
8ff64ca176
Add a default way to store arrays in the settings.cfg
2022-07-27 13:03:34 +04:00
Andrei Kortunov
a787625c65
Remove code which became redundant due to changes in way how we load bitmap fonts
2022-07-27 12:15:07 +04:00
Evil Eye
55134d1e31
Use string_view in the CharacterController
2022-07-26 17:23:00 +02:00
psi29a
17a0063a7c
Merge branch 'async_delete_animation' into 'master'
...
Destruct animation asynchronously when unloading a cell
See merge request OpenMW/openmw!2177
2022-07-26 13:42:43 +00:00
psi29a
bbcf7809f0
Merge branch 'gui_cleanup' into 'master'
...
GUI cleanup
See merge request OpenMW/openmw!2169
2022-07-26 13:39:33 +00:00
elsid
d165966bea
Make OSGTexture final
...
To show that there are no more inheritance levels and also help compiler to
better optimize virtual function calls. There is no need to access virtual table
when compiler calls a virtual function of a final type.
2022-07-26 12:33:31 +02:00
elsid
5f800279ac
Remove unused Gui::FontLoader::mTextures
2022-07-26 12:33:27 +02:00
elsid
0614b82452
Restore UnrefQueue to destruct animation asynchronously
2022-07-24 21:08:43 +02:00
Andrei Kortunov
e0c05a15fb
Post processing shaders localization
2022-07-24 13:18:50 +00:00
psi29a
ad687c380a
Merge branch 'nif' into 'master'
...
Move NIF implementation to cpp files
Closes #6518
See merge request OpenMW/openmw!2170
2022-07-21 16:09:33 +00:00
Andrei Kortunov
c36c28e8f9
Move NIF implementation to cpp files
2022-07-21 15:54:52 +04:00
Petr Mikheev
643e33c11a
Merge branch 'lua_pathfinding_bindings' into 'master'
...
Add bindings for navigator utils functions (#6690 )
See merge request OpenMW/openmw!2128
2022-07-20 23:52:16 +00:00
elsid
27cc901e76
Add bindings for navigator utils functions
2022-07-21 00:04:26 +02:00
