Marc Zinnschlag
|
1b03eec63e
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-11 11:43:12 +01:00 |
|
scrawl
|
15e48107f7
|
Use i1stPersonSneakDelta + some cleanup
|
2014-01-10 22:39:01 +01:00 |
|
Marc Zinnschlag
|
f62497dfdc
|
Merge remote-tracking branch 'mrcheko/master'
|
2014-01-10 19:08:35 +01:00 |
|
mrcheko
|
ffcb7fb280
|
fix for bug scrawl mentioned
|
2014-01-10 19:04:07 +02:00 |
|
mrcheko
|
d41f27451b
|
appropriate camera vanity<>preview mode switch + hit recoils fix
|
2014-01-09 23:36:40 +02:00 |
|
scrawl
|
aa855e9524
|
Include some required Ogre headers explicitely
|
2014-01-09 20:56:24 +01:00 |
|
Marc Zinnschlag
|
85707b5e3e
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-09 09:35:54 +01:00 |
|
scrawl
|
6f9113fe88
|
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
|
2014-01-09 01:49:58 +01:00 |
|
Marc Zinnschlag
|
a7be755db0
|
Merge remote-tracking branch 'mrcheko/master'
|
2014-01-08 20:13:31 +01:00 |
|
scrawl
|
098f9712f1
|
Add getPlayerPtr() utility method. Reduces dependencies a lot.
|
2014-01-08 18:39:44 +01:00 |
|
mrcheko
|
46519062d3
|
hit recoils/knockdowns feature
|
2014-01-08 16:05:14 +02:00 |
|
scrawl
|
728365b48d
|
Remove an unused hook
|
2014-01-07 21:07:02 +01:00 |
|
scrawl
|
03b6334ceb
|
Get rid of a hack
|
2014-01-07 20:43:08 +01:00 |
|
mrcheko
|
2591ff2d5a
|
bug repairing
|
2014-01-06 22:00:01 +02:00 |
|
scrawl
|
c004fb778f
|
Get rid of underscore defines. They are reserved by the standard.
|
2014-01-05 18:22:29 +01:00 |
|
scrawl
|
634a53211c
|
Make sure materials are built before trying to determine their transparency
|
2014-01-04 22:56:06 +01:00 |
|
scrawl
|
c4e4a8fb57
|
Closes #1083: Fix werewolf change handling
|
2014-01-04 20:50:18 +01:00 |
|
mrcheko
|
7002412760
|
resolve conflict in character.cpp
|
2014-01-04 17:55:09 +02:00 |
|
Marc Zinnschlag
|
ee621245bb
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-03 15:59:06 +01:00 |
|
scrawl
|
623cdef69f
|
Code cleanup
|
2014-01-02 21:49:12 +01:00 |
|
Lukasz Gromanowski
|
b017a3be3e
|
Bug #1074: Inventory paperdoll obscures armour rating
Changed size of inventory paperdoll.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2014-01-02 20:20:57 +01:00 |
|
scrawl
|
0990ca4b75
|
Closes #1072: Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly
|
2014-01-02 15:58:00 +01:00 |
|
Marc Zinnschlag
|
a6e6411686
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-02 12:12:52 +01:00 |
|
scrawl
|
c6421276bd
|
Closes #841: Correct activation distance in third person mode
|
2014-01-01 23:59:17 +01:00 |
|
scrawl
|
5729672262
|
Show marked position on map. Implement Detect X magic effects.
|
2014-01-01 22:37:52 +01:00 |
|
mrcheko
|
09a0a69b04
|
more improvements
|
2014-01-01 21:40:31 +02:00 |
|
Marc Zinnschlag
|
e1355be47c
|
Merge remote-tracking branch 'lgro/valgrind_warnings'
|
2014-01-01 19:41:52 +01:00 |
|
Lukasz Gromanowski
|
2d4e06cd50
|
Updated comments about freeing format_ctx->pb->buffer.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2014-01-01 17:05:49 +01:00 |
|
scrawl
|
be1938ee90
|
Closes #805: Don't add entities that are supposed to be invisible to static geometry
|
2013-12-31 18:32:46 +01:00 |
|
scrawl
|
94cdc1efd2
|
Enable mipmap generator for 1.9+
|
2013-12-31 00:54:40 +01:00 |
|
Lukasz Gromanowski
|
cb04f43384
|
Fixes for "Conditional jump or move depends on uninitialised value(s)"
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-30 23:08:53 +01:00 |
|
Lukasz Gromanowski
|
5c5f87445b
|
Fixes for "Conditional jump or move depends on uninitialised value(s)"
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-30 21:47:06 +01:00 |
|
scrawl
|
596c9b80a9
|
Check if threads are joinable before joining (issue with boost 1.52)
|
2013-12-27 22:38:30 +01:00 |
|
scrawl
|
85ec80100c
|
Bug #1005: Hide torches/shields during spellcasting and hand-to-hand combat
|
2013-12-27 22:00:16 +01:00 |
|
scrawl
|
6400f23ab0
|
Use the material controller manager for effects with overridden texture
|
2013-12-27 14:54:36 +01:00 |
|
scrawl
|
d262d9e6b0
|
Bug #1054: Set render queue group for effects
|
2013-12-27 14:51:59 +01:00 |
|
scrawl
|
d09a86e208
|
Issue #1018: Don't allow view mode switching while performing an action
|
2013-12-27 00:36:06 +01:00 |
|
scrawl
|
5931fdcbde
|
Implement NiBillboardNode. Flags not handled yet.
|
2013-12-26 20:53:52 +01:00 |
|
scrawl
|
6d27ebabb6
|
Integrate AddGlow with material controllers
|
2013-12-26 20:53:45 +01:00 |
|
scrawl
|
eb5e4ecec2
|
Remove more unused code
|
2013-12-16 15:35:38 +01:00 |
|
scrawl
|
37a7ee8fcd
|
Set alpha value of character animations according to Invisibility / Chameleon effects.
|
2013-12-08 23:05:21 +01:00 |
|
scrawl
|
1624e0fd8a
|
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
|
2013-12-07 20:15:39 +01:00 |
|
scrawl
|
bb70deabb1
|
Add an incomplete implementation of SayAnimationValue (lip animation)
|
2013-12-07 14:15:45 +01:00 |
|
scrawl
|
8f4ffe4ddc
|
Fix new window size not being written to settings when manually resizing window
|
2013-12-03 15:55:31 +01:00 |
|
scrawl
|
ffc885853a
|
Fix bolt for magic effects that don't have one specified
|
2013-11-29 10:39:37 +01:00 |
|
scrawl
|
97fadb24ca
|
Update the Ptr in mObjects in Objects::updateObjectCell
|
2013-11-27 18:49:04 +01:00 |
|
scrawl
|
d2ed77f3f2
|
Fix shields being visible during spellcasting
|
2013-11-23 20:24:52 +01:00 |
|
Marc Zinnschlag
|
d8c40562ae
|
Merge remote-tracking branch 'scrawl/light'
|
2013-11-23 12:44:42 +01:00 |
|
scrawl
|
a1fe07181c
|
Fix rotation offset of some lights (bug 955)
|
2013-11-23 05:55:03 +01:00 |
|
scrawl
|
0e254aa7c7
|
Fix startNewGame assigning an already freed CellStore to the player Ptr supplied to WindowManager. Fixes a crash when equipping lights after starting a new game (bug 967). Side note: The inventory preview's Ptr being assigned a cell at all doesn't make sense, as that is used to determine the light setting which should be the same no matter which cell you're in.
|
2013-11-23 03:25:55 +01:00 |
|