Commit Graph

24681 Commits (8737453498d7dc4b62458e53f5318c76bc40865d)
 

Author SHA1 Message Date
psi29a 11eff02a1d Merge branch 'Show-more-information-about-level-on-menu' into 'master'
Show more information about level on menu

See merge request OpenMW/openmw!437
4 years ago
psi29a 9a35c5815e Merge branch 'nofallfloor' into 'master'
Update physics object position after spawning.

See merge request OpenMW/openmw!449
4 years ago
psi29a 789d034432 Merge branch 'skirts' into 'master'
Editor: Properly reserve body parts for skirts (bug #5731)

Closes #5731

See merge request OpenMW/openmw!452
4 years ago
psi29a acd5109897 Merge branch 'dontcopysimulationresults' into 'master'
explicitely use a reference for physics simulation results to avoid a copy

See merge request OpenMW/openmw!450
4 years ago
Frederic Chardon 460e5abb55 Update physics object position after spawning. 4 years ago
Frederic Chardon 899b8422fa explicitely use a reference, auto can't infer it and make a copy 4 years ago
Alexei Dobrohotov 32601e0ae4 Properly reserve body parts for skirts (bug #5731) 4 years ago
Alexei Dobrohotov 1d03b46422 Merge branch 'cleanup-improve-scene-colors' into 'master'
[OpenMW-CS][FIX] Clean up PR !442

See merge request OpenMW/openmw!451
4 years ago
Coleman Smith 3b9db41346 removing unneeded variable 4 years ago
Bret Curtis d35715e5dc add olcoal to authors and feature 5199 to changelog 4 years ago
psi29a d77f122289 Merge branch 'gl-5199-improve-scene-colors' into 'master'
[OpenMW-CS] Issue #5199: Improve Scene Colors

See merge request OpenMW/openmw!442
4 years ago
Coleman Smith 842ea9d6ed simplifying a bit
- attaching gradient camera directly to the main camera
- using Vec4ub
4 years ago
psi29a c8fa8cfe74 Merge branch 'herbalmenu' into 'master'
Add graphic herbalism to the launcher

Closes #5730

See merge request OpenMW/openmw!448
4 years ago
psi29a cfd04fcaec Merge branch 'recast_test_fix_c17' into 'master'
be explicit about narrowing to resolve: error: type 'btScalar *' (aka 'float...

See merge request OpenMW/openmw!447
4 years ago
psi29a 7156b11dbc be explicit about narrowing to resolve: error: type 'btScalar *' (aka 'float *') cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing] 4 years ago
Evil Eye 525292b184 Add graphic herbalism to the launcher 4 years ago
psi29a 686692519c Merge branch 'fix-tests' into 'master'
Use correct variable types when loading config for tests

See merge request OpenMW/openmw!446
4 years ago
AnyOldName3 15f03ae375 Merge branch 'logging2' into 'master'
Print '--version' and '--help' messages without timestamps

Closes #2686

See merge request OpenMW/openmw!444
4 years ago
psi29a 0e5af74a2f Merge branch 'masterindexloadfix' into 'master'
[OpenMW-CS] Load master index from refId to mContentFile

See merge request OpenMW/openmw!445
4 years ago
AnyOldName3 fd4a62ce35 Use correct variable types when loading config for tests 4 years ago
Petr Mikheev 49c6e50c31 Print '--version' and '--help' messages without timestamps 4 years ago
Nelsson Huotari 61a4a0807b Load master index in refId to mContentFile, keep master index also in mIndex 4 years ago
psi29a afaacedf67 Merge branch 'placeatmecrash' into 'master'
Don't crash the game when placing a non-actor

See merge request OpenMW/openmw!443
4 years ago
Evil Eye 39ac0cbb4a Don't crash the game when placing a non-actor 4 years ago
Chris Djali 21de3fa7e8
Merge pull request #3033 from akortunov/main_messages
Use a logging system instead of cout for a couple of missing messages
4 years ago
psi29a fd64aacf7d Merge branch 'cliherbalism' into 'master'
Add a setting to disable graphical herbalism

See merge request OpenMW/openmw!440
4 years ago
psi29a 8d8a4a890c Merge branch 'projectiles_collisions_mk2' into 'master'
Projectiles collisions

See merge request OpenMW/openmw!369
4 years ago
fredzio 4fbe1ed12c Ignore caster collision shape. Sometimes the magic bolt get launched
inside too near its caster.
4 years ago
fredzio 7e85235220 Projectile to projectile collision 4 years ago
fredzio 66fe3b0d38 Modify projectile collision to work with async physics 4 years ago
Andrei Kortunov dc7b48e92e Generate physics collisions for projectiles (bug #3372)
Remove redundant now mHit field
4 years ago
Andrei Kortunov 242dd8d496 Use a logging system instead of cout for a couple of missing messages 4 years ago
Evil Eye 275b9aea4d rename setting 4 years ago
Evil Eye e62fff5f2e Add a setting to disable graphical herbalism 4 years ago
Andrei Kortunov 807367ca3f Mark mock methods as overrides (requires GTest 1.10) 4 years ago
CedricMocquillon 86c31ded53 Update changelog 4 years ago
CedricMocquillon 2d3d22025a Avoid height for empty message in AutoSizedTextBox 4 years ago
CedricMocquillon 6bfdf0e57f Add more information on mouse over level 4 years ago
psi29a c2933721c6 Merge branch 'explodespell' into 'master'
Make AI cast self-targeted spells at the ground (bug #5695)

Closes #5695

See merge request OpenMW/openmw!426
4 years ago
psi29a a3dfdde9ef Merge branch 'move_actors_into_scene' into 'master'
Move actors into the scene after a teleport

See merge request OpenMW/openmw!438
4 years ago
psi29a c742c15f6d Merge branch 'autogoesbrr' into 'master'
Use range based for loops and auto

See merge request OpenMW/openmw!400
4 years ago
psi29a b22418d053 Merge branch 'fix_spawn' into 'master'
Fix spawn #5724

See merge request OpenMW/openmw!439
4 years ago
fredzio c6c02a6f16 Remove useless code. ipos is already initialized with the correct
values.
4 years ago
fredzio 08e73a09ec Make the code more compact by mean of std::min / max and ternary
operator.
4 years ago
fredzio b79f6ac808 Force reset position of actor after snapping to the ground. Otherwise
the interpolation calculation would kick in and make the actor goes upward if the
spawn point is higher than summoner or downward if lower. The actor
would then either jump or fall through terrain.
4 years ago
AnyOldName3 a8ab81cfa3 Merge branch 'logging' into 'master'
Add time to logs. Redirect OSG log to OpenMW log.

See merge request OpenMW/openmw!436
4 years ago
Petr Mikheev 5734551ff3 Add time to logs. Redirect OSG log to OpenMW log. 4 years ago
fredzio 7843dad35d Don't let the actor "nowhere" after a teleport but move them in their
place.
This solve the problem where after loading, an empty frame was rendered
because the player is "nowhere".
4 years ago
Evil Eye 078de86e60 Use range based for loops and auto 4 years ago
psi29a e2213cbdb1 Merge branch 'calibrate_teleportation_beam' into 'master'
Solve regression when teleporting with async (#5705)

See merge request OpenMW/openmw!433
4 years ago