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 |
|
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 |
|
Marc Zinnschlag
|
b38bfe1f21
|
removed a redundant function for listing global variables
|
2013-12-10 15:22:38 +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 |
|
scrawl
|
0dc2e829dd
|
Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.
|
2013-11-17 23:31:08 +01:00 |
|
Marc Zinnschlag
|
ec5b2e9a7e
|
added running flag; moved new game code to MWState
|
2013-11-16 12:22:28 +01:00 |
|
Marc Zinnschlag
|
f19973450f
|
moved exit game flag from Environment to StateManager
|
2013-11-16 11:07:23 +01:00 |
|
Marc Zinnschlag
|
79b7fa258b
|
added new mwstate subsystem
|
2013-11-16 10:31:46 +01:00 |
|
scrawl
|
f7befa3e54
|
Remove a no longer required method
|
2013-11-15 02:20:04 +01:00 |
|
scrawl
|
9b0e82a37f
|
Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)
|
2013-11-13 14:02:15 +01:00 |
|
Emanuel Guevel
|
467bd91651
|
Update actor model on inventory change
|
2013-11-10 02:45:17 +01:00 |
|
Emanuel Guevel
|
10abb9d297
|
Call ContainerStore::remove() to remove items from inventory
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).
Enchanting an item now unequips it.
|
2013-11-10 02:45:16 +01:00 |
|
scrawl
|
cbe96a2170
|
Refactor ActiveSpells to track range type. Added basic self range magic.
|
2013-11-09 07:51:46 +01:00 |
|
gus
|
d587f3c946
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/docs/vmformat.txt
|
2013-10-31 09:51:17 +01:00 |
|
scrawl
|
4f35fd8184
|
Removed a workaround from Renderer, some cleanup
|
2013-10-30 13:05:28 +01:00 |
|
Marc Zinnschlag
|
87cd5d4267
|
Merge remote-tracking branch 'potatoesmaster/DisableLevitation'
|
2013-10-12 13:31:06 +02:00 |
|
Emanuel Guevel
|
4265dddc40
|
Add MWWorld::isSlowFalling(Ptr)
|
2013-10-02 23:34:25 +02:00 |
|