1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 09:23:53 +00:00
Commit graph

27691 commits

Author SHA1 Message Date
psi29a
fdc08cf01e Merge branch 'fix_storage' into 'master'
Fix heap use after free in components/lua/storage.cpp

See merge request OpenMW/openmw!1586
2022-01-24 12:17:19 +00:00
Petr Mikheev
730b5cad80 Merge branch 'include_headers' into 'master'
Include headers instead of source files

See merge request OpenMW/openmw!1581
2022-01-23 21:54:10 +00:00
Petr Mikheev
067d71f7eb Fix heap use after free in components/lua/storage.cpp 2022-01-23 22:37:04 +01:00
Petr Mikheev
203ee492c8 Remove getRefIdRef because it is the same as getRefId. 2022-01-23 21:01:44 +01:00
Bret Curtis
74e7cfc023 remove unused includes: part1
remove unused imports: part2

revert one tidy we will keep for c++20
2022-01-23 17:30:25 +01:00
Bret Curtis
cdbab2325f rename esmterrain to esm3terrain 2022-01-23 17:19:30 +01:00
Bret Curtis
a126e29a19 relative to absolute path 2022-01-23 17:04:48 +01:00
Bret Curtis
d1fb854521 move most of the files from esm to esm3, keep common code in esm; this is make space for a future with esm4
esm typo

esm typo
2022-01-23 17:04:48 +01:00
elsid
4b59ff2060
Include headers instead of source files 2022-01-23 15:40:30 +01:00
Petr Mikheev
24989e7bc1 Validate that object exists before onActorActive Lua handler 2022-01-23 11:30:22 +01:00
fredzio
26bdba88a2 Store std::weak_ptr into mUpdateAabb. This avoid extending the lifetime
of collision objects beyond what they should.
2022-01-22 17:17:20 +01:00
psi29a
c263bbf0f6 Merge branch 'failure_is_not_an_option' into 'master'
Failure is not an option

See merge request OpenMW/openmw!1576
2022-01-22 14:26:01 +00:00
uramer
a85f2b0b2a Remove unnecessary mGuiCursorEnabled; from sensor manager 2022-01-22 13:28:07 +01:00
elsid
3f14011087
Support multiple parents for NIF nodes
Choose a parent base on which node is used to iterate over children nodes.
This leads to duplicate handing of child nodes. A node will be handled so many
times how many parents it has.

For example:
p1 p2
 \ /
  c

Will be handled as:
p1 p2
|  |
c  c

If c has children they will be handled X times c is handled.
2022-01-22 01:02:31 +01:00
psi29a
90691814ee Update .gitlab-ci.yml 2022-01-21 21:06:01 +00:00
psi29a
063af50dee Merge branch 'fix_fargoth_hiding_crash' into 'master'
Use weak_ptr for Actor and Projectile simulations (#6515)

Closes #6515

See merge request OpenMW/openmw!1573
2022-01-21 00:28:57 +00:00
elsid
580edf18b9 Use weak_ptr for Actor and Projectile simulations (#6515) 2022-01-21 00:28:56 +00:00
uramer
183ca3079e Merge gyroaxis into gyro manager 2022-01-20 15:42:01 +01:00
jvoisin
7ae018993a Merge branch 'psi29a-master-patch-54550' into 'master'
Update README.md to add discord link and be more clear about OpenMW like in our gitlab repo.

See merge request OpenMW/openmw!1572
2022-01-20 11:08:23 +00:00
psi29a
1df0785515 Update README.md to add discord link and be more clear about OpenMW like in our gitlab repo. 2022-01-20 11:08:23 +00:00
uramer
57ac592973 Fix warning 2022-01-19 22:35:32 +01:00
uramer
15e9c6615c Disable controller gyro with older SDL 2022-01-19 21:32:46 +01:00
uramer
4021d23cff Refactor sensor manager axis correction 2022-01-19 18:09:37 +01:00
jvoisin
34dc7485dc Merge branch 'static_or_bust' into 'master'
do some bash magic to rearrange CXX_FLAGS

Closes #6560

See merge request OpenMW/openmw!1570
2022-01-19 15:48:35 +00:00
psi29a
a79bdf07d2 do some bash magic to rearrange CXX_FLAGS 2022-01-19 15:48:35 +00:00
psi29a
6eb36c6b76 Merge branch 'ripple_fix' into 'master'
Restore ripples with soft particles

See merge request OpenMW/openmw!1566
2022-01-19 11:32:38 +00:00
Cody Glassman
9cafc31c0d Restore ripples with soft particles 2022-01-19 11:32:38 +00:00
psi29a
77ec6f3ee8 Merge branch 'fix_advanced_page' into 'master'
Make back launcher "Game Mechanics" tab to be default

See merge request OpenMW/openmw!1567
2022-01-19 11:31:49 +00:00
elsid
fbb72a1951 Make back launcher "Game Mechanics" tab to be default 2022-01-19 11:31:49 +00:00
psi29a
9f9e1b530f Merge branch 'fix_progress_reporter' into 'master'
Support frequency of ProgressReporter calls lower than interval

See merge request OpenMW/openmw!1569
2022-01-19 09:09:15 +00:00
elsid
a2002bc983
Support frequency of ProgressReporter calls lower than interval 2022-01-19 01:10:58 +01:00
psi29a
b3bbcef25e Merge branch 'make_appveyor_great_again' into 'master'
do some Appveyor Qt magic to get it all sorted

See merge request OpenMW/openmw!1564
2022-01-18 23:29:46 +00:00
psi29a
bdd13f36b2 do some Appveyor Qt magic to get it all sorted 2022-01-18 23:29:45 +00:00
uramer
a496f16cdb Implement gyro camera for controllers 2022-01-18 22:47:49 +01:00
uramer
9fa0faf944 Refactor sensor manager to match controller manager gyro API 2022-01-18 21:11:25 +01:00
uramer
55f95f1ea3 Enable controller gyro and capture the values 2022-01-18 20:23:16 +01:00
jvoisin
088c459771 Merge branch 'speed_up_static_deps' into 'master'
switch Static Deps and Tests from GCC to clang and set to -O0 to speed up builds

See merge request OpenMW/openmw!1565
2022-01-18 18:22:46 +00:00
psi29a
ca6262c033 switch Static Deps and Tests from GCC to clang and set to -O0 to speed up builds 2022-01-18 18:22:46 +00:00
Petr Mikheev
9d0e427ec1 Merge branch 'dispose_lua_ui_correctly' into 'master'
Dispose Lua UI elements correctly

See merge request OpenMW/openmw!1561
2022-01-18 08:12:56 +00:00
uramer
cc528d2e08 Dispose Lua UI elements correctly 2022-01-18 08:12:56 +00:00
Petr Mikheev
90bf42e80d Merge branch 'lua_colour' into 'master'
Lua bindings for Colours

See merge request OpenMW/openmw!1477
2022-01-17 22:35:06 +00:00
uramer
d1d8f058ac Lua bindings for Colours 2022-01-17 22:35:06 +00:00
psi29a
4e93716584 Merge branch 'always_bigobj' into 'master'
Always use /bigobj, clean up scattered uses into one

See merge request OpenMW/openmw!1476
2022-01-17 08:05:19 +00:00
uramer
886dee57ee Always use /bigobj, clean up scattered uses into one 2022-01-17 08:05:19 +00:00
psi29a
78e8fb5cf9 Merge branch 'movement_tweaks' into 'master'
Movement solver tweaks

See merge request OpenMW/openmw!1352
2022-01-17 07:32:19 +00:00
wareya
20cbf941fb re-introduce short circuiting, but only under certain circumstances 2022-01-16 17:58:04 -05:00
wareya
784b1888a9 Merge branch 'upstream' into movement_tweaks 2022-01-16 17:19:20 -05:00
psi29a
fd7e0b74cc Merge branch '6303-jail-stuck-attack' into 'master'
#6303 Made player stop attacking and sheathe weapon when going to jail

See merge request OpenMW/openmw!1551
2022-01-16 10:15:47 +00:00
Artem Nykolenko
a5cdc889a2 #6303 Made player stop attacking and sheathe weapon when going to jail 2022-01-16 10:15:47 +00:00
uramer
c07fb75bf7 Merge branch 'lua_settings' into 'master'
Permanent storage for Lua

See merge request OpenMW/openmw!1489
2022-01-15 21:52:09 +00:00