Marc Zinnschlag
|
1f6ed584c2
|
Merge remote-tracking branch 'digmaster/master'
Conflicts:
apps/openmw/mwstate/statemanagerimp.cpp
|
2014-04-25 08:39:40 +02:00 |
|
Thomas
|
f3272c941f
|
Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
|
2014-04-24 22:47:45 -04:00 |
|
Marc Zinnschlag
|
760c8c7214
|
removed a redundant include
|
2014-04-24 09:56:51 +02:00 |
|
Thomas
|
5b681e2199
|
Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait.
|
2014-04-24 03:14:47 -04:00 |
|
Thomas
|
05b21c92af
|
Moved quick save into statemanager class. Kept loader as is as it's rather specalized.
|
2014-04-24 03:06:36 -04:00 |
|
Thomas
|
a598060071
|
Added autosave on rest, as well as an option in the settings menu
|
2014-04-23 23:12:30 -04:00 |
|
Thomas
|
682c395488
|
Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts)
|
2014-04-23 21:39:25 -04:00 |
|
Thomas
|
49620968b9
|
Disallowed quicksave/load in character creation
|
2014-04-23 21:21:11 -04:00 |
|
Thomas
|
e873135da7
|
Missed a debug message
|
2014-04-23 21:04:52 -04:00 |
|
Thomas
|
f90810223a
|
Added quicksave and quickload
|
2014-04-23 21:02:09 -04:00 |
|
Thomas Luppi
|
d6f1f129eb
|
Forgot to capitalize something. whooooops
dat y do
|
2014-04-20 00:39:50 -04:00 |
|
Thomas Luppi
|
95ef874205
|
Gets default keybindings from scancode, not keyvalue.
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
|
2014-04-20 00:34:58 -04:00 |
|
scrawl
|
f2cd37edd0
|
Play company logo movie
|
2014-03-27 19:51:48 +01:00 |
|
scrawl
|
5906d795c0
|
Refactored video player (now a MyGUI widget)
|
2014-03-27 19:10:15 +01:00 |
|
scrawl
|
6eaa7553f8
|
Fixes #1181: Enable controls when loading a savegame
|
2014-03-09 03:34:49 +01:00 |
|
scrawl
|
12de0afb03
|
Feature #50: Spawn projectiles
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
|
2014-03-08 01:31:27 +01:00 |
|
Marc Zinnschlag
|
f9d2fde783
|
Merge branch 'openmw-29'
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
|
2014-03-04 09:34:38 +01:00 |
|
Marc Zinnschlag
|
367919200f
|
moved CellRefList into a separate file
|
2014-02-23 20:11:05 +01:00 |
|
scrawl
|
439018e706
|
Get rid of useless return values
|
2014-02-19 11:23:03 +01:00 |
|
Emanuel Guevel
|
3d8ca02479
|
Fix breaking of enchanted items casting
|
2014-02-15 17:39:57 +01:00 |
|
Emanuel Guevel
|
a3eea4f6b6
|
Do not allow spellcasting stance without spell selected
|
2014-02-11 16:34:51 +01:00 |
|
scrawl
|
4a26909172
|
Fixes #1159: Don't allow quick keys menu in chargen
|
2014-02-05 12:15:49 +01:00 |
|
scrawl
|
1deb0a7cdf
|
Savegame dialog: Set key focus to editbox
|
2014-02-01 18:42:01 +01:00 |
|
Marc Zinnschlag
|
1b5301eec0
|
Merge branch 'savedgame'
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
|
2014-02-01 18:16:32 +01:00 |
|
scrawl
|
39d86a9468
|
Improvements to smooth NPC steering
|
2014-01-31 04:43:29 +01:00 |
|
scrawl
|
03cf383be7
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
|
2014-01-24 18:28:35 +01:00 |
|
mrcheko
|
87e83a92f8
|
refactoring of setting an attack type
|
2014-01-23 23:14:20 +02:00 |
|
scrawl
|
d01f89b153
|
Rewrite some awful code
|
2014-01-11 00:24:21 +01:00 |
|
scrawl
|
d7f69205f6
|
Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes
|
2014-01-09 00:06:24 +01:00 |
|
scrawl
|
098f9712f1
|
Add getPlayerPtr() utility method. Reduces dependencies a lot.
|
2014-01-08 18:39:44 +01:00 |
|
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
|
c004fb778f
|
Get rid of underscore defines. They are reserved by the standard.
|
2014-01-05 18:22:29 +01:00 |
|
scrawl
|
1b96c5d266
|
Console improvements: Show scrollbar, allow copying text from the history
|
2014-01-04 05:13:53 +01:00 |
|
scrawl
|
09d491d1ba
|
Move a piece of functionality to its appropriate place
|
2014-01-04 01:13:19 +01:00 |
|
scrawl
|
c0fbcf413f
|
Use the playermagic and playerfighting control switches
|
2014-01-03 22:44:35 +01:00 |
|
scrawl
|
899214a906
|
Use fVanityDelay
|
2014-01-02 00:13:23 +01:00 |
|
scrawl
|
04f9f7af56
|
Closes #990: Add option to unlock mouse cursor when in any menu
|
2013-12-29 00:58:48 +01:00 |
|
scrawl
|
d09a86e208
|
Issue #1018: Don't allow view mode switching while performing an action
|
2013-12-27 00:36:06 +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
|
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 |
|
scrawl
|
bcf61331ab
|
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
|
2013-11-29 20:06:54 +01:00 |
|
scrawl
|
7f735c2c4c
|
Release and show the cursor when focus lost
|
2013-11-20 16:07:14 +01:00 |
|
Marc Zinnschlag
|
a19242b4ec
|
fixed expression in if statement
|
2013-11-16 19:31:35 +01:00 |
|
vorenon
|
b2d2a3dd17
|
Closing message boxes with numpad enter
|
2013-11-16 19:15:47 +00:00 |
|
Marc Zinnschlag
|
f19973450f
|
moved exit game flag from Environment to StateManager
|
2013-11-16 11:07:23 +01:00 |
|
scrawl
|
d619d0fa25
|
Don't grab the cursor while the console is opened
|
2013-11-15 03:39:25 +01:00 |
|
scrawl
|
c3d9bc31bb
|
Fix exiting OpenMW via the window close button (regression)
|
2013-11-05 03:02:28 +01:00 |
|
scrawl
|
4f35fd8184
|
Removed a workaround from Renderer, some cleanup
|
2013-10-30 13:05:28 +01:00 |
|
scrawl
|
3a3f2a37c8
|
Add cut, copy & paste of text
|
2013-10-17 12:47:49 +02:00 |
|