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

880 commits

Author SHA1 Message Date
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
greye
9f923e7963 fix crashing if /home/greye/.cache not exist 2012-10-25 15:14:34 +04:00
Marc Zinnschlag
e05e683da3 Merge remote-tracking branch 'scrawl/spellcreation' 2012-10-12 17:19:30 +02:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
scrawl
21493c2dbd added magic effect flags from Research wiki page 2012-10-01 23:33:07 +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
scrawl
fa358ab196 change the inventory preview to "inventoryhandtohand" animation pose 2012-10-01 18:04:21 +02:00
Marc Zinnschlag
35d7b5e5b0 Merge remote-tracking branch 'greye/record_saving' 2012-10-01 09:50:20 +02:00
Marc Zinnschlag
29633bd02f Merge remote-tracking branch 'greye/master' 2012-10-01 09:46:20 +02:00
greye
f907a6a86f updateListener() every frame 2012-10-01 11:24:44 +04:00
Chris Robinson
6942fa97da Specify a proper up vector for the listener 2012-09-30 17:23:05 -07:00
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
Marc Zinnschlag
20a263738a Merge remote-tracking branch 'chris/animation' 2012-09-29 12:39:56 +02:00
Chris Robinson
41f80908d9 Simplify getting the stop time when playing all animation groups 2012-09-29 01:10:49 -07:00
Chris Robinson
cd8515396a Use a multimap to store the text keys 2012-09-28 23:20:15 -07:00
scrawl
044ab3d2b6 fix error in framelistener with tcg enabled 2012-09-28 17:02:18 +02:00
scrawl
359824d614 oops 2012-09-25 21:49:34 +02:00
scrawl
4453459378 re-use the texture across preview instances 2012-09-25 21:49:34 +02:00
scrawl
e2b1329620 fix the race selection escape crash 2012-09-25 21:49:34 +02:00
scrawl
05eb307bfb added video timing 2012-09-25 02:54:29 +02:00
scrawl
73c69e8eda video playback 2012-09-25 02:35:50 +02:00
Marc Zinnschlag
5bdc7bcacf Merge branch 'master' into next 2012-09-24 10:14:09 +02:00
scrawl
02e7b3df4f oops 2012-09-24 01:07:33 +02:00
scrawl
f8a18d58a6 re-use the texture across preview instances 2012-09-24 01:06:17 +02:00
scrawl
dd5c083124 fix the race selection escape crash 2012-09-24 00:42:05 +02:00
scrawl
9f2668b45b Task #400 Review GMST access 2012-09-22 21:35:57 +02:00
scrawl
78b2d51cfc fix a map crash 2012-09-22 16:52:31 +02:00
scrawl
47d9fae89f don't use cache 2012-09-21 20:35:50 +02:00
scrawl
f49401bb53 center map on the player, dynamic map size 2012-09-21 16:26:04 +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
greye
2d5ddd104b Land::loadData rework 2012-09-21 12:12:16 +04:00
scrawl
a161b34c67 remove useless member, fix map rendering crash 2012-09-20 18:23:27 +02:00
scrawl
8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 2012-09-20 17:41:14 +02:00
scrawl
5f014f7411 oops, left in a testing assertion 2012-09-20 14:04:29 +02:00
scrawl
86cfc91ef3 global map rendering 2012-09-20 13:56:37 +02:00
Marc Zinnschlag
87a9373a56 Merge remote-tracking branch 'scrawl/gamma' into next 2012-09-20 09:01:58 +02:00
scrawl
b9a3f8e8d7 gamma slider 2012-09-19 23:47:42 +02:00
scrawl
d9f6072f02 gamma correct rendering & adjustment setting 2012-09-19 23:25:07 +02:00
scrawl
4d4ba6698a fix character preview destruction; don't allow empty names in name dialog 2012-09-18 19:00:20 +02:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
scrawl
3e794a6087 remove useless member and removed a warning 2012-09-15 01:02:07 +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
35f7216f2f fixed some things 2012-09-14 17:25:32 +02:00
scrawl
1f7e044fad removed some debug stuff 2012-09-14 14:41:19 +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
5155339cb6 character preview working 2012-09-13 14:56:50 +02:00
scrawl
d90af9c524 Merge branch 'master' into characterpreview 2012-09-13 14:22:17 +02:00
scrawl
4f3eb3c34a character preview WIP 2012-09-13 00:54:32 +02:00
scrawl
2f0b47fc38 test 2012-09-13 00:21:58 +02:00
scrawl
c3966a7c5a oops, I used a float texture for water reflection. this change should give a little performance boost. 2012-09-11 22:45:41 +02:00
scrawl
a8d9aa98b1 some fixes 2012-09-11 19:18:26 +02:00
Jason Hooks
c5b25ef70b Very basic actor physics (no set scale/rotate functions) 2012-09-10 20:29:24 -04:00
Jason Hooks
23777033fd Starting to implement new PhysicActor 2012-09-05 17:44:11 -04:00
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
scrawl
950bf66334 throw an exception if default value for a setting is not found 2012-09-02 11:39:54 +02:00
Jason Hooks
0697c7f7f4 Finally merged in master 2012-09-01 17:28:12 -04:00
Artem Kotsynyak
e9b2f4ee74 fix equipment visibility update 2012-08-28 22:59:44 +04:00
scrawl
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
scrawl
9af0b48ad6 show/hide crosshair correctly 2012-08-27 19:18:55 +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
Marc Zinnschlag
d1656b2f5d Merge remote-tracking branch 'greye/player_control' 
Conflicts:
	apps/openmw/mwrender/player.cpp
 2012-08-18 13:38:54 +02:00
greye
b6954a4e8d use the same height on non-1st person modes 2012-08-17 22:08:16 +04:00
scrawl
8817a9634c don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone) 2012-08-17 16:55:21 +02:00
Marc Zinnschlag
1da56e2832 removed some unused variables 2012-08-17 15:37:14 +02:00
greye
0e6e141fd4 camera control related script instructions 2012-08-17 15:20:57 +04:00
greye
60fb1e8df6 fix sky in preview mode movement 2012-08-17 15:19:44 +04:00
greye
6961830efb using real player eye direction when moving 2012-08-17 15:19:44 +04:00
greye
e8fc942bef reverse Z-axis rotation to make doors happy 2012-08-17 15:19:44 +04:00
greye
a453a7f035 camera adjustment, fix view mode on start 2012-08-17 15:19:44 +04:00
scrawl
34f796c38e removed the far clip distance hack which is not needed anymore 2012-08-17 15:19:44 +04:00
scrawl
b97b3d7b71 fix sky position when reflection is enabled, fix delay in sky reflection 2012-08-17 15:19:44 +04:00
greye
575244bd35 fix SkaManager issue 2012-08-17 15:19:44 +04:00
greye
783e81afc3 fix 1st/preview/1st change; 1st invisible model 2012-08-17 15:19:43 +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
db94018865 far better camera movement 2012-08-17 15:19:43 +04:00
greye
a7aeda9a3b initial vanity mode 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
c4bf6214db Merge remote branch 'scrawl/master' 2012-08-12 18:11:36 +02: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
scrawl
b6f427bf5e fix OpenMW not exiting when the window is closed (alt f4 etc) 2012-08-12 17:20:46 +02:00
Marc Zinnschlag
484cce12a8 Issue #107: removed redundant getStore function from window manager 2012-08-12 14:36:46 +02:00
Marc Zinnschlag
0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 2012-08-11 17:53:39 +02:00
greye
f7f8ac0a73 fix move/rotateObject code 2012-08-11 18:28:37 +04:00
greye
355ca649c2 camera flip control rewritten 2012-08-11 14:54:33 +04:00
greye
45306e4bc3 fixed rotation adjustment 2012-08-11 13:23:54 +04:00
greye
5018db3332 removed some redundant code, added some comments 2012-08-11 12:13:16 +04:00
Jason Hooks
083e3537b4 post merge 2012-08-09 17:21:59 -04:00
greye
38b06aee6c resolving conflicts 2012-08-09 21:49:00 +04:00
Marc Zinnschlag
aca08eb4c2 Merge branch 'decouple' into player_control 
Conflicts:
	apps/openmw/mwsound/soundmanagerimp.hpp
 2012-08-09 16:12:10 +02:00
greye
b5bc7bc424 SoundManager dependency on camera pos/dir 2012-08-09 17:01:03 +04:00
greye
181d45661f fix rotation angles 2012-08-09 13:43:52 +04:00
greye
df60f4bf92 stub for soundmanager, adjust rotation mode 2012-08-09 13:27:32 +04:00
greye
a2d87d5f5b added camera flip control, fixed input rotation axis 2012-08-09 10:24:18 +04:00
greye
ec9cf4d3c6 rotateObject() added, input system rewritten 2012-08-09 00:15:52 +04:00
greye
ee97a204f2 fix npc animation key update 2012-08-06 15:26:37 +04:00
Marc Zinnschlag
f5ee5a5414 Merge remote branch 'edmondo/master' 2012-08-05 00:03:16 +02:00
Marc Zinnschlag
0c5f886683 Merge remote branch 'greye/player_control' 2012-08-04 21:55:13 +02:00
Jason Hooks
cacf0bd10d Basic collision with npcs 2012-08-04 15:43:33 -04:00
Edmondo Tommasina
11d0761528 terrainmaterial.cpp: fix std::runtime_error compile error 2012-08-03 22:42:28 +02:00
greye
ff62770657 World::isUnderwater(), World::isSwimming() 2012-08-03 14:42:09 +04:00
gugus
e9aac4512b Build fix for Windows 
Fixes a number of places where uint was used and not defined. This commit
was originally authored by gus. It rebased by Michael Mc Donnell to take
recent commit fixes into account.
 2012-08-01 11:47:36 -04:00
scrawl
15a16aeba1 Fixed DirectX HLSL shaders and re-enabled them in the gui 2012-08-01 04:11:16 +02:00
greye
0e3f70413e a very little comments 2012-07-31 16:52:21 +04:00
greye
d6150b7482 high-level implementation, unstable 2012-07-30 23:28:14 +04:00
scrawl
6077965d27 fix the directx startup issue on windows 2012-07-26 23:09:46 +02:00
scrawl
06bd2cd919 Merge branch 'master' into shadersystem 2012-07-25 23:54:22 +02:00
Chris Robinson
9f0c1eeb7b Support playgroup mode 0 2012-07-24 14:54:12 -07:00
Chris Robinson
13ab2baef0 Use a struct to hold the current animation times and remaining loop count 2012-07-24 14:42:01 -07:00
Chris Robinson
fd1e3f6ec5 Add support for playgroup mode 2 2012-07-24 14:14:32 -07:00
Chris Robinson
20121f3b0a Remove some unused stuff 2012-07-24 13:56:28 -07:00
Chris Robinson
9a7a629d0f Add support for playing animation groups 2012-07-24 13:51:48 -07:00
Chris Robinson
f953d7f8c0 Store text keys from base NIF animations 2012-07-23 17:27:35 -07:00
Chris Robinson
36be1536d9 Return text keys from NIFs when creating entities 2012-07-23 17:20:47 -07:00
scrawl
8c8228a15c fix terrain num lights setting 2012-07-24 00:08:53 +02:00
Chris Robinson
44975854e5 Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2012-07-23 13:46:05 -07:00
Chris Robinson
f67983bbee Don't assume one sub-entity for the night sky entities 2012-07-23 13:37:05 -07:00
scrawl
02a52c0ff1 fixed some more settings bugs 2012-07-23 21:39:22 +02:00
scrawl
a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 2012-07-23 20:12:42 +02:00
scrawl
ab35bfa32c fixed a sky issue 2012-07-23 18:19:34 +02:00
scrawl
cfa0519721 Merge branch 'master' into nif-cleanup 2012-07-23 15:37:08 +02:00
scrawl
1fef086088 Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup" 
This reverts commit 546b640022, reversing
changes made to fcaa8aae06.
 2012-07-23 15:36:12 +02:00
scrawl
f8d6a36196 Merge branch 'master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/sky.cpp
	apps/openmw/mwrender/sky.hpp
	components/nifogre/ogre_nif_loader.cpp
	components/nifogre/ogre_nif_loader.hpp
 2012-07-23 15:35:31 +02:00
scrawl
2eca27bba9 fix horizon color of the sky reflection 2012-07-23 14:21:40 +02:00
scrawl
1dbfd60305 Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup 2012-07-23 13:48:12 +02:00
scrawl
afe7c41729 removed some unused code 2012-07-23 13:47:51 +02:00
Chris Robinson
77446a0d58 Fix skipAnim, only skip one animation update 2012-07-21 17:39:57 -07:00
Chris Robinson
e81fc42daa Remove the beast-race special cases from updateParts 
The special handling should happen at a much lower level, and prevent the
objects from being equipped in the first place.
 2012-07-21 17:12:41 -07:00
Chris Robinson
c5b9098517 Remove an unused field from EntityList 2012-07-21 17:09:16 -07:00
scrawl
546b640022 Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup 2012-07-21 23:50:56 +02:00
Chris Robinson
81ce8dbe12 Combine animation handling into the base class 2012-07-21 14:41:26 -07:00
Chris Robinson
fcaa8aae06 Don't skip animation state updates for NPCs 2012-07-21 11:26:09 -07:00
scrawl
acc5c3bbbf some fixes 2012-07-20 17:08:15 +02:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
scrawl
21728020f6 fixed the water on local map 2012-07-20 14:45:42 +02:00
Chris Robinson
2db80a1504 Rename a couple methods to match their scripting counterparts 2012-07-20 00:53:12 -07:00
Chris Robinson
66860825cf Remove some unused and unneeded bits from the Animation class 2012-07-20 00:36:52 -07:00
Chris Robinson
8b5b74f9ee Add a quick hack to let "playgroup all" work on creatures and NPCs 2012-07-19 22:34:26 -07:00
scrawl
f5ffea4d4b new button, water timescale 2012-07-19 23:30:41 +02:00
scrawl
e077814a8c water 2012-07-19 22:23:07 +02:00
Chris Robinson
a86ed46ec4 Use the race ID specified in the ref base's record instead of the race record 
The latter is localized and doesn't match with international versions.
 2012-07-19 11:00:26 -07:00
scrawl
739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 2012-07-19 16:23:30 +02:00
Chris Robinson
6caa39629d Reimplement the skirt part 2012-07-18 22:32:26 -07:00