mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 17:19:56 +00:00
Code Issues Releases Wiki Activity
10517 commits 38 branches 54 tags 122 MiB
Commit graph

531 commits

Author SHA1 Message Date
scrawl
a4a9794417 Savegame: store fog of war (Closes #1177) 2014-05-11 02:07:58 +02:00
Marc Zinnschlag
9a1b5dc1c6 a bit of cleanup 2014-04-29 15:32:00 +02:00
Marc Zinnschlag
f6a876bc3d added actor ID 2014-04-29 15:27:49 +02:00
Marc Zinnschlag
8fea2cfa2a Merge remote-tracking branch 'mrcheko/master' 2014-04-29 10:03:29 +02:00
scrawl
518a32c19d Fixes #1195: Make NPCs equip torches in interiors under certain conditions 2014-04-28 18:33:42 +02:00
scrawl
27a05027f4 Fixes #1172: Added basic loading/saving progress bar 
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
 2014-04-28 11:29:57 +02:00
mrcheko
6a3dddfb9a merge master 2014-04-27 13:49:31 +04:00
scrawl
04964595ef Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame 2014-04-26 16:44:20 +02:00
Thomas
ee581f593b Fixed issue which may occur if there's no evidence chest nearby 2014-04-23 13:20:43 -04:00
Thomas
61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 2014-04-23 10:00:18 -04:00
Thomas
6022ffbd1f Evidence chest now locks when new evidence is added to it 2014-04-23 05:54:18 -04:00
mrcheko
f811abb752 pathgrid shortcutting extended 2014-04-20 20:35:07 +04:00
Marc Zinnschlag
86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2014-04-15 11:31:48 +02:00
cc9cii
966ed46870 Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status. 2014-04-13 18:34:08 +10:00
cc9cii
3e6e325e5b Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr). 2014-04-13 14:53:36 +10:00
Emanuel Guevel
09bd0324c9 Fail properly when a content file is not found 2014-04-08 20:19:09 +02:00
Jeffrey Haines
b1abef7a38 Cleaned up code 2014-04-03 01:07:56 -04:00
Jeffrey Haines
58b135a2be Crime is now checked every frame call 2014-04-03 00:50:09 -04:00
Jeffrey Haines
510f2d10ac Replaces broken code with todo 2014-04-02 14:20:33 -04:00
Jeffrey Haines
6f1211dd8d Moved mWitnesses into Player. resetCrime for paying fine. 2014-04-02 12:23:38 -04:00
Jeffrey Haines
7c0b51fb7e Ai pursue now controls guards pursuit of crimes 
Should extend AiActivate in the future
 2014-04-02 00:18:22 -04:00
Jeffrey Haines
50dac98a2b Feature 1154 & 73: Crime and NPC reactions 2014-04-01 20:24:25 -04:00
Marc Zinnschlag
2c2106205d Merge remote-tracking branch 'scrawl/master' 2014-03-28 09:56:35 +01:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01:00
slothlife
1acd1bd913 Feature #1173: Saved Game: include weather state 
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
 2014-03-20 01:25:52 -05:00
cc9cii
43757efdc4 Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however. 2014-03-16 08:09:14 +11:00
Marc Zinnschlag
7bc97fb8b8 reworked code for player positioning on startup and new game 2014-03-13 13:19:32 +01:00
scrawl
072dc6d438 Feature #50: Implement marksman mechanics. 2014-03-08 06:03:45 +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
cc9cii
f36bea03ab Bug #1189 fix by scrawl 2014-03-07 19:36:44 +11:00
Marc Zinnschlag
83ded18af0 encapsulated reference collections 2014-02-23 21:21:27 +01:00
Marc Zinnschlag
b72c1c2c58 encapsulated water level 2014-02-23 17:34:18 +01:00
Marc Zinnschlag
7693f712bc started making CellStore into a proper class; encapsulated mCell member 2014-02-21 11:35:46 +01:00
Emanuel Guevel
7c981587fc When searching object by id, search in active cells before searching in the player's inventory 2014-02-13 22:58:12 +01:00
Emanuel Guevel
e597328b6b Make enable/disable a no-op for items in containers 2014-02-13 20:24:27 +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
a8a09762ce Don't crash when deleting or disabling a moving door 2014-01-29 15:37:26 +01:00
Marc Zinnschlag
29c3a288e3 load and save of reference in cells (without CustomData state) 2014-01-27 13:27:42 +01:00
scrawl
bdb03926c2 Fix crash when loading another game after dying 2014-01-25 16:13:45 +01:00
scrawl
f09328ca84 Clear global map overlay when starting/loading a game 2014-01-25 13:34:56 +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
scrawl
295aed3533 Implement savegame screenshots 2014-01-24 17:49:16 +01:00
scrawl
ac4c904e62 Fix projectile bug 2014-01-24 13:22:30 +01:00
Marc Zinnschlag
22cb4784b5 store cell state in saved game files (no references yet) 2014-01-23 11:29:40 +01:00
Marc Zinnschlag
9ebe66e693 improved cleanup; failed loads will now drop back into the main menu instead of crashing 2014-01-21 14:50:58 +01:00
scrawl
851a7d5014 Feature #957: Handle area effects for "on touch" range 2014-01-21 12:30:15 +01:00
scrawl
42284603f7 Properly handle on target effects with mArea=0 2014-01-20 13:44:38 +01:00
scrawl
205e8aa4e9 Feature #957: Implement area magic 2014-01-20 13:11:29 +01:00
scrawl
ba5300b071 Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted. 2014-01-20 12:05:13 +01:00
scrawl
5dd3cfa09a Loop projectile sounds 2014-01-20 11:50:52 +01:00
scrawl
1a00f26390 Bug #1126: Golden saints and many other creatures only have "Bip01 Head" 2014-01-19 14:33:41 +01:00
scrawl
589fbbd871 Issue #777: Create InventoryStore for creatures with weapons/shields 2014-01-19 11:43:23 +01:00
Marc Zinnschlag
6584a01d01 reset reference to player NPC record during cleanup 2014-01-18 14:53:25 +01:00
scrawl
228254c890 Handle creature attack animations in character controller 2014-01-17 16:31:27 +01:00
scrawl
805843d7ff Closes #1086: Implement blood effects 2014-01-17 11:27:13 +01:00
Marc Zinnschlag
c300cd9375 loading/saving of some player state (cell/coordinates and some other bits) 2014-01-16 12:03:23 +01:00
scrawl
52b9ebff9d Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell. 2014-01-14 07:42:03 +01:00
scrawl
9de3abcb5f Closes #1105: Do not reduce magicka if unable to cast 2014-01-14 03:34:30 +01:00
Marc Zinnschlag
5ea25dc269 player state cleanup 2014-01-11 15:34:32 +01:00
scrawl
a2ba0dde31 Implemented GoToJail 2014-01-11 06:47:58 +01:00
scrawl
9127839cc1 Add a searchPtr method as required for getting an owner, which may already be dead and disposed of. 2014-01-11 03:33:17 +01:00
scrawl
bf6d302fba Confiscate stolen items when caught 2014-01-11 03:29:41 +01:00
scrawl
e9f63270d9 Speed fix for "on target" spells 2014-01-10 22:51:42 +01:00
scrawl
6f9113fe88 Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions 2014-01-09 01:49:58 +01:00
scrawl
9bf7bf529c Implement crime-related dialogue globals as they are described in MSFD 2014-01-09 00:40:25 +01:00
scrawl
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +01:00
scrawl
728365b48d Remove an unused hook 2014-01-07 21:07:02 +01:00
scrawl
29c823b9d4 Implement awareness check function. Use this for combat AI and GetDetected instruction. 2014-01-07 00:51:09 +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
ce013315ba Nothing to see here, move along. 
Fine... it's flying cliff racers. But did you really want to know?
 2014-01-05 16:09:06 +01:00
scrawl
c4e4a8fb57 Closes #1083: Fix werewolf change handling 2014-01-04 20:50:18 +01:00
scrawl
710a1e2f37 Smash case for manual reference IDs as well, consistent with references in data files 2014-01-04 04:39:06 +01:00
scrawl
b42240be6d Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences. 2014-01-03 03:48:43 +01:00
scrawl
623cdef69f Code cleanup 2014-01-02 21:49:12 +01:00
scrawl
12de351feb Check if levitation is enabled before levitating 2014-01-02 16:38:23 +01:00
scrawl
993edf0384 Bug #1063: Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc. 2014-01-02 02:27:48 +01:00
scrawl
c6421276bd Closes #841: Correct activation distance in third person mode 2014-01-01 23:59:17 +01:00
scrawl
24aa743573 Add function for converting feet to game units 2014-01-01 23:34:18 +01:00
scrawl
f6387d5979 Implement Telekinesis magic effect. Remove some duplicate code. 2014-01-01 23:30:58 +01:00
scrawl
531bef6193 Shorter Vector3 initialisation 2014-01-01 22:46:10 +01:00
scrawl
5729672262 Show marked position on map. Implement Detect X magic effects. 2014-01-01 22:37:52 +01:00
scrawl
eab7ffd6b4 Remove redundant finding of default exterior position height 2014-01-01 18:05:28 +01:00
Marc Zinnschlag
c3482b6f24 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/openmw/mwmechanics/spellcasting.cpp
 2014-01-01 15:05:42 +01:00
Marc Zinnschlag
5fa9aa5d1e Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/worldimp.cpp
 2014-01-01 14:57:14 +01:00
scrawl
ea3b88951a Implement divine/almsivi intervention magic effects 2014-01-01 02:22:11 +01:00
scrawl
c86760e3cd Remember the last known exterior position of the player in case we fail to map the interior to a world position. 2014-01-01 01:10:55 +01:00
Lukasz Gromanowski
101813fd0d Fixes #417: Apply weather instantly when teleporting 
Correction to previous commit - WeatherManager->update()
will always be called.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-31 21:18:10 +01:00
Lukasz Gromanowski
e9844e1b37 Fixes #417: Apply weather instantly when teleporting 
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-31 20:40:23 +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
Lukasz Gromanowski
c65f018760 Fixes #417: Apply weather instantly when teleporting 
Corrected constant name.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-29 15:09:49 +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
Lukasz Gromanowski
faf8011c48 Fixes #417: Apply weather instantly when teleporting 
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-29 12:47:44 +01:00
scrawl
686d9efac3 Bug #1060: Fix incorrect spell type checks 2013-12-27 18:58:35 +01:00
scrawl
5054d8e6c1 Bug #1055: Check power use and mana before starting cast animation 2013-12-26 22:06:13 +01:00
scrawl
876fb9a899 Addition to bb4bd999ba : adjust position for objects placed from inventory 2013-12-19 00:11:14 +01: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