scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
32ff3b530c
Change all instances of skill/attribute values to use an appropriate typedef.
2014-01-03 01:59:15 +01:00
scrawl
5729672262
Show marked position on map. Implement Detect X magic effects.
2014-01-01 22:37:52 +01:00
scrawl
ea3b88951a
Implement divine/almsivi intervention magic effects
2014-01-01 02:22:11 +01:00
scrawl
3604b9d171
Closes #566 : In interior cells, update global map position marker using the first exterior teleport door
2013-12-31 18:35:46 +01:00
scrawl
79a440e94a
Many additions to 900bc06d2c:
...
- Fix indentation
- Consider any kind of light, not just torch_infinite_time
- Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
- Remove redundant code and don't add additional lights to the inventory
- World::isDark returns false for interiors which are unaffected by weather
2013-12-30 17:57:41 +01:00
Marc Zinnschlag
6de39a7329
Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day'
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
2013-12-29 15:00:31 +01:00
scrawl
a3017e16d4
Don't allow changing the spell that is being cast mid-animation
2013-12-26 22:32:39 +01:00
scrawl
5054d8e6c1
Bug #1055 : Check power use and mana before starting cast animation
2013-12-26 22:06:13 +01:00
scrawl
6d27ebabb6
Integrate AddGlow with material controllers
2013-12-26 20:53:45 +01:00
Marc Zinnschlag
18e7e83585
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-20 13:13:06 +01:00
mrcheko
3816a09c6f
bug 428 ask to load recent saved game
2013-12-19 22:08:34 +02:00
Marc Zinnschlag
09fadd446b
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-17 19:33:32 +01:00
scrawl
eb5e4ecec2
Remove more unused code
2013-12-16 15:35:38 +01:00
mrcheko
f50ff0b1c4
reworked http://bugs.openmw.org/issues/428
2013-12-16 15:40:47 +02:00
mrcheko
fd9f8c34f6
bug fix http://bugs.openmw.org/issues/428
2013-12-15 18:50:25 +02:00
Marc Zinnschlag
74793c1c2f
globals script cleanup; fixed potential case folding bug
2013-12-12 13:15:38 +01:00
Lukasz Gromanowski
91a4d9a2eb
Fixes #845 : NPCs hold torches during the day
...
Added method in WeatherManger and World which returns true if it is night.
This method is used later in character controller to show torches
(or other sources of light) at night and hide them at day.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-10 23:48:49 +01:00
Marc Zinnschlag
b38bfe1f21
removed a redundant function for listing global variables
2013-12-10 15:22:38 +01:00
scrawl
0bc3a13c0f
Break invisibility on Use or Activate
2013-12-08 23:36:37 +01:00
Marc Zinnschlag
1c13a9037a
save and load dynamic records
2013-12-07 13:17:28 +01:00
Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
2013-12-07 12:27:06 +01:00
Marc Zinnschlag
e818d43bc3
removed an outdated typedef and some dead code
2013-12-05 13:21:26 +01:00
Marc Zinnschlag
537b2efe8e
first round of cleaning up world cleanup
2013-12-05 12:49:25 +01:00
Marc Zinnschlag
2293b92efe
storing and loading the journal
2013-12-03 14:28:46 +01:00
scrawl
076cc9230b
First try at handling target magic
2013-11-28 17:31:17 +01:00
Marc Zinnschlag
35e8e23037
keep track of total play time per character
2013-11-28 09:33:50 +01:00
Marc Zinnschlag
7e2819c62e
store year in saved game profile
2013-11-28 09:27:10 +01:00
Marc Zinnschlag
71436b1160
changed interface for global variable access
2013-11-28 09:10:38 +01:00
Marc Zinnschlag
99ea63dc4a
factored out code for generating month names
2013-11-26 12:47:30 +01:00
Marc Zinnschlag
bc6fe682c9
replaced getCurrentCellName function with a more general getCellName function
2013-11-26 11:39:58 +01:00
Marc Zinnschlag
616e3aa32f
store content file list in saved games and reject saved games not matching the current game
2013-11-25 13:00:05 +01:00
Marc Zinnschlag
e3670cff8a
improved character selection logic
2013-11-24 16:58:41 +01:00
Marc Zinnschlag
67cd0887e6
added description field to saved game record; make use of description in GUI
2013-11-24 15:19:56 +01:00
Marc Zinnschlag
7efac4c9a5
fixed handling of characters without a valid slot
2013-11-24 15:05:00 +01:00
scrawl
2e87cbc231
Add basic functionality to SaveGameDialog
2013-11-21 20:34:34 +01:00
scrawl
800a2845b0
Add Bound & Summon effects (will need some adjustments later)
2013-11-21 17:14:23 +01:00
Marc Zinnschlag
b5f99522c7
added a few comments
2013-11-21 12:29:24 +01:00
Marc Zinnschlag
c165894869
load saved game record
2013-11-21 12:24:24 +01:00
Marc Zinnschlag
cbbdf390ad
added function for inspection of saved characters and character slots
2013-11-21 11:10:18 +01:00
Marc Zinnschlag
e938c5a0ee
changed character creation logic (create on save instead of on new game)
2013-11-21 10:20:50 +01:00
scrawl
7f735c2c4c
Release and show the cursor when focus lost
2013-11-20 16:07:14 +01:00
Marc Zinnschlag
8190fdb16c
Merge remote-tracking branch 'scrawl/master'
2013-11-19 16:56:18 +01:00
scrawl
e8dcd74741
Recharge enchanted items in player's inventory over time
2013-11-19 16:42:24 +01:00
Marc Zinnschlag
5e64888227
added basic save slot management and connected main menu save to save function (bypassing the save GUI for now)
2013-11-19 15:38:26 +01:00
Marc Zinnschlag
11e254aac8
Merge remote-tracking branch 'gus/AICombat'
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2013-11-19 09:10:48 +01:00
scrawl
cab535dd69
Implement magic item recharging via soulgem use
2013-11-19 06:48:47 +01:00
gus
dff3cf162d
ToggleAI script instruction
2013-11-18 23:03:44 +01:00
Marc Zinnschlag
f45cff8aff
flag game as ended when player dies
2013-11-18 15:38:08 +01:00
Marc Zinnschlag
82c8495338
removed boolean running flag with state enum
2013-11-18 15:15:47 +01:00
