Marc Zinnschlag
|
805b81bf6e
|
Issue #314: added skillUsageSucceeded function to Class
|
2012-07-13 09:03:17 +02:00 |
|
Marc Zinnschlag
|
7a2d613043
|
Issue #314: extended Class::apply function to cover the actor
|
2012-07-13 08:50:46 +02:00 |
|
Marc Zinnschlag
|
ec9ebe6b58
|
Merge branch 'skillgain' into potions
Conflicts:
apps/openmw/mwmechanics/activespells.cpp
|
2012-07-10 14:08:30 +02:00 |
|
Marc Zinnschlag
|
fe86ce5a2c
|
DrawState workaround
|
2012-07-07 20:53:19 +02:00 |
|
Marc Zinnschlag
|
6277e39216
|
Merge branch 'master' into skillgain
|
2012-07-07 20:27:56 +02:00 |
|
Alexander "Ace" Olofsson
|
113457d934
|
Fixed some windows issues and got rid of a few tiny warnings while at it.
|
2012-07-07 01:14:18 +02:00 |
|
Marc Zinnschlag
|
10723a149b
|
Issue #324: Change a forward declartion to avoid potential problems with pesky MSVC
|
2012-07-06 18:25:16 +02:00 |
|
Marc Zinnschlag
|
d30ba14a17
|
Issue #324: Finished turning NpcStats into a proper class
|
2012-07-06 18:23:48 +02:00 |
|
Marc Zinnschlag
|
771863e73b
|
Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue
|
2012-07-06 15:50:26 +02:00 |
|
Marc Zinnschlag
|
c85aaafac2
|
more include cleanup (most removing Ogre.h)
|
2012-07-03 15:32:38 +02:00 |
|
Marc Zinnschlag
|
87667ab57e
|
Issue #107: Ptr related include cleanup
|
2012-07-03 13:55:53 +02:00 |
|
Marc Zinnschlag
|
5a7b95bf7a
|
Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp
|
2012-07-03 13:15:20 +02:00 |
|
Marc Zinnschlag
|
4c39fefd1e
|
Issue #107: World is accessed only through the interface class from now on; some include cleanup
|
2012-07-03 12:30:50 +02:00 |
|
Marc Zinnschlag
|
035c1c4b6e
|
added World interface class; cleanup of World interface
|
2012-07-03 01:06:38 +02:00 |
|
Marc Zinnschlag
|
7fcd41c69d
|
Issue #107: Detemplateised CellStore; some include cleanup
|
2012-06-29 18:54:23 +02:00 |
|
Marc Zinnschlag
|
76174098c7
|
Issue #107: CellStore moved from ESMS to MWWorld
|
2012-06-29 16:48:50 +02:00 |
|
Marc Zinnschlag
|
83c3972a89
|
Issue #314: added return value to addSpell function
|
2012-06-24 16:23:43 +02:00 |
|
scrawl
|
63ce143a04
|
fix triangle / batch counts with compositors
|
2012-06-22 12:56:04 +02:00 |
|
Marc Zinnschlag
|
89ac0fa232
|
Issue #312: Implemented ID-search caching to speed up some badly written scripts
|
2012-06-21 11:43:18 +02:00 |
|
Marc Zinnschlag
|
1f0efa9f7d
|
Merge remote branch 'scrawl/guifixes'
|
2012-06-19 19:06:18 +02:00 |
|
scrawl
|
15e959868c
|
make some of the gui mode changes a bit safer
|
2012-06-19 17:07:00 +02:00 |
|
Marc Zinnschlag
|
590dfe8d63
|
fixed the container fill problem on cell load
|
2012-06-19 16:42:10 +02:00 |
|
scrawl
|
c85c794c86
|
fixed some cppcheck issues
|
2012-06-06 20:29:30 +02:00 |
|
scrawl
|
0ba0b2122e
|
set the implicit object for script excution by clicking on it
|
2012-06-02 12:25:24 +02:00 |
|
scrawl
|
36d26e0681
|
set the camera orientation after using teleport doors
|
2012-05-30 15:52:39 +02:00 |
|
Marc Zinnschlag
|
2bbbff2b75
|
Merge remote branch 'scrawl/spellwindow'
|
2012-05-30 10:22:56 +02:00 |
|
scrawl
|
2c90654401
|
fix a typo that caused a crash when trying to disable an already disabled object
|
2012-05-30 09:21:41 +02:00 |
|
scrawl
|
30461438f6
|
still left: spell success formula
|
2012-05-29 12:35:03 +02:00 |
|
scrawl
|
8c7cb6909d
|
addition to c7010623fb419f928fb369b5e93cbcfe39c0e0c8 : apparently talking _is_ allowed during the starting sequence, it is only disabled via scripts for certain actors
|
2012-05-29 01:59:16 +02:00 |
|
scrawl
|
738e107b52
|
Merge branch 'master' into next
|
2012-05-26 05:31:32 +02:00 |
|
scrawl
|
c7010623fb
|
Issue #294: disallowed inventory prevents Talk, Open and Take actions
|
2012-05-25 18:45:17 +02:00 |
|
Marc Zinnschlag
|
173820d29b
|
Merge branch 'enable'
|
2012-05-25 18:19:12 +02:00 |
|
Marc Zinnschlag
|
6fe53aa320
|
Issue #277: containers in cells were not filled up on cell load when the cell was preloaded before
|
2012-05-25 17:55:00 +02:00 |
|
Marc Zinnschlag
|
0131c53005
|
Issue #176: removed enable/disable functions from MWWorld::Class
|
2012-05-25 17:28:27 +02:00 |
|
scrawl
|
51b8a76a68
|
merged by branches together, starting with alchemy window
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
|
2012-05-24 15:57:23 +02:00 |
|
Marc Zinnschlag
|
684208dfc9
|
Issue #176: when deleting objects, don't go through disable to remove actors from the mechanics manager
|
2012-05-24 13:26:07 +02:00 |
|
scrawl
|
7ebbc099b3
|
allow stacking gui modes
|
2012-05-23 12:23:35 +02:00 |
|
scrawl
|
656a8f1be9
|
working menu transparency slider
|
2012-05-23 01:32:36 +02:00 |
|
Marc Zinnschlag
|
7938566004
|
Merge remote branch 'scrawl/graphics'
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
2012-05-21 11:24:36 +02:00 |
|
Marc Zinnschlag
|
3e85151c9d
|
Merge remote branch 'scrawl/inventoryGUI'
Conflicts:
apps/openmw/CMakeLists.txt
|
2012-05-21 10:13:27 +02:00 |
|
scrawl
|
8f2c8bbea4
|
Merge branch 'master' into graphics
|
2012-05-21 09:50:46 +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
|
74ae3605e0
|
Issue #256: added getTimeStamp function to World
|
2012-05-19 09:31:45 +02:00 |
|
scrawl
|
9ca579ba63
|
slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly
|
2012-05-19 00:36:01 +02:00 |
|
scrawl
|
8a0c859c16
|
Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI
|
2012-05-18 22:27:48 +02:00 |
|
Marc Zinnschlag
|
498530fad7
|
container iterator fix
|
2012-05-18 22:24:19 +02:00 |
|
scrawl
|
c004f5d570
|
adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications
|
2012-05-18 22:06:25 +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 |
|