mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 09:45:40 +00:00
Code Issues Releases Wiki Activity
26873 commits 109 branches 66 tags 134 MiB
Commit graph

26873 commits

This branch
This branch
All branches
Author SHA1 Message Date
psi29a
06d10214dd Update .gitlab-ci.yml 2021-11-14 19:30:08 +00:00
psi29a
7c18dade2c use new deps 2021-11-14 15:34:54 +00:00
psi29a
b8ec3b7708 try this 2021-11-14 15:10:50 +00:00
psi29a
d6c9fdaf85 Try not to compile mygui 2021-11-14 14:03:28 +00:00
psi29a
41a6c6bb93 woops 2021-11-14 10:53:35 +00:00
psi29a
6b105f29e8 Turn MYGUI building back on, could not be found. 2021-11-14 10:49:23 +00:00
psi29a
045f05f81b Do we really need to build mygui/osg/bullet? Try using the deps to lower compile times. 2021-11-14 10:20:50 +00:00
psi29a
370cb84ba5 Update .gitlab-ci.yml, CI/before_install.android.sh, CI/before_script.android.sh 2021-11-13 20:43:36 +00:00
psi29a
ba7a3ad1e1 Update .gitlab-ci.yml 2021-11-13 20:08:36 +00:00
psi29a
939a1d2f0e Give psi29a's custom android-ndk22 a go 2021-11-13 20:05:54 +00:00
psi29a
03e88b8e27 Merge branch 'lordofthenifs' into 'master' 
Load a bunch of Bethesda Havok NIF records

See merge request OpenMW/openmw!1392
 2021-11-13 18:51:54 +00:00
psi29a
ba0aae06ca Merge branch 'morphyslaw' into 'master' 
Morph geometry more like NifSkope (bug #6416)

Closes #6416

See merge request OpenMW/openmw!1389
 2021-11-13 18:42:17 +00:00
Alexei Kotov
49544cf7de Merge branch 'no_one_likes_commas' into 'master' 
Treat commas in scripts as whitespace

Closes #6380

See merge request OpenMW/openmw!1388
 2021-11-13 17:19:22 +00:00
Alexei Dobrohotov
d347f8f4f0 Fix build 2021-11-13 20:11:18 +03:00
Alexei Dobrohotov
25f4d05c2e Load bhkRigidBody 2021-11-13 19:59:30 +03:00
Alexei Dobrohotov
c01fff280a Load bhkConvexVerticesShape, bhkBoxShape, bhkListShape 2021-11-13 19:53:03 +03:00
Alexei Dobrohotov
83aa96e38f Load a bunch of triangle strip-based Havok records 2021-11-13 19:52:08 +03:00
Alexei Dobrohotov
e7cc76bba2 Load bhkMoppBvTreeShape 2021-11-13 19:27:32 +03:00
Alexei Dobrohotov
59ce00f742 Refactor all present Bethesda Havok 'support' 2021-11-13 19:14:28 +03:00
psi29a
4d09f791ab Merge branch 'minimum-settings-window-size' into 'master' 
Recompute minimum settings window size based on tab bar size

See merge request OpenMW/openmw!1365
 2021-11-13 13:48:12 +00:00
Mads Buvik Sandvei
73e9d7f315 Recompute minimum settings window size based on tab bar size 2021-11-13 13:48:12 +00:00
psi29a
d7debc3c38 Merge branch 'macos-builds-only-for-openmw' into 'master' 
Only allow macOS builds on OpenMW's fork of openmw

See merge request OpenMW/openmw!1386
 2021-11-13 13:41:07 +00:00
psi29a
e1d28a1af3 Only allow macOS builds on OpenMW's fork of openmw 2021-11-13 13:41:07 +00:00
psi29a
41bd20e358 Merge branch 'bullet_shape_hash' into 'master' 
Store BulletShape source file name and content hash

See merge request OpenMW/openmw!1379
 2021-11-13 13:33:22 +00:00
psi29a
d1d5b775f0 Merge branch 'gcc_zero_sugar' into 'master' 
Fix GCC test failure

See merge request OpenMW/openmw!1387
 2021-11-13 13:24:15 +00:00
Evil Eye
bee94e2afc Treat commas in scripts as whitespace 2021-11-13 14:06:21 +01:00
Alexei Dobrohotov
c7edca559b Morph geometry more like NifSkope (bug #6416) 2021-11-13 15:58:59 +03:00
Evil Eye
5f406158b5 Zero initialize context index 2021-11-13 12:46:10 +01:00
psi29a
9a00984561 Merge branch 'tabcontrol-button-styles' into 'master' 
Add missing controls to OpenMW's TabControl skin

See merge request OpenMW/openmw!1367
 2021-11-12 22:36:36 +00:00
psi29a
39f70c2d18 Merge branch 'correct-sound' into 'master' 
Add correct sound path in resource helpers

See merge request OpenMW/openmw!1381
 2021-11-12 22:23:32 +00:00
psi29a
bea8df7dd4 Merge branch 'astoecke-fix-6386-water-reflection' into 'master' 
Use `gl_FragCoord`  in `water_fragment.glsl` (fixes #6386)

Closes #6386

See merge request OpenMW/openmw!1347
 2021-11-12 22:05:05 +00:00
psi29a
3ade72a7ad Merge branch 'buyskyrimanniversaryedition' into 'master' 
Boring NIF stuff

See merge request OpenMW/openmw!1378
 2021-11-12 19:47:37 +00:00
Bret Curtis
700bace24c do not emplace_back to our mLandTextures; instead use the heavy handed resize to be explicit about what we intend to do; resolves issue found here: https://github.com/OpenMW/openmw/pull/3220#issuecomment-964650167 2021-11-12 11:53:21 +01:00
Alexei Kotov
5afd6b0e46 Merge branch 'adding_settingint_methods' into 'master' 
Adding saveSettingInt() and loadSettingInt()

See merge request OpenMW/openmw!1167
 2021-11-11 14:32:39 +00:00
Alexei Kotov
f210559a80 Merge branch 'bound_rating' into 'master' 
Improve AI rating of bound effects

Closes #3855

See merge request OpenMW/openmw!1366
 2021-11-11 14:30:41 +00:00
elsid
d7041613ef
Store BulletShape source file name and content hash 2021-11-11 00:27:18 +01:00
Cédric Mocquillon
512d64e514 Extract correctSoundPath method to avoid code duplication. Add unit test for the new method 2021-11-10 23:06:35 +01:00
Evil Eye
aaf586a928 Merge branch 'imblockingyou' into 'master' 
Allow movement during blocking (bug #6327)

Closes #6327

See merge request OpenMW/openmw!1377
 2021-11-10 21:20:10 +00:00
Alexei Dobrohotov
cc4c96d0f1 Follow global naming convention for new records 2021-11-10 22:50:01 +03:00
Alexei Dobrohotov
6e5b45453d some physics stuff idk 2021-11-10 20:33:46 +03:00
Alexei Dobrohotov
6de9b49d3d Remove an empty line 2021-11-10 19:59:13 +03:00
Alexei Dobrohotov
9880c43c86 Add specular strength shader parameter 2021-11-10 19:58:06 +03:00
Alexei Dobrohotov
923756b407 Load NiControllerManager 2021-11-10 19:42:55 +03:00
Alexei Dobrohotov
41097352a8 Load BSDismemberSkinInstance 2021-11-10 19:40:02 +03:00
Alexei Dobrohotov
5571099147 Load NiCollisionObject and bhkCollisionObject 2021-11-10 19:31:28 +03:00
Alexei Dobrohotov
9500afaa5a Load BSFurnitureMarker 2021-11-10 19:21:07 +03:00
Alexei Dobrohotov
0d13b8cd3f Allow movement during blocking (bug #6327) 2021-11-10 15:48:03 +03:00
psi29a
d914cda347 Merge branch 'lolcatmap' into 'master' 
Fix stupid typo

Closes #6403

See merge request OpenMW/openmw!1376
 2021-11-10 07:51:04 +00:00
Alexei Dobrohotov
835bec0ed1 Fix stupid typo 2021-11-10 09:36:01 +03:00
Andreas Stöckel
81f2fa992f Update changelog 2021-11-09 23:27:32 -05:00