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

363 commits

Author SHA1 Message Date
scrawl
220ab86eca Simplify new game movie player 2014-05-20 10:07:08 +02:00
scrawl
e266aff561 Savegame: store projectiles 2014-05-17 05:24:32 +02:00
scrawl
e5a21aca53 Refactor projectiles to no longer use MW-objects 2014-05-16 13:33:30 +02:00
scrawl
028e00c98f Add missing status report for some toggle commands 2014-05-16 09:21:28 +02:00
scrawl
940a434479 Use ItemModel for moving items from a container to the world 
Fixes owner not resetting when moving an item from a corpse to the world.
 2014-05-16 03:19:38 +02:00
scrawl
a76e391ad0 Savegame: store door movement state (Closes #747) 2014-05-15 09:54:10 +02:00
scrawl
9b67fcc4d7 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-05-14 23:54:25 +02:00
scrawl
1141c1f3f2 Change projectiles to use actorIds 2014-05-14 09:48:16 +02:00
Thomas
cbfa282f8d Changed implementations of aifollow/pursue/activate slightly, added ability for NPCs to go through unlocked doors (They even try locked ones), and step back from opening doors (Although it still needs some work) 
Notes - When the door hits them while it's about to finish closing they will try to walk through the door.
      - Considerably more works is needed in making the NPC work out troublesome areas where they get stuck
 2014-05-13 03:58:32 -04: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
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
f811abb752 pathgrid shortcutting extended 2014-04-20 20:35:07 +04:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01: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
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
Marc Zinnschlag
29c3a288e3 load and save of reference in cells (without CustomData state) 2014-01-27 13:27:42 +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
851a7d5014 Feature #957: Handle area effects for "on touch" range 2014-01-21 12:30:15 +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
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
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
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
24aa743573 Add function for converting feet to game units 2014-01-01 23:34:18 +01:00
scrawl
5729672262 Show marked position on map. Implement Detect X magic effects. 2014-01-01 22:37:52 +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
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
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
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
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
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
Marc Zinnschlag
51bfa5cde3 rewrote global variable storage (using ESM variant type now) 2013-12-10 15:09:58 +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
scrawl
076cc9230b First try at handling target magic 2013-11-28 17:31:17 +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
scrawl
800a2845b0 Add Bound & Summon effects (will need some adjustments later) 2013-11-21 17:14:23 +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
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
Marc Zinnschlag
8be3ffc2a0 Merge remote-tracking branch 'scrawl/magic' 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-11-09 10:54:51 +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
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02: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
Emanuel Guevel
496f786c2a Implement Disable/EnableLevitation script functions 
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
 2013-10-02 15:33:20 +02:00
Lukasz Gromanowski
9c2145eda1 Issue #913: Merge --master and --plugin switches 
Merged master/plugin switches into content in openmw
and mwiniimporter.

Extension in content files is now required.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-09-29 09:11:57 +02:00
mckibbenta
89b7d6121d Initial toggleGodMod/tgm instruction. Currently only affects player health. 2013-09-12 08:30:00 -04:00
gus
46a734852b adding script instruction getLOS + some test about AI 2013-09-10 16:16:13 +02:00
mckibbenta
eef9df504a fiddlings 2013-08-29 20:25:36 -04:00
mckibbenta
06701467ab Merge branch 'master' into tgm 2013-08-24 21:28:26 -04:00
mckibbenta
8998b90e8b initial do-nothing implementation; registered opcode 2013-08-24 21:19:12 -04:00
Chris Robinson
f5d03a16c1 Rename getFacedObject and getFacedHandle for melee hits 2013-08-23 12:27:39 -07:00
Chris Robinson
a993af53e7 Merge remote-tracking branch 'zini/master' into physics 2013-08-20 02:21:44 -07:00
scrawl
ebf9debb80 Enabled terrain self shadows, implemented getHeightAt, some optimizations 2013-08-19 20:39:37 +02:00
Chris Robinson
9d56e2d86d Apply movement by queueing it to do later 2013-08-17 22:34:38 -07:00
Chris Robinson
2353ac1739 Properly implement SetWerewolfAcrobatics 2013-08-13 04:54:41 -07:00
Chris Robinson
2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
 2013-08-08 00:09:29 -07:00
PLkolek
8f4506f5b6 Implemented drowning. 
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
 2013-08-07 16:46:46 +02:00
Emanuel Guevel
20d40c4368 Implement MWWorld::World::setWerewolf() 2013-08-06 12:34:35 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
Chris Robinson
c94653dc49 Implement the ModRegion script function 2013-07-27 07:10:18 -07:00
Chris Robinson
1174b85ac8 Implement Disable/EnableTeleporting script functions 2013-07-27 00:14:55 -07:00
Chris Robinson
6195062d72 Try to figure out what gets hit 
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
 2013-07-25 12:58:43 -07:00
Kolzi
1b7966ca27 Can zoom in and out in third person view. 2013-07-19 16:12:01 +02:00
greye
f3d54a7ba4 move finding default cell positions to World 2013-07-07 15:03:06 +04:00
Vincent Heuken
b095c24854 resize actor collision boxes on death 2013-06-27 14:11:20 -07:00
scrawl
3a6e54c4f5 Sell owned items in the cell 2013-05-27 02:18:36 +02:00
scrawl
aaa9aba999 Some fixes 2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
gus
006f25d1c0 First try to improve AI. Does not work yet due to strange bug in physicsystem 2013-05-06 00:46:50 +01:00
Marc Zinnschlag
95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'" 
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
 2013-05-01 16:56:16 +02:00
Marc Zinnschlag
6f0ccb6e38 Merge remote-tracking branch 'scrawl/insertrecords' 2013-05-01 13:55:26 +02:00
Marc Zinnschlag
089ef7a2a0 Merge remote-tracking branch 'glorf/acrobatics' 2013-05-01 13:44:23 +02:00
scrawl
40a0969055 Insert records that may not exist in vanilla MW 2013-05-01 12:47:50 +02:00
Glorf
236ec3409f Finished acrobatics 2013-05-01 12:21:59 +02:00
scrawl
67422c397c GetWindSpeed 2013-05-01 11:42:24 +02:00
scrawl
627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 2013-05-01 11:15:43 +02:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
Glorf
74de8b83b6 Enabled collision when new game 2013-04-29 17:56:16 +02:00
scrawl
867c7db014 Fix wrong door sounds 2013-04-29 11:00:15 +02:00
Chris Robinson
24e503330b Merge remote-tracking branch 'zini/master' into animations 2013-04-28 09:41:31 -07:00
scrawl
4ee1a6ee02 Put door physics in a separate method, some fixes 2013-04-28 15:36:37 +02:00
scrawl
9343b4459e Opening doors 2013-04-28 14:59:15 +02:00
Chris Robinson
137017b325 Don't allow forcing vanity mode 2013-04-27 01:24:36 -07:00
Glorf
7cd4dd0c91 Improved local rotations 2013-04-25 19:14:10 +02:00
Glorf
e0357c7b7c Merge rotate 2013-04-15 20:29:38 +02:00
Glorf
972481f63f Working rotate, rotateworld 2013-04-15 16:45:53 +02:00
scrawl
2693b78536 Add initial player inventory when new game is started 2013-04-15 02:56:23 +02:00
Tom Mason
6ca2b1af74 fix for turning animations playing when in vanity mode 2013-04-09 19:24:41 +01:00
scrawl
ebaf80d539 Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change. 2013-04-03 23:55:57 +02:00
Chris Robinson
18e8ff7198 Actually rotate the object when updating physics 2013-03-31 02:24:44 -07:00
Marc Zinnschlag
573368849b Merge remote-tracking branch 'glorf/enchanting' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2013-03-29 16:48:21 +01:00
Glorf
6643fe789c Enchanting system 2013-03-28 17:41:00 +01:00
Marc Zinnschlag
08f6d04960 constness fixes 2013-03-18 08:29:40 +01:00
Glorf
ea7f386e7d Access to Fallback via getFallback 2013-03-17 13:50:15 +01:00
Glorf
521bebd2f4 Fallback system rewritten, added light fallbacks 2013-03-15 10:17:30 +01:00
scrawl
d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 2013-03-08 23:46:25 +01:00
scrawl
285b4bf726 Allow zooming camera in vanity or preview mode with the mousewheel 2013-03-08 00:12:56 +01:00
Marc Zinnschlag
642653d10e World constructor fixes 2013-03-06 19:57:00 +01:00
scrawl
fe7b2732d8 Avoid manually updating render targets from within frameRenderingQueued 2013-03-05 14:24:29 +01:00
scrawl
355390429e Fix World::isUnderwater to use dynamic waterlevel 2013-02-25 17:27:50 +01:00
Chris Robinson
5a1a0b7338 Add and use an MWWorld::isFlying method 2013-02-18 22:39:43 -08:00
Chris Robinson
158e18b98d Remove an unused method 2013-02-16 00:30:07 -08:00
Chris Robinson
ac717373b1 Add a method to check if an object is on the ground 2013-02-14 22:35:15 -08:00
Chris Robinson
34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 2013-02-09 09:46:57 -08:00
Marc Zinnschlag
f19fbaa293 Merge remote-tracking branch 'mark76/multiple_esm_esp' into next 2013-02-09 15:30:29 +01:00
Chris Robinson
0a4568bd11 Move the PtrMovementList typedef to MWWorld 
Use it for the doPhysics parameter, too
 2013-02-05 11:03:39 -08:00
Chris Robinson
1747c1e01a Integrate a new movement solver to handle object movement and collisions 
Temporary, and pretty breoken. Needs some serious integration fixes.
 2013-02-04 07:10:14 -08:00
Tom Mason
9ad08520fd Implemented OnPCDrop special variable 
Scripts are responsible for resetting to 0, as investigation showed that is how vanilla handled it.
 2013-01-31 18:45:32 +00:00
Chris Robinson
0cd3880b20 Merge remote-tracking branch 'zini/master' into animation2 2013-01-26 04:54:52 -08:00
Mark Siewert
dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
 2013-01-25 18:22:01 +01:00
Tom Mason
23dada0ee4 moved script handling on enable / disable into their own functions 2013-01-20 16:38:56 +00:00
Chris Robinson
d2f5a886c7 Handle playgroup and skipanim through mwmechanics 2013-01-16 17:53:18 -08:00
Chris Robinson
63e685ea39 Add a method to get the Animation from a Ptr 2013-01-16 09:59:19 -08:00
Tom Mason
c138e00aa2 objects scripts are now stopped when they are removed from a container 2013-01-13 17:05:12 +00:00
Tom Mason
5bfdb2449d allowed dropObjectOnGround to be used on npcs, not just player 2013-01-09 18:53:14 +00:00
Marc Zinnschlag
649ae645f3 Merge remote-tracking branch 'blunted2night/bug_495_v2' 2013-01-09 12:12:41 +01:00
Nathan Jeffords
719663d86e added option to override the activation distance 
The command line option '--activate-dist <int>' can be used to override
the in game activation distance.
 2013-01-08 20:00:06 -08:00
Nathan Jeffords
b3932e3dea added a separate activation distance for NPCs 2013-01-07 23:40:17 -08:00
Nathan Jeffords
b9fbd6ae4b Factored faced object lookups into MWRender::World 
* Renamed MWWorld::World::getFacedHandle to getFacedObject.
 * Changed it to return an object pointer
 * Updated clients to use return object directly.
 2013-01-07 23:38:08 -08:00
Nathan Jeffords
05dad29005 update MWWord::World to track distances while performing occlusion queries. 
This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.
 2013-01-07 23:11:15 -08:00
Nathan Jeffords
86f691d3d5 split MWWord::World::update into multiple functions 2013-01-07 22:48:24 -08:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-07 13:25:15 +01:00
scrawl
282601d6e9 support the allowSkipping extra parameter for playBink command. 2013-01-07 13:19:52 +01:00
Emanuel Guevel
63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter 
Edit other files accordingly.
 2013-01-06 01:37:58 +01:00
Marc Zinnschlag
4c28f3211b Merge remote-tracking branch 'lazydev/master' 2012-12-26 15:50:03 +01:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
Tom Mason
8ac8fdff47 implemented all text defines except a few for keybindings that don't exist yet 2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244 Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work 2012-12-20 23:16:34 +00:00
scrawl
64210e6efa Revert "New Game button" 
This reverts commit c5dd0e1968.
 2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb Revert "remove commandline switch for new game" 
This reverts commit 86671096ec.
 2012-12-18 19:09:08 +01:00
scrawl
86671096ec remove commandline switch for new game 2012-12-16 16:14:49 +01:00
scrawl
c5dd0e1968 New Game button 2012-12-16 16:05:31 +01:00
scrawl
faad64b254 Esc cancels the video 2012-12-12 01:13:53 +01:00
scrawl
c4facc233e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-12-01 11:30:51 +01:00
Mark Siewert
8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
 2012-11-25 14:12:44 +01:00
Mark Siewert
42eefaf36f - Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned). 
- Reference loader now (partially) supports MVRF tag.
 2012-11-10 21:43:41 +01:00
greye
b5a59c3a07 minor doxygen comments update 2012-11-08 19:01:42 +04:00
greye
83e758ee50 clean up interfaces 2012-11-08 16:37:57 +04:00
greye
9dc9098fa7 update MWBase::World interface since records contains own id 2012-11-08 01:52:34 +04:00
greye
5b9621bca5 store player record data in ESMStore 2012-11-08 01:36:43 +04:00
Marc Zinnschlag
918316168f Merge remote-tracking branch 'greye/store' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp
 2012-11-07 19:34:28 +01:00
Mark Siewert
64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 2012-11-06 20:37:29 +01:00
greye
9f1733a415 move record insertion to ESMStore 2012-11-06 17:51:38 +04:00
greye
2057f5619e move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
emoose
cadc753216 Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell 
Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery
Bug #430 fix is only tested in interiors (ToddTest)
 2012-11-03 19:29:55 +00:00
scrawl
33361e6539 Merge branch 'master' into spellcreation 2012-10-23 10:38:53 +02:00
scrawl
d76522e7a4 searchPtrViaHandle 2012-10-19 19:48:02 +02:00
scrawl
c991f68a2d buying created spell 2012-10-15 21:54:19 +02:00
Mark Siewert
28d4d7ea3f Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. 
- Remove check for 255 master/plugin files.
 2012-10-07 20:00:55 +02:00
scrawl
73c69e8eda video playback 2012-09-25 02:35:50 +02:00
scrawl
9106e5307c moved global map from RenderingManager to gui and removed world method 2012-09-21 14:11:01 +02:00
scrawl
8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 2012-09-20 17:41:14 +02:00
scrawl
86cfc91ef3 global map rendering 2012-09-20 13:56:37 +02:00
scrawl
bf5e30b24f everything done except health/mana restore 2012-09-19 02:53:06 +02:00
scrawl
ab698bb401 date time label 2012-09-18 20:53:32 +02:00
Marc Zinnschlag
4469976be9 Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-09-18 10:44:25 +02:00
gugus
032ff7c879 Clean-up. There is still a little bug. 2012-09-17 13:36:48 +02:00
Marc Zinnschlag
b7c9285b24 added support for out of world rendering 2012-09-14 21:12:16 +02:00
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
scrawl
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
greye
e6c3e0744e tvm update and fix 2012-08-19 10:37:51 +04:00
greye
5b2b378f25 tvm script instruction 2012-08-18 18:05:10 +04:00
greye
0e6e141fd4 camera control related script instructions 2012-08-17 15:20:57 +04:00
greye
392e6efcb5 initial player rendering 2012-08-17 15:19:43 +04:00
greye
6f87c0c36d preview mode, advanced vanity support 2012-08-17 15:19:43 +04:00
greye
c46eeaa100 initial 3d-person camera support 2012-08-17 15:19:43 +04:00
Marc Zinnschlag
766e782aae Merge remote branch 'greye/cross_cell-borders' 2012-08-11 12:05:10 +02:00
greye
45306e4bc3 fixed rotation adjustment 2012-08-11 13:23:54 +04:00
scrawl
11fadf4a07 forgot something 2012-08-10 16:25:27 +02:00