gugus
|
ca9224ed7f
|
starting scale function
|
2012-05-21 10:58:04 +02:00 |
|
Marc Zinnschlag
|
420cd53be0
|
Merge branch 'effects'
|
2012-05-19 17:41:47 +02:00 |
|
Marc Zinnschlag
|
be46f5a59c
|
various fixes
|
2012-05-19 17:39:24 +02:00 |
|
Marc Zinnschlag
|
0dc412d44c
|
Merge remote branch 'scrawl/refid_case'
|
2012-05-19 15:07:12 +02:00 |
|
Marc Zinnschlag
|
9f1919a230
|
Issue #256: added active spell management (completely untested)
|
2012-05-19 15:01:07 +02:00 |
|
Marc Zinnschlag
|
635a89c35c
|
Issue #256: RNG fix
|
2012-05-19 14:43:02 +02:00 |
|
scrawl
|
ee884634b9
|
fixed item refID handling in the dialogue manager and container script extensions.
|
2012-05-19 13:19:26 +02:00 |
|
Marc Zinnschlag
|
74ae3605e0
|
Issue #256: added getTimeStamp function to World
|
2012-05-19 09:31:45 +02:00 |
|
Marc Zinnschlag
|
a4343bfa18
|
Issue #256: added TimeStamp class
|
2012-05-18 22:04:22 +02:00 |
|
Marc Zinnschlag
|
124ea77612
|
Issue #256: consider equipped items when calculating magic effects
|
2012-05-18 15:48:55 +02:00 |
|
Marc Zinnschlag
|
372efaafd7
|
Issue #256: changed implementation of MagicEffects::operator+=
|
2012-05-18 15:27:41 +02:00 |
|
Marc Zinnschlag
|
40c58c1bb7
|
Issue #256: fixed a capitalisation mistake
|
2012-05-18 15:26:08 +02:00 |
|
Marc Zinnschlag
|
5236bcb557
|
Issue #256: added operator+= for MagicEffects
|
2012-05-18 15:12:11 +02:00 |
|
Marc Zinnschlag
|
79055e281d
|
Issue #256: Force update after building the player character
|
2012-05-18 13:54:07 +02:00 |
|
Marc Zinnschlag
|
e1997b7f04
|
Issue #256: added MagicEffects::add overload for EffectLists
|
2012-05-18 13:17:35 +02:00 |
|
scrawl
|
52e5e14654
|
use GMST sDefaultCellname for the map window when cell has no region or name.
|
2012-05-17 23:42:09 +02:00 |
|
scrawl
|
c9aa0ca1f4
|
don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region
|
2012-05-17 19:54:09 +02:00 |
|
scrawl
|
375c198ebd
|
WeatherManager: fix for cells that have no region.
|
2012-05-17 18:21:05 +02:00 |
|
scrawl
|
0afda15ce9
|
fix for cells that have no region.
|
2012-05-17 18:14:33 +02:00 |
|
scrawl
|
ae77e7b0d8
|
don't try to retrieve land data from non-predefined cells.
|
2012-05-17 18:11:34 +02:00 |
|
Marc Zinnschlag
|
6b74fec8ed
|
don't do a half finished cell change, when trying to switch to an interior cell that does not exist
|
2012-05-17 17:13:41 +02:00 |
|
Marc Zinnschlag
|
e56ff9283d
|
Issue #256: moved magic effects update from MechanicsManager to Actors
|
2012-05-17 13:21:49 +02:00 |
|
Marc Zinnschlag
|
1fddbf9a40
|
Issue #256: moved dynamic stats update from MechanicsManager to Actors
|
2012-05-17 13:15:31 +02:00 |
|
Marc Zinnschlag
|
fdfddc8be7
|
some todo comment cleanup
|
2012-05-15 21:34:32 +02:00 |
|
Marc Zinnschlag
|
7e00fea18b
|
added getEncumbrance function
|
2012-05-15 21:34:00 +02:00 |
|
Marc Zinnschlag
|
c6493fb133
|
added getCapacity function
|
2012-05-15 21:17:00 +02:00 |
|
Marc Zinnschlag
|
2bf12a4839
|
Merge remote branch 'scrawl/itemstacking'
|
2012-05-13 17:22:18 +02:00 |
|
scrawl
|
82b9f835b1
|
make sure iterator is not end() before trying to get the equipped item
|
2012-05-13 16:54:18 +02:00 |
|
scrawl
|
8c458fc5ce
|
Merge branch 'master' into gui
|
2012-05-13 16:20:35 +02:00 |
|
Marc Zinnschlag
|
73d19f9185
|
Merge remote branch 'scrawl/itemstacking'
|
2012-05-13 16:06:30 +02:00 |
|
scrawl
|
d341d2113c
|
fixed some issues
|
2012-05-13 14:58:38 +02:00 |
|
scrawl
|
ee7e482cba
|
implemented un-stacking
|
2012-05-13 11:52:17 +02:00 |
|
scrawl
|
16522ddc59
|
InventoryStore re-stacking unequipped items
|
2012-05-12 23:09:03 +02:00 |
|
scrawl
|
9f2595183b
|
type
|
2012-05-12 16:30:27 +02:00 |
|
scrawl
|
5b0251b09f
|
item stacking
|
2012-05-12 16:17:03 +02:00 |
|
scrawl
|
83e434e2e9
|
small fix
|
2012-05-11 09:35:18 +02:00 |
|
scrawl
|
1f1edea6af
|
make it possible to use scroll wheel when mouse is over a skill in the stats window; set the correct track size for the scrollbar
|
2012-05-11 08:45:03 +02:00 |
|
scrawl
|
65ccfba191
|
resize both the left and the right pane of the stats window
|
2012-05-11 08:15:22 +02:00 |
|
scrawl
|
c4aae96d94
|
implemented "goodbye" script function that force-cancels dialogue
|
2012-05-11 07:18:41 +02:00 |
|
Marc Zinnschlag
|
37095b62c6
|
removed another include
|
2012-05-10 12:51:40 +02:00 |
|
Marc Zinnschlag
|
e906614170
|
Merge remote branch 'scrawl/gui'
|
2012-05-10 12:46:11 +02:00 |
|
scrawl
|
3d9e89c837
|
removed unnecessary include
|
2012-05-10 12:44:01 +02:00 |
|
Marc Zinnschlag
|
bee03b5180
|
Merge remote branch 'scrawl/gui'
|
2012-05-10 12:08:49 +02:00 |
|
scrawl
|
4ce50c503b
|
a few tweaks
|
2012-05-10 11:29:28 +02:00 |
|
scrawl
|
de995e3a69
|
adjust topic list on window resize
|
2012-05-10 11:19:22 +02:00 |
|
scrawl
|
8a9e05a96b
|
display text on the book window
|
2012-05-10 11:03:27 +02:00 |
|
scrawl
|
d69501b061
|
change daedric font to .zip resource
|
2012-05-09 02:16:10 +02:00 |
|
scrawl
|
e5e8663bb4
|
parse <div> <font> and <p>
|
2012-05-09 02:11:44 +02:00 |
|
scrawl
|
8e7ab09a25
|
scroll window image tags working
|
2012-05-09 01:34:32 +02:00 |
|
scrawl
|
cd351ba3af
|
simple scroll text parsing (tags are ignored until now)
|
2012-05-08 00:39:52 +02:00 |
|