teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
5325 commits 34 branches 0 tags 66 MiB
Commit graph

3749 commits

Author SHA1 Message Date
scrawl
31f760ccce Fixing issues from last commit: restored input and occlusion queries 2013-02-05 20:26:13 +01:00
scrawl
c4d518132f With the 1x1 background window trick, we can apply VSync without restart. Some issues left though. 2013-02-05 19:22:08 +01:00
scrawl
499f3ac0d1 Slightly better ripple normal blending. Not physically accurate at all, but looks good. 2013-02-05 16:40:41 +01:00
scrawl
3772cd9257 Refraction can be disabled separately now 2013-02-05 14:29:46 +01: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
scrawl
a29919d02d restored global map 2013-02-05 00:39:56 +01:00
scrawl
35b5fdab5d Merge branch 'terrainfix' into graphics 2013-02-05 00:28:59 +01:00
scrawl
09180666b2 Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix 2013-02-05 00:21:42 +01:00
scrawl
58cf182db2 better place for syncing 2013-02-05 00:21:29 +01:00
scrawl
bb1f23875d Merge branch 'terrainfix' into graphics 2013-02-04 23:16:11 +01:00
scrawl
596628d339 Fix terrain derived data update (bug 534, bug 544) 2013-02-04 23:13:01 +01:00
Michal Sciubidlo
66ec4ca7d9 Split launcher specific code from DataFilesList back to DataFilesPage. 2013-02-04 22:14:14 +01:00
scrawl
0f37c24d5f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-04 21:55:41 +01:00
scrawl
bf037b7d29 Removed problematic ModVertexAlpha method, now done in shader 2013-02-04 18:03:03 +01:00
Marc Zinnschlag
ba0d13fc12 moved code for creating new base content records into the Document class 2013-02-04 13:50:38 +01:00
Marc Zinnschlag
4c973a0f67 constructing documents from a file list instead of a single name 2013-02-04 13:46:54 +01:00
Marc Zinnschlag
3f0a49a2f6 Merge branch 'master' into startup 
Conflicts:
	apps/opencs/CMakeLists.txt
 2013-02-04 10:22:37 +01:00
scrawl
fa07288b15 tweaked map light color 2013-02-03 20:29:50 +01:00
scrawl
5cc8af0f14 fix map positions 2013-02-03 20:06:03 +01:00
scrawl
a44dfcd2ac Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good. 2013-02-03 19:28:31 +01:00
scrawl
109d0a942f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-03 19:02:57 +01:00
scrawl
979a874220 Fixed the custom near clip planes 2013-02-03 19:01:59 +01:00
scrawl
5334934612 Listen to render window updates and properly activate/deactivate occlusion queries pre/post update. 2013-02-03 18:03:09 +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
Marc Zinnschlag
c97553703a fixes for static build without cg 2013-02-03 13:47:55 +01:00
Marc Zinnschlag
a4872e3217 rewrote the opencs cmake scripts (more compact and no more annoying warnings) 2013-02-03 13:30:40 +01: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
Michal Sciubidlo
155cca0c9a Upload missing files. 
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
 2013-02-02 18:36:01 +01:00
Marc Zinnschlag
67a1ec5166 added provisional startup dialogue 2013-02-02 16:14:58 +01:00
Marc Zinnschlag
85697e4628 reverted to C++03 2013-02-02 13:24:28 +01:00
scrawl
a461b282c1 water ripples (experimental) 2013-02-01 23:43:23 +01:00
scrawl
3ec703e6af Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-01 16:25:54 +01:00
Michal Sciubidlo
492482de7f Add "open" option in opencs. 2013-02-01 00:42:03 +01:00
Tom Mason
0f58e03343 Unequipping items will reset OnPCEquip variable 2013-01-31 19:04:39 +00: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
Michal Sciubidlo
ac62dd050d Rename datafilespage to datafileslist 2013-01-30 21:08:27 +01:00
Michal Sciubidlo
f029a9011a Move datafilespage to shared space. 2013-01-30 20:21:03 +01: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
Emanuel Guevel
19dff822f4 Dialogue: do not filter on disposition for creatures 2013-01-24 19:43:21 +01:00
Emanuel Guevel
ed9a9904b4 Dialogue filter: search script variables case-insensitively 2013-01-24 19:39:31 +01:00
Marc Zinnschlag
90d05858ef disabling dialogue sub-views for now 2013-01-22 11:50:08 +01:00
Marc Zinnschlag
cd662af634 Merge branch 'globals' 2013-01-22 11:47:24 +01:00
Marc Zinnschlag
2756d3ee94 Merge remote-tracking branch 'wheybags/containerscripts' 2013-01-21 23:02:45 +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
Emanuel Guevel
736e471613 Print a fallback text when no topic response is found 2013-01-20 17:44:09 +01:00
Emanuel Guevel
43e85ea0c6 Disallow redirection to info refusal for greetings 2013-01-20 17:44:09 +01:00
Emanuel Guevel
05796d85a4 NPC: take stats from NPDT12 into account 
Some available stats (level, reputation and disposition) were not used
for NPC with auto-calculated stats.
 2013-01-20 17:44:08 +01:00
Emanuel Guevel
951eb1b236 Dialogue: return a response from "Info Refusal" when disposition is not satisfied 2013-01-20 17:44:08 +01: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
abe25c5f66 removed use of c++11 auto 2013-01-20 14:24:55 +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
Nathan Jeffords
f55da17933 made some journal accessor methods constant 2013-01-19 16:21:41 -08:00
Nathan Jeffords
4c7ae3d1ff prevent duplicate journal entries from being recorded 2013-01-19 16:21:15 -08:00
Nathan Jeffords
528c3da6da record heard topics in journal 2013-01-19 16:20:22 -08:00
Nathan Jeffords
d6b956cdcf fixed swapped day & month fields when created a stamped journal entry 2013-01-19 16:19:03 -08: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
Marc Zinnschlag
2d96f52864 select correct record when opening a dialogue sub view 2013-01-19 14:29:14 +01:00
Marc Zinnschlag
82b790770d Merge remote-tracking branch 'potatoesmaster/dialogue-creatures' 2013-01-17 10:21:01 +01:00
Emanuel Guevel
4feaa66897 Do not open the dialogue window if no greeting is found 2013-01-17 01:58:44 +01:00
Marc Zinnschlag
7b568cbb15 Merge remote-tracking branch 'potatoesmaster/dialogue' 2013-01-16 22:03:40 +01:00
Marc Zinnschlag
312f68bf9c Merge remote-tracking branch 'thoronador/fix-spelling' 2013-01-16 12:28:33 +01:00
scrawl
df602553d1 Reworked MWRender::Water to be more OOP-ish and possibly allow other reflection types. 2013-01-16 09:13:36 +01:00
Thoronador
3220330ce0 fix spelling in comment 2013-01-16 04:19:16 +01:00
Emanuel Guevel
9e00c6694f Allow only ID filtered topics for dialogue with creatures 2013-01-15 21:40:44 +01:00
Chris Robinson
8a073c113e Use const references where appropriate 2013-01-15 12:07:15 -08:00
Chris Robinson
8361192b64 Use typedefs for some maps and some cleanup 2013-01-15 11:10:41 -08:00
Marc Zinnschlag
3053440462 Issue #539: fixed AiWander 2013-01-15 12:40:44 +01:00
Emanuel Guevel
82287445af DialogueWindow: do not execute onFrame() when not visible 2013-01-15 00:59:48 +01:00
Emanuel Guevel
f1f9173f24 Prevent closing dialogue window when an answer is expected 2013-01-15 00:53:32 +01:00
scrawl
6c6ce4a05c Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-01-14 00:10:57 +01: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
Marc Zinnschlag
654cd3ab9b Issue #479: Use magnitude specified when adding disease 2013-01-13 14:52:55 +01:00
Tom Mason
d4ca954d47 scripts on items in containers added to script list on cell change 2013-01-12 18:31:57 +00:00
Marc Zinnschlag
f4ee8e2642 Issue #479: Added additional magnitude parameter to known spells 2013-01-12 13:10:20 +01:00
scrawl
e4f140841e Make OpenMW work with Ogre 1.9 2013-01-12 08:23:15 +01:00
scrawl
2c3719a6f5 Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass. 2013-01-12 07:02:12 +01:00
scrawl
30136eb449 Update settings UI 2013-01-12 06:36:48 +01:00
scrawl
52516ca4b4 Merge branch 'master' into graphics 2013-01-12 01:22:01 +01:00
scrawl
ed3c23ad9a Fixed crash on changing cell due to Utf8Encoder going out of scope 2013-01-12 01:18:36 +01:00
Marc Zinnschlag
101810d1e8 Merge remote-tracking branch 'scrawl/ingredients' 2013-01-11 11:12:07 +01: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
Nathan Jeffords
d469415e59 factored out two function from OMW::Engine::go 
The initialization code inside Engine::go is now in two function it
calls prior to running the main loop.
 2013-01-10 21:32:24 -08:00
scrawl
c71656493d Ingredient effects now correctly hide until the player has discovered them 2013-01-11 01:23:24 +01:00
scrawl
6ef85c46fd Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-01-10 19:35:40 +01:00
Marc Zinnschlag
274ff530dc Merge remote-tracking branch 'wheybags/master' 2013-01-10 11:53:42 +01:00
scrawl
55769aaf91 Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled 2013-01-10 01:46:00 +01:00
Marc Zinnschlag
6e0b86c6f9 Merge remote-tracking branch 'potatoesmaster/getdisposition' 2013-01-10 01:29:02 +01:00
Tom Mason
8486a51535 fixed drop amounts thanks to zinnschlag 2013-01-09 22:55:28 +00: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
scrawl
d3c0851aa7 Changed light attenuation back to linear in all cases, this seems to be what MW does. 2013-01-09 22:08:42 +01:00
scrawl
b8c6f6640b Fixing water <-> waterfall blending issues (Sort of... the second part will follow later) 2013-01-09 21:56:26 +01:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
scrawl
bc73c5b1ec enable directional lighting for character previews 2013-01-09 20:08:59 +01:00
Tom Mason
5bfdb2449d allowed dropObjectOnGround to be used on npcs, not just player 2013-01-09 18:53:14 +00:00
Nathan Jeffords
6ca87e108f updated loading screen to use the resource managers pattern matching when finding files 2013-01-09 08:54:03 -08:00
Nathan Jeffords
44031ec3d7 fleshed out BSAArchive and DirArchive. 
Implemented both lists & finds, with pattern matching.

Conflicts:
	components/bsa/bsa_archive.cpp
 2013-01-09 08:53:27 -08:00
Marc Zinnschlag
6567bf38f8 Merge remote-tracking branch 'wheybags/master' 2013-01-09 17:01:47 +01:00
Emanuel Guevel
3e41a1118a GetDisposition: return calculated disposition instead of base disposition 2013-01-09 15:14:17 +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
Jordan Milne
857bb42297 Create a separate scenemanager for each CharacterPreview instance 2013-01-09 01:44:15 -04: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
Nathan Jeffords
39d27b87c9 fixed build error with Audiere coded enabled 2013-01-08 09:14:56 -08:00
Marc Zinnschlag
d4a9236ae5 hocking up dialogue sub view to a widget mapper 2013-01-08 14:59:40 +01:00
Marc Zinnschlag
c0fb46384c Merge branch 'master' into globals 2013-01-08 11:32:53 +01:00
Marc Zinnschlag
c6ff58d5b5 Merge remote-tracking branch 'scrawl/videoplayback' 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-08 11:17:19 +01: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
Tom Mason
9ee823d8f8 fixed typo in vmformat.txt 2013-01-07 21:09:03 +00:00
Tom Mason
4c5ed43cc9 added removesoulgem, and fixed addsoulgem 2013-01-07 21:08:04 +00:00
Tom Mason
c2901fe6cc added addsoulgem scripting function 2013-01-07 18:16:50 +00:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-07 13:25:15 +01:00
scrawl
c2b75e28e9 Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback 2013-01-07 13:20:50 +01:00
scrawl
282601d6e9 support the allowSkipping extra parameter for playBink command. 2013-01-07 13:19:52 +01:00
scrawl
35f4d09288 swscale handled better (cmake) 2013-01-07 13:06:16 +01:00
Marc Zinnschlag
2557ef4d7d post merge fixes and some misc clean up 2013-01-07 12:17:46 +01:00
Marc Zinnschlag
41767f8dfa Merge remote-tracking branch 'blunted2night/better_flicker' 2013-01-07 12:06:21 +01:00
Nathan Jeffords
0f3712f284 change flickering light's brightness pattern 2013-01-06 14:29:22 -08:00
Marc Zinnschlag
25815ab8f7 Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite' 2013-01-06 13:31:01 +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
fbb59302d9 Merge remote-tracking branch 'blunted2night/loading_screen_fix' 2013-01-04 10:50:59 +01:00
Emanuel Guevel
67273fc177 mwiniimporter: use Utf8Encoder 2013-01-04 01:52:02 +01:00
Nathan Jeffords
9afe4467d8 cache results of query for spash screen names 
ResourceGroupManager::listResourceNames returns a list of all resource
accessable which is expensive, this change caches the result of the
processed query so additional splash screen changes are quicker.
 2013-01-03 15:45:09 -08: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
Marc Zinnschlag
b7b51f24d6 added new Role for table headers (Role_Display) 2013-01-03 11:20:25 +01:00
Marc Zinnschlag
0af7a2888a Merge remote-tracking branch 'scrawl/ai_script' 2013-01-03 09:56:36 +01:00
Marc Zinnschlag
25d9918765 post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++) 2013-01-03 09:55:48 +01:00
Marc Zinnschlag
c0260697c2 Merge remote-tracking branch 'scrawl/master' 2013-01-03 09:52:46 +01:00
Marc Zinnschlag
ce5d27b07b Merge remote-tracking branch 'scrawl/button_fixes' 2013-01-03 09:50:24 +01:00
scrawl
42e0501c67 fix typo 2013-01-03 02:40:21 +01:00
scrawl
a5ef669eb6 Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD 
Conflicts:
	apps/openmw/mwscript/aiextensions.cpp
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-03 02:34:31 +01:00