AnyOldName3
|
1e48114492
|
Use JDGBOLT's indoor 'sun' direction.
|
2018-08-08 23:30:33 +01:00 |
|
AnyOldName3
|
a2b54714d4
|
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
|
2018-08-08 23:28:06 +01:00 |
|
AnyOldName3
|
586ac2d12d
|
Revert "Prevent accidental culling of first person meshes"
This reverts commit c38bf6757a .
|
2018-08-08 22:53:56 +01:00 |
|
Andrei Kortunov
|
51af729305
|
Do not use headtracking in the 1st-person view (bug #4573)
|
2018-08-08 23:29:03 +04:00 |
|
Andrei Kortunov
|
6202b4eca9
|
Do not touch GUI modes when taking screenshots (bug #4528)
|
2018-08-08 22:10:53 +04:00 |
|
Capostrophic
|
e9e9c0dd6b
|
Fix guild guide fast travelling to exteriors time
|
2018-08-08 12:46:36 +03:00 |
|
Andrei Kortunov
|
b7859b3fa9
|
Cap underwater view distance (bug #4565)
|
2018-08-08 13:22:40 +04:00 |
|
Capostrophic
|
bcd9cc4baa
|
Check the actor cell instead of the destination cell in fast travel price logic
|
2018-08-08 02:07:48 +03:00 |
|
Andrei Kortunov
|
2b90504558
|
Init SDL2 before Qt4 to avoid crash on Linux (bug #4529)
|
2018-08-07 22:57:16 +04:00 |
|
Marc Zinnschlag
|
b75b5d139a
|
Merged pull request #1845
|
2018-08-05 12:28:38 +02:00 |
|
Marc Zinnschlag
|
7a93d118d2
|
Merged pull request #1846
|
2018-08-05 12:26:56 +02:00 |
|
Capostrophic
|
7087bad580
|
Use special behavior for all topics with reserved names (bug #4557)
|
2018-08-05 12:39:53 +03:00 |
|
Andrei Kortunov
|
1f4dd3b393
|
Make partial binary search case insensitive, as it supposed to be (bug #4558)
|
2018-08-05 13:26:12 +04:00 |
|
Andrei Kortunov
|
b0f2e00e7f
|
Make forcegreeting a non-op for non-actor objects (bug #4553)
|
2018-08-05 09:31:45 +04:00 |
|
Marc Zinnschlag
|
452a706047
|
Merged pull request #1837
|
2018-08-04 10:26:44 +02:00 |
|
Marc Zinnschlag
|
b6a919a2d1
|
Merged pull request #1838
|
2018-08-04 10:26:18 +02:00 |
|
Marc Zinnschlag
|
99c03d55f0
|
Merged pull request #1841
|
2018-08-04 10:25:52 +02:00 |
|
Marc Zinnschlag
|
2a621fedd1
|
Merged pull request #1842
|
2018-08-04 10:08:11 +02:00 |
|
Capostrophic
|
d15dcaff68
|
Don't adjust weapon rating according to weapon condition twice
|
2018-08-03 19:22:58 +03:00 |
|
Andrei Kortunov
|
e2519226aa
|
Move boost include
|
2018-08-03 17:04:07 +04:00 |
|
Andrei Kortunov
|
eeffe2e557
|
Check if item model exists inside drag and drop functions
|
2018-08-03 16:42:43 +04:00 |
|
Andrei Kortunov
|
c2a175c2e0
|
Move crash catcher wrapper to separate file
|
2018-08-03 15:51:17 +04:00 |
|
Capostrophic
|
725a9323c4
|
Merge branch 'master' into sound
|
2018-08-03 14:16:51 +03:00 |
|
Capostrophic
|
4c7f3cf626
|
Merge branch 'master' into weaponpriority
|
2018-08-03 14:07:11 +03:00 |
|
Marc Zinnschlag
|
4d280add81
|
Merged pull request #1843
|
2018-08-03 12:56:17 +02:00 |
|
Marc Zinnschlag
|
d7718aae9b
|
Merged pull request #1840
|
2018-08-03 12:54:56 +02:00 |
|
Marc Zinnschlag
|
eb5f558f6f
|
Merged pull request #1839
|
2018-08-03 12:53:55 +02:00 |
|
Andrei Kortunov
|
712c9995db
|
Rename mIsScripted variable because its name is ambiguous
|
2018-08-03 12:01:31 +04:00 |
|
Andrei Kortunov
|
c454f1bdad
|
Use log file for editor (feature #4012)
|
2018-08-03 09:05:08 +04:00 |
|
AnyOldName3
|
8f4125134f
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2018-08-02 15:51:06 +01:00 |
|
AnyOldName3
|
c38bf6757a
|
Prevent accidental culling of first person meshes
|
2018-08-02 15:50:43 +01:00 |
|
Capostrophic
|
9d85b7c2d3
|
Use the actual damage for deducting weapon rating
|
2018-08-02 15:20:07 +03:00 |
|
Capostrophic
|
73d5496711
|
Revert addition change
|
2018-08-02 13:01:23 +03:00 |
|
Capostrophic
|
16af1a6c1c
|
Replace 0 sound range values separately
|
2018-08-02 12:40:53 +03:00 |
|
Capostrophic
|
3ac030d75a
|
Handle explicit calls before handling quotes
|
2018-08-02 09:49:53 +03:00 |
|
Capostrophic
|
80f3bd9f86
|
Don't apply iWereWolfFleeMod to creatures
|
2018-08-02 08:36:15 +03:00 |
|
Capostrophic
|
fa6c205e5d
|
Make tab autocompletion work with explicit reference calls
|
2018-08-02 03:24:31 +03:00 |
|
Capostrophic
|
bec47dfb7c
|
Make ranged weapon bonus a distance-dependent multiplier
|
2018-08-01 19:57:05 +03:00 |
|
Capostrophic
|
382b68a081
|
Combat AI: take the actual hit chance in account when rating weapon
|
2018-08-01 19:27:19 +03:00 |
|
Andrei Kortunov
|
12144de8ed
|
Initialize missing variables
|
2018-08-01 20:18:37 +04:00 |
|
Andrei Kortunov
|
c0bed0fde2
|
Handle case when index < 0
|
2018-08-01 20:17:59 +04:00 |
|
Andrei Kortunov
|
770d86f9bd
|
Initialize cubeSize variable for 360 degrees screenshots correctly
|
2018-08-01 19:36:55 +04:00 |
|
Andrei Kortunov
|
a08048da4e
|
Avoid dereference after null check
|
2018-08-01 19:30:30 +04:00 |
|
Capostrophic
|
ab29f9e13f
|
Add permanent barter disposition change option (feature #3103)
|
2018-08-01 17:31:35 +03:00 |
|
Marc Zinnschlag
|
1c13256456
|
Merged pull request #1829
|
2018-08-01 16:17:37 +02:00 |
|
Marc Zinnschlag
|
0e75e3816a
|
Merged pull request #1830
|
2018-08-01 16:16:30 +02:00 |
|
Marc Zinnschlag
|
0c507b74bc
|
Merge pull request #1832
|
2018-08-01 16:13:59 +02:00 |
|
Marc Zinnschlag
|
7c7af1da61
|
Merged pull request #1834
|
2018-08-01 15:47:09 +02:00 |
|
AnyOldName3
|
cc23a968d1
|
Merge upstream/master
|
2018-08-01 14:13:45 +01:00 |
|
Capostrophic
|
4d48ede6f1
|
Add two missing gameplay settings to Advanced tab
|
2018-08-01 13:36:31 +03:00 |
|
Capostrophic
|
be2e7e9e09
|
Make casting caster-linked on-self effects no-op (bug #4378)
|
2018-08-01 02:41:57 +03:00 |
|
Andrei Kortunov
|
5b92910829
|
Limit difficulty scaling, as mentioned in docs
|
2018-07-31 21:14:16 +04:00 |
|
Marc Zinnschlag
|
aac580da6b
|
Merged pull request #1828
|
2018-07-31 11:10:48 +02:00 |
|
Marc Zinnschlag
|
20d4e27f82
|
Merged pull request #1821
|
2018-07-31 10:51:32 +02:00 |
|
Andrei Kortunov
|
c07cc0dc40
|
Reset animation state after weapon unequipping
|
2018-07-30 22:24:25 +04:00 |
|
Andrei Kortunov
|
0f2c3ecb17
|
Rescale player avatar (bug #4539)
|
2018-07-30 17:41:43 +04:00 |
|
Capostrophic
|
c79f96d0d2
|
Implement ranged crits (feature #3703)
|
2018-07-29 19:42:44 +03:00 |
|
Andrei Kortunov
|
1d463d129d
|
Finish AiTarget package, if destination is blocked by other actor
|
2018-07-29 19:41:31 +04:00 |
|
Andrei Kortunov
|
75835c8326
|
Prevent NPC from chosing farther pathgrid node
|
2018-07-29 18:18:05 +04:00 |
|
Marc Zinnschlag
|
9e6cba09a6
|
Merged pull request #1827
|
2018-07-29 12:52:51 +02:00 |
|
Marc Zinnschlag
|
84de55fb46
|
Merged puil request #1824
|
2018-07-29 12:52:01 +02:00 |
|
Marc Zinnschlag
|
78121c1774
|
Merged pull request #1823
|
2018-07-29 12:49:50 +02:00 |
|
Marc Zinnschlag
|
3ba9229f47
|
Merged pull request #1815
|
2018-07-29 12:48:20 +02:00 |
|
Capostrophic
|
9c8e284ead
|
Fix quick key activation delay code (regression #4536)
|
2018-07-29 12:52:29 +03:00 |
|
Capostrophic
|
84a871cac7
|
Actually enable is_pod test
|
2018-07-28 23:56:42 +03:00 |
|
Andrei Kortunov
|
6d5d0039ec
|
Make sure we apply OT_Murder only once
|
2018-07-28 20:45:33 +04:00 |
|
Andrei Kortunov
|
bc82dbbd1b
|
Do not try to find missing animated collision shape again and again
|
2018-07-28 16:49:00 +04:00 |
|
Andrei Kortunov
|
2d4ec86b8d
|
Provide launcher icons
|
2018-07-28 13:18:38 +04:00 |
|
Andrei Kortunov
|
28a02ac93b
|
Use file selection dialogue result (bug #4524)
|
2018-07-27 21:25:21 +04:00 |
|
Marc Zinnschlag
|
b7c159e5b6
|
Merged pull request #1816
|
2018-07-27 12:09:10 +02:00 |
|
Marc Zinnschlag
|
c508938674
|
Merged pull request #1817
|
2018-07-27 12:06:51 +02:00 |
|
Marc Zinnschlag
|
bbb22643e8
|
Merge remote-tracking branch 'capostrophic/warning'
|
2018-07-27 12:05:26 +02:00 |
|
Capostrophic
|
f7887ab05f
|
Fix MSVC C4456 warning: declaration of 'stats' hides previous local declaration
|
2018-07-26 23:24:26 +03:00 |
|
Capostrophic
|
51d369d4da
|
Add resumeGame method
|
2018-07-26 20:35:34 +03:00 |
|
Andrei Kortunov
|
23d917df9c
|
Do not use magic numbers in capacity calculations
|
2018-07-26 18:06:36 +04:00 |
|
Capostrophic
|
cac2bc768e
|
Fix NPC "can't teach more" message (bug #4494)
|
2018-07-25 12:34:33 +03:00 |
|
Marc Zinnschlag
|
ddd5cbd17c
|
Initialise lock state of newly opened subviews (fixes issue #4520)
|
2018-07-21 17:38:11 +02:00 |
|
Andrei Kortunov
|
8281fd903f
|
Set movement speed to 0 when unconscious (bug #4519)
|
2018-07-19 20:17:32 +04:00 |
|
Andrei Kortunov
|
5c16ce1d36
|
Sort icons in the DataDisplayDelegate
|
2018-07-17 22:49:51 +04:00 |
|
Marc Zinnschlag
|
78a2725169
|
Merged pull request #1806
|
2018-07-17 12:42:41 +02:00 |
|
Marc Zinnschlag
|
326a3e61f4
|
Merged pull request #1807
|
2018-07-17 12:42:12 +02:00 |
|
Andrei Kortunov
|
38fa4e0a8a
|
Do not play un-equipping animation when we switch to hand-to-hand
|
2018-07-17 14:10:04 +04:00 |
|
Andrei Kortunov
|
edd5769022
|
Show magic items count in spells window (feature #4509)
|
2018-07-16 14:11:03 +04:00 |
|
Andrei Kortunov
|
30716344f2
|
Fix possible division by zero in the fatigue calculation (bug #4510)
|
2018-07-16 13:24:12 +04:00 |
|
Andrei Kortunov
|
6ddf6eb885
|
Use editor markers for lights and creatures levelled lists
|
2018-07-15 17:25:18 +04:00 |
|
Andrei Kortunov
|
3d1daaebab
|
Rework manual spellcasting (e.g. via scripts)
|
2018-07-12 16:24:25 +04:00 |
|
Bret Curtis
|
99e4d49e7c
|
Merge pull request #1787 from akortunov/profilierfont
Use the DejaVuLGCSansMono.ttf for profiler output
|
2018-07-11 16:00:34 +02:00 |
|
Andrei Kortunov
|
70b6d4983d
|
Use the DejaVuLGCSansMono.ttf in profilier output
|
2018-07-11 14:41:49 +04:00 |
|
Marc Zinnschlag
|
ee759effce
|
Merged pull request #1798
|
2018-07-11 10:06:30 +02:00 |
|
Andrei Kortunov
|
c77c50e92b
|
Make Equip console command to bypass most of restrictions (bug #4460)
|
2018-07-11 00:06:21 +04:00 |
|
Capostrophic
|
5cb9dc9d12
|
Use SpellTurnLeft/TurnRight animation groups
|
2018-07-10 22:19:56 +03:00 |
|
Bret Curtis
|
df1576fcf5
|
Merge branch 'master' into crossbowfix
|
2018-07-10 19:15:37 +02:00 |
|
Bret Curtis
|
fde46f03b3
|
Merge pull request #1801 from terabyte25/terabyte25-trainingskill
Update trainer skill cap based off modified skill instead of based skill
|
2018-07-10 16:54:28 +02:00 |
|
Andrei Kortunov
|
1c35e20fcc
|
Use 1h animations as fallback for crossbows
|
2018-07-10 17:02:51 +04:00 |
|
Andrei Kortunov
|
75dcbea365
|
Apply weapon reload animations only for upper body
|
2018-07-10 17:00:48 +04:00 |
|
Andrei Kortunov
|
27a5da59ba
|
Fix MSVC warnings C4456
|
2018-07-10 11:29:39 +04:00 |
|
terrabyte25
|
48296a7452
|
Update trainingwindow.cpp
|
2018-07-09 23:13:52 +04:00 |
|
Marc Zinnschlag
|
0bdd8f7d03
|
Merged merge request !19
|
2018-07-09 17:43:22 +02:00 |
|
Alexander Stillich
|
725cc94210
|
Renamed cc_install to something less cryptic (crashCatcherInstall)
|
2018-07-09 16:25:55 +02:00 |
|
Doc West
|
467989cdd5
|
Moved crashcatcher to a component and also use it in CS
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
|
2018-07-09 16:25:55 +02:00 |
|