Commit graph

12247 commits

Author SHA1 Message Date
scrawl
90cc1de46c Do not list custom made classes in the pick class dialog 2016-03-21 11:46:25 +01:00
scrawl
b332704df7 Switch hand-to-hand attack types randomly when "always use best attack" is turned on (Fixes #3259) 2016-03-19 18:03:59 +01:00
Marc Zinnschlag
589fb1031b Merge remote-tracking branch 'pi03k/bug_3248' 2016-03-18 07:32:57 +01:00
scrawl
a6e23d03d3 Don't clamp disposition twice, clamping is already done inside getDerivedDisposition 2016-03-18 00:42:22 +01:00
scrawl
102f9719f7 Remove some garbage 2016-03-18 00:39:27 +01:00
scrawl
79eb2d20e0 Cleanup 2016-03-18 00:39:19 +01:00
scrawl
12ec90f9e7 Change default argument, fix GetDisposition 2016-03-18 00:38:02 +01:00
scrawl
bc5adfa4fe Merge pull request #913 2016-03-18 00:31:55 +01:00
scrawl
30402f75e3 Use xbase_anim_female as the base skeleton for female NPCs (Fixes #3258) 2016-03-18 00:24:38 +01:00
scrawl
2b38d10449 Always add xbase_anim 2016-03-18 00:17:05 +01:00
pi03k
629a558e7b Fix for bug 3248 2016-03-17 22:34:45 +01:00
scrawl
50acdf3e47 Move createCharacter inside the try block 2016-03-14 00:03:02 +01:00
scrawl
a0cc9de088 Make the creation of save file directories even more explicit 2016-03-14 00:00:11 +01:00
scrawl
b7b7c0612d Make getCurrentCharacter create argument explicit 2016-03-13 23:48:44 +01:00
scrawl
7463c0c353 Addition to last commit, don't create a save directory on death 2016-03-13 23:48:22 +01:00
scrawl
426a6fdcc2 Don't create the save directory on loading a game
This prevents empty directories being created when loading a save file outside of the saves directory with the --load-savegame switch.
2016-03-13 23:42:08 +01:00
scrawl
d7c7bb850b ToggleAI cleanup 2016-03-12 20:32:42 +01:00
Marc Zinnschlag
d5067201d0 Merge branch 'move' 2016-03-12 13:27:00 +01:00
Marc Zinnschlag
900378a31e changed 'not implemented' warning message for object movement 2016-03-12 13:26:33 +01:00
Marc Zinnschlag
d6b8033b46 handle cell transitions when moving objects 2016-03-12 13:19:51 +01:00
Marc Zinnschlag
5c587fe93e Merge remote-tracking branch 'scrawl/cs_waterlevel' 2016-03-12 08:07:38 +01:00
scrawl
d840c7d5eb Slightly tweak the spawn point heuristics
Fixes an issue with hlaalu building exits
2016-03-11 22:48:28 +01:00
scrawl
97526284f5 Allow setting the water level of an interior cell with sky (Fixes #3244) 2016-03-11 22:10:59 +01:00
Marc Zinnschlag
fa9689c5e7 delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on) 2016-03-11 14:04:47 +01:00
Marc Zinnschlag
6a2fe564ef Merge branch 'master' into move 2016-03-11 12:47:33 +01:00
scrawl
85bd4f52f0 Improve occlusion query geometry rendering 2016-03-11 00:09:46 +01:00
scrawl
93ec289b1d Improve setting of occlusion query state 2016-03-10 23:18:20 +01:00
scrawl
14e1911820 Fix memory leaks 2016-03-10 20:38:14 +01:00
scrawl
f898bf493f Don't use Geodes 2016-03-10 13:17:01 +01:00
scrawl
137dde7cf8 Include cleanup 2016-03-10 12:59:17 +01:00
ae-g-i-s
c9791c5c1a Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233) 2016-03-08 21:30:28 +01:00
ae-g-i-s
2f1c6c740c Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)"
This reverts commit 000597236e.
2016-03-08 20:41:39 +01:00
ae-g-i-s
9585a12fb1 Merge remote-tracking branch 'upstream/master' into enable-unbounded-disposition-check 2016-03-08 20:40:47 +01:00
Marc Zinnschlag
b2181fae20 safer handling of command macros 2016-03-08 10:48:44 +01:00
scrawl
3e6cf17665 Warn about cellrefs with an empty refId (Bug #3238) 2016-03-07 22:44:03 +01:00
scrawl
d0aba0d9ee Catch exceptions thrown during reference loading (Bug #3238) 2016-03-07 21:28:50 +01:00
ae-g-i-s
000597236e Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233) 2016-03-06 18:29:32 +01:00
scrawl
0fc65db6bb Remove parts before setting the new object root 2016-03-06 11:34:15 +01:00
scrawl
0df975a4d7 Properly detach nodes in CopyRigVisitor (Fixes #3234) 2016-03-06 11:33:07 +01:00
scrawl
60a12b3dee Use MyGUI's castType function 2016-03-05 20:00:51 +01:00
scrawl
763f647412 Add ItemModel::allowedToInsertItems 2016-03-05 19:53:24 +01:00
scrawl
373c1e7602 Assign the PageDisplay on initialization 2016-03-05 19:48:01 +01:00
scrawl
5ea7446eeb Change a dynamic_cast to static_cast 2016-03-05 19:41:45 +01:00
scrawl
c085e503c6 Pass the btCollisionObject as const 2016-03-05 16:09:56 +01:00
scrawl
004f0d37d5 Fix the projectile launch position for spells cast from objects (Fixes #3235) 2016-03-05 15:56:54 +01:00
scrawl
910e41e3c4 Allow an Object to be specified as ignore parameter for castRay 2016-03-05 15:56:19 +01:00
Marc Zinnschlag
b5005f7812 keep sub mode over mode changes 2016-03-05 11:41:42 +01:00
Marc Zinnschlag
a63453846b properly clear drag mode at the end of a drag 2016-03-05 11:14:08 +01:00
Marc Zinnschlag
51a4e3fa7d properly abort drags from outside the worldspace widget (code was leaving unclean dragging flags behind) 2016-03-05 10:56:54 +01:00
Marc Zinnschlag
70745487f3 cancel instance move on editing lock becoming active 2016-03-05 10:44:46 +01:00