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

1080 commits

Author SHA1 Message Date
Chris Robinson
2cdda96798 Clear out some unneeded doPhysics stuff 2013-02-05 10:23:26 -08:00
Chris Robinson
4bd1e63ac1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-02-05 03:26:46 -08:00
Marc Zinnschlag
c409f1184e cleaned up object movement and fixed a bug regarding local scripts 2013-02-05 12:19:06 +01:00
Marc Zinnschlag
86fb3574a0 Merge remote-tracking branch 'wheybags/master' into next 2013-02-05 11:55:47 +01:00
Chris Robinson
bd4fdf47a3 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2013-02-05 02:27:57 -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
scrawl
109d0a942f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-03 19:02:57 +01:00
Mark Siewert
3e43db5f76 Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2013-02-03 16:14:41 +01:00
scrawl
15e51b76de Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth 2013-02-03 15:46:23 +01:00
Tom Mason
ac112ef972 refactored special variable code 2013-02-03 13:27:27 +00:00
Tom Mason
f785659297 Implemented OnPCAdd special variable 
Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised
for items added through it.
Does not get reset on drop, as per original morrowind.
 2013-02-02 17:36:12 +00:00
Marc Zinnschlag
85697e4628 reverted to C++03 2013-02-02 13:24:28 +01: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
Tom Mason
0fc5ee5149 allow OnPCEquip special variable to be of any type 2013-01-31 17:46:16 +00:00
Tom Mason
09f9557ecb Implemented OnPCEquip special variable 2013-01-31 00:34:16 +00:00
Tom Mason
dc91211b12 Fixed Small bug where scripts were being removed when they shouldn't be. 
Scripts should only be removed when the item is being moved to another cell, otherwise they should remain active.
 2013-01-31 00:21:04 +00:00
Chris Robinson
fdabef65a1 Use a method to update an object's cell in the mechanics manager 
This prevents destroying and recreating the object's character controller (and
messing up the current animation) when moving between cells.
 2013-01-29 00:19:24 -08:00
Chris Robinson
8d98f3649c Use a separate class to handle activator mechanics 2013-01-28 23:39:11 -08:00
Chris Robinson
7b71b4eb31 Add a missing include 2013-01-27 03:03:48 -08: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
f5f3c2e62d enabling / disabling should not affect scripts 2013-01-21 20:06:08 +00:00
Mark Siewert
713d324eeb - Minor code cleanup 2013-01-20 19:07:33 +01:00
Tom Mason
31c71c029d objects with scripts attached, that are inside containers will behave correctly when the container is moved 2013-01-20 17:01:30 +00:00
Tom Mason
23dada0ee4 moved script handling on enable / disable into their own functions 2013-01-20 16:38:56 +00:00
Tom Mason
28c580d280 disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly 2013-01-20 15:43:52 +00:00
Tom Mason
665a530e10 renamed realAdd to addImp 2013-01-20 14:14:34 +00:00
Tom Mason
3c6ddd7fa7 fixed isInCell method 2013-01-20 14:10:04 +00:00
Mark Siewert
a8e02779b2 - Add support for multiple plugins trying to modify the same reference 
- Fix a small signed/unsigned warning
 2013-01-19 23:33:18 +01: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
Chris Robinson
1ce8eaf52c Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/actors.cpp
	apps/openmw/mwrender/actors.hpp
 2013-01-16 07:36:56 -08:00
Chris Robinson
94e30199d1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-15 14:59:30 -08:00
Tom Mason
6fc64e8a4e scripts run for items added to containers, and scripted items in player inv handled correctly 2013-01-13 19:49:56 +00:00
Tom Mason
7c8b3f1239 Merge remote-tracking branch 'real/master' 2013-01-13 17:07:18 +00: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
d4ca954d47 scripts on items in containers added to script list on cell change 2013-01-12 18:31:57 +00:00
Nathan Jeffords
d5ebd6654d cache loaded NIF files to eliminate reloads 
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
 2013-01-10 21:47:02 -08:00
Marc Zinnschlag
274ff530dc Merge remote-tracking branch 'wheybags/master' 2013-01-10 11:53:42 +01:00
Chris Robinson
23ac1c2de5 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-09 20:52:12 -08:00
Tom Mason
3517635cfd added Drop and DropSoulGem functions 2013-01-09 21:16:45 +00:00
Marc Zinnschlag
4defb1a476 Merge remote-tracking branch 'trombonecot/lowerstring' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 2013-01-09 22:13:59 +01:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
Chris Robinson
a14132b5a0 Merge remote-tracking branch 'zini/master' into animation2 2013-01-09 11:12:26 -08:00
Tom Mason
5bfdb2449d allowed dropObjectOnGround to be used on npcs, not just player 2013-01-09 18:53:14 +00:00
Marc Zinnschlag
6567bf38f8 Merge remote-tracking branch 'wheybags/master' 2013-01-09 17:01:47 +01:00
Tom Mason
375961fe5e small fix 2013-01-09 13:27:12 +00:00
Tom Mason
b035a5aa4a beast races cannot equip anything they oughtn't to be able to equip 2013-01-09 13:18:05 +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
Tom Mason
62a2ba1cc6 beast races cannot equip shoes/boots 2013-01-09 03:03:14 +00:00
Tom Mason
135f0870f7 in actionequip, was ignoring actor param, and always using player 2013-01-09 02:16:17 +00:00
Chris Robinson
9675a6d04a Merge remote-tracking branch 'zini/master' into animation2 2013-01-08 02:25:37 -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
0108be2e4f updated MWWorld::PhysicsSystem::getFacedXXX functions 
* changed the names and return values to be consistent
 * made the distance to search a parameter
 * change the distance returned to world units instead of percentage of query distance
 2013-01-07 23:00:00 -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
Chris Robinson
921ae76ea9 Merge remote-tracking branch 'zini/master' into animation2 2013-01-06 21:20:49 -08:00
Chris Robinson
efca5ded47 Clean up some header includes to reduce nesting 2013-01-05 21:12:08 -08:00
Emanuel Guevel
63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter 
Edit other files accordingly.
 2013-01-06 01:37:58 +01:00
Mark Siewert
d6377fb2e3 - Support deleting references from a plugin 
- Add preliminary support for loading some unique fields appearing only in savegames
- Add a few lines required for supporting respawning references. Incomplete.
 2013-01-03 18:51:04 +01:00
greye
7e0713f6c4 fix string case update 2012-12-31 11:22:40 +04:00
eduard
69d9d22579 comparestring 2012-12-30 19:56:38 +01:00
eduard
98103e15eb conflict resolution 2012-12-30 13:46:07 +01:00
eduard
c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
 2012-12-30 13:09:37 +01:00
eduard
c75a5ae212 string compare and tolower 2012-12-28 18:05:52 +01:00
eduard
8545667bbd string compare and tolower 2012-12-28 17:54:56 +01:00
Marc Zinnschlag
4c28f3211b Merge remote-tracking branch 'lazydev/master' 2012-12-26 15:50:03 +01:00
Mark Siewert
8ccec17481 - Restore ability for plugins deleting records defined in parent files 
- Don't throw a runtime_error when trying to load a reference based on a deleted record (just a warning for now, should be closer to MW)
 2012-12-26 10:34:59 +01:00
Mark Siewert
049b0e66e0 - Restore ability to generate references in the same cell from multiple plugins 
- Disable some code related to deleting entries in the store so that it builds again
 2012-12-25 20:27:30 +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
Chris Robinson
7b2c3e6cd3 Pass a proper PlayMode enum to playSound and playSound3D 2012-12-18 06:01:21 -08: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
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
 2012-12-11 22:28:23 +01:00
scrawl
e3dd3d565c fix 2 leaks 2012-12-10 00:59:39 +01:00
Marc Zinnschlag
8e1a2e3a13 Issue #474: adjust global variable pcrace 2012-12-04 10:58:43 +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
b103426cf0 - Partially reimplement deleting objects defined in a parent esX file. 
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
 2012-11-25 19:07:16 +01:00
Mark Siewert
896ab44d1e - Add some updated files missing from last commit. 
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
 2012-11-25 17:19:29 +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
scrawl
1ccad32877 GetWeaponType 2012-11-25 02:06:43 +01:00
scrawl
e8ef4dba1e getPcRunning, getPcSneaking, getForceRun, getForceSneak 2012-11-24 02:02:49 +01:00
Marc Zinnschlag
d7af9fbec6 various fixes 2012-11-22 17:24:28 +01:00
Marc Zinnschlag
9201baebf9 template fix 2012-11-22 10:19:11 +01:00
Marc Zinnschlag
5d45bcd03a Merge remote-tracking branch 'trombonecot/master' 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-11-19 21:21:00 +01:00
eduard
4e4d15f8ac Failed action 2012-11-19 21:04:49 +01:00
Mark Siewert
31fb715bd7 - Add support for moving existing references by plugin files. No cell changing yet. 
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
 2012-11-17 21:50:25 +01:00
eduard
82ea547ce4 Failed action 2012-11-17 18:17:08 +01:00
Mark Siewert
2175f13b67 - Add tracking for dependencies between plugins. 
- Add reference number mangling required for moving references around.
 2012-11-17 00:21:51 +01:00
Marc Zinnschlag
9669eed083 Issue #219: added last missing function filters 2012-11-15 20:00:27 +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
235b565bb7 update main character model 2012-11-10 11:51:48 +04:00
Marc Zinnschlag
2be60041f3 Merge remote-tracking branch 'greye/player-dynamics' into next 2012-11-08 18:32:25 +01:00
greye
af5fb7916f fix searching in store 2012-11-08 21:07:14 +04:00
greye
b5a59c3a07 minor doxygen comments update 2012-11-08 19:01:42 +04:00
greye
2a86432887 store birthsign in MWWorld::Player 2012-11-08 18:50:23 +04:00
greye
83e758ee50 clean up interfaces 2012-11-08 16:37:57 +04:00
greye
2a06d72e32 remove unused custom character classes 2012-11-08 02:27:01 +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
greye
9ab2c16055 store created character classes as dynamic records 2012-11-08 01:22:44 +04:00
greye
78740306db non-const access to Store<T> from ESMStore 2012-11-08 01:21:54 +04:00
Marc Zinnschlag
c5a6171aab cleanup 2012-11-07 19:43:42 +01: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
greye
11c0e6382f make ESMStore setting up itself after loading 2012-11-07 15:41:59 +04:00
greye
bc218759e9 forgotten module 2012-11-07 15:38:25 +04:00
Mark Siewert
7f77bf76c7 - Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used. 
- Add many TODOs to mark points where more work is required to fully implement this feature.
 2012-11-06 22:13:19 +01:00
Mark Siewert
64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 2012-11-06 20:37:29 +01:00
greye
58b7927a36 move 'player' record to dynamic 2012-11-06 18:17:32 +04:00
greye
83f5b1df81 change to static --> dynamic search order 2012-11-06 17:58:49 +04:00
greye
9f1733a415 move record insertion to ESMStore 2012-11-06 17:51:38 +04:00
Marc Zinnschlag
d661d4f6d6 Merge remote-tracking branch 'emoose/bug-368' into next 2012-11-06 13:04:38 +01:00
greye
dccc157f4c setting up 2012-11-06 15:26:55 +04:00
greye
18bb5960e4 let's rescue linker 2012-11-06 15:10:57 +04:00
greye
0fd22ce4b0 CellRefList<X>::find(CellRef &, Y &list) -> ::load(CellRef &, ESMStore &) 2012-11-06 14:23:21 +04:00
greye
242a9b5a59 various interface fixes, commented unused code 2012-11-06 14:03:36 +04:00
greye
b3ad872845 new interface in manualref, fix various typos 2012-11-06 13:43:48 +04:00
greye
e74b2c060d disable createRecord(), Land constness hack, various fixes with Store<T> interface 2012-11-06 13:14:03 +04:00
greye
ff8da265ed applying new interface vol.9, inconsistent 2012-11-06 12:36:21 +04:00
emoose
3e5b396b56 Changed: world: cleanup 2012-11-05 21:10:04 +00:00
emoose
5c1b3fc043 Fixed: scene: adjust rotation/scale when creating objects 2012-11-05 20:45:04 +00:00
greye
4637503680 applying new interface vol.6, inconsistent 2012-11-06 00:34:11 +04:00
emoose
e8e3c211a4 Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation 2012-11-05 19:56:20 +00:00
emoose
7a7825577a Changed: use MWWorld::Ptr for PhysicsSystem arguments 2012-11-05 19:37:27 +00:00
greye
11567663a7 applying new interface vol.4, inconsistent 2012-11-05 22:34:08 +04:00
Marc Zinnschlag
61942c9c4a Issue #440: Make day numbers start at 1 instead of 0 2012-11-05 18:01:50 +01:00
greye
7cf0b8a680 just replace esmstore, inconsistent 2012-11-05 18:09:58 +04:00
greye
d205723a17 resolving m prefix/ESMStore movement 2012-11-05 18:02:47 +04:00
greye
8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 2012-11-05 17:41:36 +04:00
greye
10ae5d3365 dynamic storage for cells 2012-11-05 17:18:02 +04:00
greye
0f524e4a60 dynamic storage for records with string id 2012-11-05 17:18:01 +04:00
greye
9995fd324d split record comparator from store 2012-11-05 17:18:01 +04:00
greye
558e0557d0 basic static esmstore 2012-11-05 17:18:01 +04:00
greye
dd8f5e1a91 stores for records indexed with int, basic resolving 2012-11-05 17:18:01 +04:00
greye
ce91c5636d load() method for records with string id 2012-11-05 17:18:01 +04:00
greye
5ac54d1fff alter ESM::Script for storing id as std::string 2012-11-05 17:18:01 +04:00
greye
f0ecbbb056 basic Pathgrid store 2012-11-05 17:18:01 +04:00
greye
3b86955d37 basic Cell store 2012-11-05 17:18:01 +04:00
greye
e1f2f190d4 base record containers 2012-11-05 17:18:01 +04:00
greye
2057f5619e move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f m prefix for mwworld/cellstore.hpp 2012-11-05 16:07:59 +04:00
emoose
accf8b2f71 Updated Bug #430 fix so it only moves the player now 2012-11-04 23:26:26 +00: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
emoose
4a9821dc65 fix kdevelop indentation... 2012-11-02 20:43:07 +00:00
emoose
15f972cc62 fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit 
todo: going from CharacterCreation back to CreateClassDialog loses data
 2012-11-02 20:33:08 +00:00
Marc Zinnschlag
4bc4ca775c Issue #432: fixed MWWorld::ContainerStore::clear 2012-11-01 15:11:13 +01:00
Marc Zinnschlag
c635447cea Merge branch 'death' 2012-10-27 13:34:20 +02:00
Marc Zinnschlag
ed3641b214 Issue #68: check for essential actors 2012-10-27 13:33:54 +02: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
28cc480ce1 fix some alchemy issues and make the gui use the new implementation 2012-10-18 22:21:39 +02:00
scrawl
c991f68a2d buying created spell 2012-10-15 21:54:19 +02:00
Mark Siewert
1f961d575e Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	components/esm/loadland.hpp
	components/esm_store/reclists.hpp
 2012-10-07 20:35:54 +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
dc33dee22e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
 2012-10-01 20:25:23 +02:00
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
greye
721324c1db rm record inheritance, rework esmtool accordingly 2012-09-30 23:34:53 +04:00
Marc Zinnschlag
bb6d9a329c Merge remote-tracking branch 'scrawl/book_skillgain' into next 2012-09-26 20:35:48 +02:00
scrawl
caef570c8a fix the weather not changing when sleeping/waiting 2012-09-25 21:49:34 +02:00
scrawl
d163f8203c change books to RecListWithIDT 2012-09-25 21:38:34 +02:00
scrawl
853d62adba book skillgain 2012-09-25 18:59:24 +02:00
scrawl
73c69e8eda video playback 2012-09-25 02:35:50 +02:00
greye
807a56c9e4 fix dynamic potion id 2012-09-23 19:29:00 +04:00
scrawl
9f2668b45b Task #400 Review GMST access 2012-09-22 21:35:57 +02:00
scrawl
9106e5307c moved global map from RenderingManager to gui and removed world method 2012-09-21 14:11:01 +02:00
greye
18cc435aa1 resolving conflicts 2012-09-21 13:13:11 +04: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
Marc Zinnschlag
a3c680d20a Merge remote-tracking branch 'scrawl/sleep_wait' into next 2012-09-19 09:41:32 +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
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +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
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
Jason Hooks
192d634098 Movement keys; View angles 2012-09-16 13:19:38 -04:00
Jason Hooks
76f2a82884 More pmove stuff; Turned off broadphase, we could not fall in exteriors 2012-09-15 22:48:24 -04:00
Jason Hooks
f586f53a42 positioning 2012-09-15 16:45:50 -04:00
scrawl
9cf1cbc89b remove book skill gain 2012-09-15 20:03:53 +02:00
scrawl
3e5ab069a6 remove the const cast 2012-09-15 19:52:18 +02:00
Jason Hooks
02bca98e9f Setrotate working 2012-09-15 13:23:49 -04:00
scrawl
f5237ff1a6 skill gain from books 2012-09-15 19:06:56 +02:00
scrawl
2793096b50 Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
 2012-09-15 00:57:29 +02:00
Marc Zinnschlag
b7c9285b24 added support for out of world rendering 2012-09-14 21:12:16 +02:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0 race selection preview 2012-09-13 19:03:31 +02:00
scrawl
d90af9c524 Merge branch 'master' into characterpreview 2012-09-13 14:22:17 +02:00
Marc Zinnschlag
835c530e06 Merge branch 'ingredients' 2012-09-13 13:31:46 +02:00
Marc Zinnschlag
fe68a252d5 Issue #356: Implemented ingredient eating 2012-09-13 13:02:26 +02:00
scrawl
4f3eb3c34a character preview WIP 2012-09-13 00:54:32 +02:00
Jason Hooks
a1a7733730 Set scale implemented 2012-09-12 18:30:32 -04:00
scrawl
2f0b47fc38 test 2012-09-13 00:21:58 +02:00
scrawl
d5a08e31e7 scene does not disappear anymore during load 2012-09-11 17:36:20 +02:00
scrawl
2b339f6c0f loading screen 2012-09-11 16:37:54 +02:00
Jason Hooks
23777033fd Starting to implement new PhysicActor 2012-09-05 17:44:11 -04:00
Marc Zinnschlag
0879abb948 Merge branch 'actiontarget' 2012-09-04 20:56:40 +02:00
Marc Zinnschlag
da041f902f Issue #370: fixed item taking sound 2012-09-04 20:56:28 +02:00
Marc Zinnschlag
fb8aae243d Issue #370: replaced custom target handling in talk action with base class implementation 2012-09-04 15:38:21 +02:00
Marc Zinnschlag
8ed8dd649a Issue #370: replaced custom target handling in take action with base class implementation 2012-09-04 15:34:44 +02:00
Marc Zinnschlag
ea1c3fe1e4 Issue #370: replaced custom target handling in open action with base class implementation 2012-09-04 15:29:51 +02:00
Marc Zinnschlag
8c2b4f996c Issue #370: replaced custom target handling in equip action with base class implementation 2012-09-04 15:27:10 +02:00
Marc Zinnschlag
b51c42146f Issue #370: replaced custom target handling in read action with base class implementation 2012-09-04 15:24:55 +02:00
Marc Zinnschlag
3f181f9a9d Issue #370: Support for targets in containers 2012-09-04 15:21:56 +02:00
Marc Zinnschlag
cc55056adf Issue #370: replaced custom target handling in apply action with base class implementation 2012-09-04 15:18:59 +02:00
Marc Zinnschlag
733654d730 Issue #370: implemented target handling in action base class 2012-09-04 15:14:33 +02:00
Marc Zinnschlag
1cecab6e3d fixed RefData::getHandle 2012-09-04 15:08:59 +02:00
Jason Hooks
2efceba1fc Tearing apart PhysicActor 2012-09-03 20:32:20 -04:00
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
gugus
95c27723f7 fixed a bug (see commit reverted) 2012-09-02 18:12:13 +02:00
gugus
99885e8ca4 Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p" 
This reverts commit 165065d378.
 2012-09-02 18:04:36 +02:00
Jason Hooks
0697c7f7f4 Finally merged in master 2012-09-01 17:28:12 -04:00
scrawl
d9276ca09d don't make copy of CellRefList in World::getNorthVector 2012-08-28 18:23:59 +02:00
scrawl
3c39c47e2f don't make copies of CellRefList & LiveCellRef 2012-08-28 18:23:01 +02:00
scrawl
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
Marc Zinnschlag
40d4dad15e Issue #378: Fix (record wasn't build fully) 2012-08-28 09:32:38 +02:00
Marc Zinnschlag
d0cebea580 some cleanup 2012-08-26 18:50:47 +02:00
Marc Zinnschlag
450656a890 Merge remote-tracking branch 'dgdiniz/MoveSoundtoAction-Task339' into next 2012-08-26 18:39:09 +02:00
Douglas Diniz
5cbb08fee1 Task 339 - Moving all sounds to actions 2012-08-26 11:47:45 -03:00
gugus
165065d378 fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p 2012-08-21 19:54:42 +02:00
Douglas Diniz
82e7c04c0a Changing sounds to Action. 
Adding onActor to Action to choose between playSound and playSound3D.
 2012-08-19 20:11:50 -03: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
Marc Zinnschlag
1da56e2832 removed some unused variables 2012-08-17 15:37:14 +02:00
greye
4f10138a04 using real player sight angles on ray cast 2012-08-17 15:20:57 +04:00
greye
0e6e141fd4 camera control related script instructions 2012-08-17 15:20:57 +04:00
greye
6961830efb using real player eye direction when moving 2012-08-17 15:19:44 +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
fe1a9ac3c5 poor camera with some fixes 2012-08-17 15:19:43 +04:00
greye
c46eeaa100 initial 3d-person camera support 2012-08-17 15:19:43 +04:00
Jason Hooks
8762f4a47a boxrotation nif field; commented functions 2012-08-15 16:47:26 -04:00
Jason Hooks
7b8b4c366d Set angle now working for npcs and creatures 2012-08-14 20:29:48 -04:00
Jason Hooks
1f5bc229e0 Separate adjustRigidBody function 2012-08-14 18:04:58 -04:00
Michael Mc Donnell
b373d0ec7b Correct struct to class in forward declarations 
Fixes http://bugs.openmw.org/issues/362
 2012-08-13 13:58:35 -04:00
Marc Zinnschlag
88e70cb5bd Merge branch 'decouple' 2012-08-12 18:11:17 +02:00
Marc Zinnschlag
6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
Marc Zinnschlag
484cce12a8 Issue #107: removed redundant getStore function from window manager 2012-08-12 14:36:46 +02:00
Jason Hooks
e7329d5f8b Creatures now have a properly positioned box shape 2012-08-12 00:36:49 -04:00
Marc Zinnschlag
b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 2012-08-11 17:30:55 +02:00
greye
f7f8ac0a73 fix move/rotateObject code 2012-08-11 18:28:37 +04:00
Marc Zinnschlag
380defa52f Merge remote branch 'greye/cross_cell-borders' 2012-08-11 15:08:17 +02:00