Capostrophic
f9a711d2fd
Revert poor animation decisions
...
Start force-updated in-air animation from loop start
Make movement animations have higher priority than jump animations
Make jumping animations have higher priority than turning animations
Don't reset idle during landing animation
Don't play default landing sound if the character is not on ground
2019-01-22 23:21:33 +03:00
Stomy
71be4cdd20
Ensure Unique Instance Refnum after clone, add, or move
2019-01-21 19:30:11 +00:00
Bret Curtis
c5a67c2079
Merge pull request #2137 from elsid/navmesh_render
...
Avoid useless read of navmeshes from navigator
2019-01-20 20:32:24 +01:00
elsid
13e94ab194
Get navmesh to update osg node only if rendering is enabled
2019-01-20 21:09:06 +03:00
elsid
3572edab72
Update navmesh in a separate method
2019-01-20 19:28:23 +03:00
Andrei Kortunov
1e8b7f0f83
Fix -Wstring-plus-int warnings
2019-01-20 15:46:19 +04:00
Artur Rojek
f6e1aaae1a
Use case-insensitive compare when searching for game data by the wizard.
...
Until now, the wizard was only comparing against an exact file name
match while searching for game data, eg. "data*.cab".
This patch makes it possible to locate game data regardless of case
sensitivity, eg. "Data*.cab".
2019-01-15 13:36:24 +01:00
Capostrophic
8bb270c2bb
Update moved object collisions even if the cell is the same (bug #4800 )
2019-01-14 00:56:43 +03:00
Bret Curtis
8834ee95be
Merge pull request #2120 from Capostrophic/macros
...
Get rid of some remaining instances of C numeric limits
2019-01-10 18:59:34 +01:00
Bret Curtis
db74eb4466
Merge pull request #2094 from Capostrophic/editor
...
Cherry-pick cc9cii's minor editor improvements
2019-01-10 17:55:59 +01:00
Bret Curtis
9c795195d0
Merge pull request #2109 from Capostrophic/loops
...
Simplify some world loops
2019-01-10 11:44:41 +01:00
Bret Curtis
4617dea154
Merge pull request #2119 from akortunov/stringstream
...
Get rid of unnecessary string streams
2019-01-10 11:42:27 +01:00
Capostrophic
a71cfca580
Get rid of some remaining instances of C limit macros
2019-01-09 16:06:18 +03:00
Andrei Kortunov
3e20f36953
Handle invalid string length for hinting
2019-01-08 12:37:41 +04:00
Capostrophic
776c6c2fe6
Fix MSVC warning
2019-01-07 20:38:33 +03:00
Andrei Kortunov
0937f02598
Get rid of unnecessary string streams
2019-01-07 21:08:16 +04:00
Andrei Kortunov
b17702bf1f
Do not restore birthsign abilities upon game load (bug #4329 )
2019-01-07 20:18:21 +04:00
Bret Curtis
de24682e2f
Merge pull request #2115 from Capostrophic/slowfall
...
Don't reset player jumping flag unnecessarily (bug #4775 )
2019-01-07 17:13:39 +01:00
Capostrophic
a1af1ff487
Fix extra semicolon, redundant getStore calls and random creature spawn loop
2019-01-07 17:48:41 +03:00
Bret Curtis
9d1c0d2b22
Merge pull request #2114 from Capostrophic/cleanup
...
Remove some redundant code
2019-01-07 14:59:39 +01:00
Capostrophic
403db9afe3
Don't reset player jumping flag unnecessarily (bug #4775 )
2019-01-07 16:08:26 +03:00
Bret Curtis
573af17cf9
Merge pull request #2097 from akortunov/camerafix
...
Do not scale player's model in the 1st-person view depending on race
2019-01-07 13:57:21 +01:00
Bret Curtis
93e566a08e
Merge pull request #2117 from Capostrophic/aidata
...
Make Interiors of Illusion puzzle of Sotha Sil Expanded work (bug #4778 )
2019-01-07 13:56:11 +01:00
Andrei Kortunov
ab0841cc3d
Split physics update from world update in the profiler
2019-01-07 14:44:43 +04:00
Andrei Kortunov
02a43d0b32
Do not scale player's model in the 1st-person view depending on race (bug #4383 )
2019-01-07 12:58:47 +04:00
Capostrophic
92d7f21926
Don't interrupt compilation when spell/effect functions are used for non-actors
2019-01-06 21:45:56 +03:00
Capostrophic
624db99bf2
Remove some redundant code
2019-01-05 01:25:52 +03:00
Capostrophic
27eb64c7f0
Clean up fallback record creation again
2019-01-02 13:49:04 +03:00
Capostrophic
8a266803eb
Simplify some world loops
2018-12-30 15:36:42 +03:00
Bret Curtis
932691d199
Merge pull request #2091 from Capostrophic/fallheight
...
Avoid falling height reset if on-ground state wasn't actually updated (bug #4411 )
2018-12-29 08:26:28 +01:00
Bret Curtis
d80d056140
Merge pull request #2098 from xyzz/fix-loading-screen-uaf
...
loadingscreen: Fix UaF in loading screen.
2018-12-28 18:58:04 +01:00
Bret Curtis
91b962c095
Merge pull request #2099 from xyzz/replace-volatile-atomic
...
Replace volatile bools with std::atomic<bool>
2018-12-28 16:41:07 +01:00
Capostrophic
7155e787b4
Clean up fallback record creation
2018-12-28 01:22:24 +03:00
Ilya Zhuravlev
1bdec2399f
Make sure CopyFramebufferToTextureCallback is only called once and not every frame
2018-12-25 11:56:24 -05:00
Ilya Zhuravlev
07e9ce84b3
Replace volatile bools with std::atomic<bool>
2018-12-24 14:19:35 -05:00
Ilya Zhuravlev
8e7c01b561
loadingscreen: Fix UaF in loading screen.
...
When the CopyFramebufferToTextureCallback callback is called, in its operator() it resets setInitialDrawCallback by providing a NULL pointer.
However, this causes the callback to get deleted. In turn, the "this" pointer is invalidated.
When execution returns to DrawCallback::run, it accesses a _nestedCallback member of deleted "this" which is UB.
2018-12-24 14:18:26 -05:00
Ilya Zhuravlev
98b2c04404
android: Add a method so that we can send relative mouse movements from java.
2018-12-23 15:14:29 -05:00
Capostrophic
793c2a19d2
Cherry-pick cc9cii's editor improvements
2018-12-23 20:10:16 +03:00
Capostrophic
0bbcc0e787
Avoid falling height reset if onGround state didn't change (bug #4411 )
2018-12-23 13:39:35 +03:00
Ilya Zhuravlev
09585b7208
android_main.c: Replace nullptr back to NULL since there are no nullptr in C
2018-12-22 22:21:26 -05:00
Capostrophic
2681435857
Editor: handle AI settings, regional sound and levelled list "none" chances as shorts (bug #2987 )
2018-12-20 19:51:55 +03:00
Bret Curtis
6d7aacab5e
Merge pull request #2053 from akortunov/animatedContainers
...
Native animated containers support
2018-12-17 10:00:07 +01:00
Bret Curtis
d2c88f0983
Merge pull request #2071 from Capostrophic/sneaking
...
Don't interrupt sneak and swim idles in attack ready state in first person view (bug #4750 )
2018-12-17 09:34:27 +01:00
Andrei Kortunov
a53333c3d5
Native animated containers support (feature #4730 )
2018-12-13 23:11:16 +04:00
terrabyte25
c31fa3074e
Sanity check for text input in toggleWalking
2018-12-12 14:40:15 -06:00
Capostrophic
6083e5ed4b
Don't interrupt sneak and swim idles in first person view (bug #4750 )
2018-12-10 00:05:06 +03:00
Marc Zinnschlag
d791dcfbf3
Merged pull request #2051
2018-12-06 13:10:48 +01:00
Bret Curtis
32624cb3ed
Merge branch 'master' into colors
2018-12-06 09:59:13 +01:00
Bret Curtis
b296c4a3bb
Merge pull request #2058 from Capostrophic/collision
...
Don't consider non-solid actors truly levitating (bug #4746 )
2018-12-06 09:56:16 +01:00
Capostrophic
7b33838b33
Don't consider non-solid actors truly levitating (bug #4746 )
2018-12-05 23:37:32 +03:00
