mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 07:15:34 +00:00
Code Issues Releases Wiki Activity
25845 commits 108 branches 66 tags 134 MiB
Commit graph

25845 commits

This branch
This branch
All branches
Author SHA1 Message Date
elsid
56e6305345
Revert "Merge branch 'fix_new_game_guard' into 'master'" 
This reverts commit a487295d39.
 2021-06-19 14:06:46 +02:00
Evil Eye
c1177d7ffe Allow unquoted string arguments to start with . and - 2021-06-19 11:21:37 +02:00
psi29a
b7886bc036 Merge branch 'SpeedUpInteriorCheck' into 'master' 
Speedup searching for exterior cells

See merge request OpenMW/openmw!857
 2021-06-19 00:29:47 +00:00
psi29a
afda721d4b Merge branch 'race_floats' into 'master' 
Display Race record height/weight as a float

See merge request OpenMW/openmw!880
 2021-06-19 00:29:21 +00:00
psi29a
047d993cf4 Merge branch 'at' into 'master' 
Use operator[] instead of at() when the idx is checked

See merge request OpenMW/openmw!916
 2021-06-19 00:26:48 +00:00
psi29a
a6b695e15b Merge branch 'esmcleanup' into 'master' 
More ESM cleanup

See merge request OpenMW/openmw!903
 2021-06-19 00:23:52 +00:00
psi29a
f66196588c Merge branch 'object_paging_min_size_combo_box' into 'master' 
Adding Object Paging Min Size combo box to Advanced -> Visuals

See merge request OpenMW/openmw!917
 2021-06-19 00:20:29 +00:00
psi29a
5aa1f7b3d0 Merge branch 'remove_useless' into 'master' 
Remove some useless variables from esmtool

See merge request OpenMW/openmw!925
 2021-06-19 00:17:58 +00:00
psi29a
7b6fc1a1f1 Merge branch 'name_shaders' into 'master' 
Append filename to shader names

See merge request OpenMW/openmw!930
 2021-06-19 00:16:36 +00:00
psi29a
3794e6d4b2 Merge branch 'fix-ffmpeg-api-const' into 'master' 
Fix future FFMpeg API changes

See merge request OpenMW/openmw!922
 2021-06-19 00:15:16 +00:00
psi29a
a0659cd017 Merge branch 'bump_windows_deps' into 'master' 
bump windows build deps to OSGoS 3.6 and MyGUI 3.4.1

See merge request OpenMW/openmw!938
 2021-06-19 00:13:08 +00:00
psi29a
4d95855dd5 Merge branch 'reduce_esmreader' into 'master' 
Reduce a bit std::stringstream's code bloat in hot/small functions

See merge request OpenMW/openmw!933
 2021-06-18 22:53:25 +00:00
Bret Curtis
36bb966ca1 Getting the ball rolling for 0.48 2021-06-18 23:16:03 +02:00
Bret Curtis
7be09078b4 bump mac deps to include collada 2021-06-17 01:12:31 +02:00
psi29a
071786aff6 Merge branch 'UseSameDistanceForAllLodsOfTheCurrentChunk' into 'master' 
Use same distance for all lods of the current chunk

Closes #6061

See merge request OpenMW/openmw!940
 2021-06-16 11:47:30 +00:00
psi29a
329ec8f044 Merge branch 'dont_bury_me_plz' into 'master' 
Don't unsummon creatures not found within the active cells

Closes #6070

See merge request OpenMW/openmw!926
 2021-06-16 09:43:53 +00:00
psi29a
c39c0266a9 Merge branch 'free_from_bondage' into 'master' 
Do not assume the bound item cache is valid after loading a save

Closes #6069

See merge request OpenMW/openmw!931
 2021-06-16 09:43:14 +00:00
psi29a
dfb9f074d7 Merge branch 'OSG_check_cmake' into 'master' 
cmake check to enforce that if someone uses OSG 3.6, that it is at least 3.6.5

See merge request OpenMW/openmw!941
 2021-06-16 08:28:48 +00:00
psi29a
dd197765c8 cmake check to enforce that if someone uses OSG 3.6, that it is at least 3.6.5 2021-06-16 08:28:48 +00:00
jvoisin
22153cca7b Reduce a bit the code bloat in hot paths/small functions 
There is no need to bloat hot/small functions with
a ton of function calls and involving locales
for simple error messages.
 2021-06-15 17:57:14 +02:00
unknown
7d756d997e Rebuild the cache in readState 2021-06-12 18:18:52 +02:00
Bret Curtis
4ffc30f502 add OSGoS hash 2021-06-12 16:06:22 +02:00
Bret Curtis
fced78b66a bump windows build deps to OSGoS 3.6 and MyGUI 3.4.1 2021-06-12 15:35:40 +02:00
CedricMocquillon
7fa67ff675 Use same distance for all lod instances of a chunk 2021-06-12 15:34:15 +02:00
Bret Curtis
f92fbc2acd workaround shadow issue on macOS, https://gitlab.com/OpenMW/openmw/-/issues/6057 2021-06-12 15:34:15 +02:00
AnyOldName3
9bae89cc95 Merge branch 'macos_shadow_quickfix' into 'master' 
Workaround shadow issue on macOS

See merge request OpenMW/openmw!937
 2021-06-11 23:22:15 +00:00
Bret Curtis
868a5b35e3 workaround shadow issue on macOS, https://gitlab.com/OpenMW/openmw/-/issues/6057 2021-06-12 00:10:55 +02:00
psi29a
4d995a6be6 Merge branch 'update_mac_deps' into 'master' 
update mac deps to include latest OSGoS 3.6, mygui 3.4.1 and multi-threaded bullet

See merge request OpenMW/openmw!936
 2021-06-11 20:02:35 +00:00
Bret Curtis
91e1898aa2 make use of gitlab openmw-deps 2021-06-11 20:27:17 +02:00
Bret Curtis
49ce26361e update mac deps to include latest OSGoS 3.6, mygui 3.4.1 and multi-threaded bullet 2021-06-11 16:44:15 +02:00
psi29a
036a344eae Merge branch 'aoe_arrow' into 'master' 
#6084: Cast spell even if target Ptr is empty.

See merge request OpenMW/openmw!934
 2021-06-11 09:18:25 +00:00
fredzio
7d0483d7ad Cast spell even if target Ptr is empty. It happens when enchanted arrows 
hit water or ground.
 2021-06-11 05:55:37 +02:00
Evil Eye
90fa8dca35 Do not assume the bound item cache is valid after loading a save 2021-06-06 18:10:55 +02:00
Evil Eye
89e0bfd1a4 Purge summon effects on dispose 2021-06-06 12:45:42 +02:00
psi29a
c7f8a4faae Merge branch 'sizeof_float' into 'master' 
Use sizeof(GLfloat) instead of sizeof(GL_FLOAT)

See merge request OpenMW/openmw!928
 2021-06-06 09:37:17 +00:00
glassmancody.info
bb834fb44e append filename to shader names 2021-06-05 18:21:03 -07:00
jvoisin
7f4f2c042e Use sizeof(GLfloat) instead of sizeof(GL_FLOAT) 
GL_FLOAT is an enum, with the value 0x1406, while GLFloat is the actual type.
Source: https://www.khronos.org/opengl/wiki/OpenGL_Type
 2021-06-04 23:21:26 +02:00
Evil Eye
004660be3d Don't unsummon creatures not found within the active cells 2021-06-02 20:33:29 +02:00
jvoisin
d651f9e60c Remove some useless variables from esmtool 2021-06-02 19:04:46 +02:00
Dan Church
70a0229010
Fix future FFMpeg API changes 
avcodec_find_decoder now returns const AVCodec*.
 2021-06-01 10:56:48 -05:00
psi29a
b2791fd487 Merge branch 'irc' into 'master' 
Update IRC links to libera

See merge request OpenMW/openmw!920
 2021-05-31 22:10:00 +00:00
Alexey Sokolov
3e4340338f Update IRC links to libera 
In README, in OpenCS about dialog, in Travis notification
 2021-05-31 21:15:26 +01:00
Evil Eye
4026082494 Merge branch 'fix_sync' into 'master' 
Fix what GitHub broke

See merge request OpenMW/openmw!918
 2021-05-30 10:47:33 +00:00
psi29a
9058fa9f60 Merge branch 'fix_launcher_ui' into 'master' 
Make launcher Advanced/Visuals tab look more like other

See merge request OpenMW/openmw!908
 2021-05-30 11:53:18 +02:00
psi29a
a487295d39 Merge branch 'fix_new_game_guard' into 'master' 
Consider time to destination when try to avoid collision

See merge request OpenMW/openmw!914
 2021-05-30 11:52:48 +02:00
Thunderforge
89950e5528 Preventing type conversion of double to float for objectPagingMinSize 2021-05-29 16:27:23 -05:00
Thunderforge
9f2f5174d4 Adding Object Paging Min Size combo box to Advanced -> Visuals 
Requested in Discord by CMAugust and hammered out with a few other users.
 2021-05-29 16:17:30 -05:00
psi29a
7330921bd6 Merge branch 'statuesque' into 'master' 
Use modified paralyze magnitude to fall and float

Closes #6063

See merge request OpenMW/openmw!915
 2021-05-29 20:27:56 +00:00
psi29a
a5bf056860 Merge branch 'fix_configure_light_buffer_layout' into 'master' 
Avoid resetting buffer object when configuring light buffer layout (#6064)

Closes #6064

See merge request OpenMW/openmw!913
 2021-05-29 20:10:12 +00:00
jvoisin
8695b6fbc5 Use operator[] instead of at() when the idx is checked 2021-05-29 15:31:32 +02:00