Kyle Cooley
492b99b008
Transparent object markers
2017-11-07 00:41:27 -05:00
scrawl
801f2d42d5
Merge pull request #1537 from drummyfish/guardfix
...
Check the real distance to target in AIPursue (issue #4184 )
2017-11-05 23:24:59 +00:00
Miloslav Číž
f98a821482
fix possible bug in aipursue
2017-11-05 23:46:15 +01:00
scrawl
87c79d7102
Merge pull request #1536 from rexelion/knockoutfix
...
Wait a few seconds before getting up (fixes #3884 )
2017-11-05 20:27:54 +00:00
scrawl
45993d3da2
Merge pull request #1529 from drummyfish/animfix
...
Stop character landing animation when turning (issue #4177 )
2017-11-05 20:24:24 +00:00
Miloslav Číž
430d01a39a
additional animation refactor
2017-11-05 20:19:47 +01:00
rexelion
de7a7d842b
mTimeUntilWake is initialised in the constructor
2017-11-05 18:30:34 +00:00
scrawl
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
2017-11-05 16:18:34 +00:00
Miloslav Číž
282800b5b2
Create LICENSE ( #1532 )
...
* Create LICENSE
Let's add the license file so that GitHub officially registers it and displays it next to the project.
* move license files
* update licenses in cmakelists.txt
* fix link in README
2017-11-05 15:37:38 +00:00
scrawl
e3c42251f9
Update AUTHORS.md
2017-11-05 15:36:26 +00:00
scrawl
e6303c578c
Merge pull request #1530 from rexelion/curseitemfix
...
Trigger OnActivate when item is picked up through the inventory (Issue #3726 )
2017-11-05 15:35:39 +00:00
rexelion
48ec680f23
use game time instead of real time
2017-11-04 19:37:20 +00:00
Miloslav Číž
f34223fce9
check the real distance to target in aipursue
2017-11-04 20:02:21 +01:00
rexelion
ab66034ed1
use uniform_int_distribution instead of rand()
2017-11-04 02:15:56 +00:00
rexelion
ee2f3db9a8
fixed randomness
2017-11-04 01:31:15 +00:00
rexelion
8c2cc0f42f
break invisibility first
2017-11-04 00:44:16 +00:00
rexelion
bcbfa5fe1e
prevent activation, leave the rest to the script
2017-11-04 00:38:33 +00:00
rexelion
de83ad0116
use real time; wait random number of seconds
2017-11-04 00:24:09 +00:00
rexelion
5b8610b34b
knocked out characters wait some time before getting up
2017-11-01 23:44:50 +00:00
rexelion
a9e5e19482
OnActivate is triggered when the item is picked up
2017-10-31 22:33:26 +00:00
Miloslav Číž
ff1265c0e7
refactor jump animation
2017-10-31 14:22:24 +01:00
scrawl
5e69f6033f
Merge pull request #1531 from drummyfish/cyclefix
...
Don't switch weapon when cycling to the same weapon (issue #4180 )
2017-10-31 00:28:15 +00:00
rexelion
e8743f3f79
check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords
2017-10-30 21:16:25 +00:00
Miloslav Číž
3c65bdaf14
weapon cycle fix
2017-10-30 18:05:45 +01:00
Miloslav Číž
7bc512974f
use mcurrentjump instead of custom attrib
2017-10-30 15:26:38 +01:00
rexelion
4e6f53d6f1
item added to the player and OnActivate is triggered when the inventory is closed
2017-10-29 11:45:17 +00:00
rexelion
1ee5dcff77
added a function to determine if a script contains OnActivate
2017-10-28 20:56:08 +01:00
Miloslav Číž
5c8f491441
move animation disabling code to a better place
2017-10-28 18:46:52 +02:00
scrawl
9c9da7b49f
Merge pull request #1527 from drummyfish/master
...
Remove redundant condition
2017-10-28 15:59:35 +00:00
Miloslav Číž
f9c396e0ea
stop landing animation when turning
2017-10-28 15:48:07 +02:00
Miloslav Číž
03401bb5df
remove redundant condition
2017-10-27 20:19:20 +02:00
Bret Curtis
d19839a666
standerdise on 3.1.0
2017-10-25 21:55:58 +02:00
scrawl
ae14aa0c84
Merge pull request #1522 from AnyOldName3/yet-another-cmake-fix
...
Ensure the git-version target puts the version file in the appropriate directory/ies
2017-10-25 13:58:04 +00:00
scrawl
90f4e9530a
Merge pull request #1517 from ace13/update-osg
...
Updating OSG packages to 3.4.1
2017-10-25 13:49:55 +00:00
AnyOldName3
c1a871ff1f
Make indentation consistent.
2017-10-24 23:31:40 +01:00
AnyOldName3
daf7d8451c
Switch to a more reliable method of passing the git-version targt the data it needs
2017-10-24 23:29:18 +01:00
AnyOldName3
e3142b9643
Add missing variables to those forwarded to the git-version target
2017-10-24 23:10:50 +01:00
scrawl
4a7be0ffda
Don't reset journal index to a lower value ( Fixes #4172 )
2017-10-24 20:02:35 +00:00
scrawl
4437a72e47
Merge pull request #1519 from drummyfish/rainfix
...
fix rain ripple regression (bug #4169 )
2017-10-24 15:31:16 +00:00
Miloslav Číž
3731e20228
fix rain ripple regression
2017-10-24 14:12:41 +02:00
scrawl
0c6ef17fb5
Add explicit variant of 'OnActivate'
2017-10-23 23:33:06 +00:00
scrawl
e564dd842e
Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response ( Fixes #4166 )
...
Don't delete Link objects prematurely (Fixes #4171 )
2017-10-23 23:33:06 +00:00
scrawl
2a0b2c4e24
Hide modal window before deleting it ( Fixes #4168 )
2017-10-23 23:33:05 +00:00
Alexander "Ace" Olofsson
32bdd500af
Updating OSG packages to 3.4.1
2017-10-22 23:13:01 +02:00
scrawl
8b19a8b7f6
Merge pull request #1513 from lukago/feature4082b
...
Feature #4082 : use many ingredients/potions instantly
2017-10-22 20:51:14 +00:00
scrawl
3d0094bd2e
Fix behavior of 'journal' command when invoked with already seen entry
2017-10-22 20:50:15 +00:00
scrawl
768da57da2
Fix dialogue topics displayed in lower case
2017-10-22 20:50:15 +00:00
scrawl
f3be39660b
Merge pull request #1516 from baszczewski/patch-1
...
Fix assert with empty setting value
2017-10-22 16:31:42 +00:00
Marcin Baszczewski
46b015d3d9
Fix assert with empty setting value
...
Local value could be empty, so it's important to check it size before read first char.
2017-10-22 10:10:04 +02:00
lukago
b6cb3b445c
use getIndex to handle other windows, nullsafe fixes
2017-10-21 23:34:57 +02:00