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
8579 commits 38 branches 54 tags 122 MiB
Commit graph

345 commits

Author SHA1 Message Date
Jordan Milne
10a3caa504 more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine 2013-01-13 23:38:46 -04:00
scrawl
30136eb449 Update settings UI 2013-01-12 06:36:48 +01:00
Chris Robinson
9675a6d04a Merge remote-tracking branch 'zini/master' into animation2 2013-01-08 02:25:37 -08:00
Chris Robinson
05dfafa777 Avoid an unnecessary lookup when moving the scene node 2013-01-07 05:09:15 -08:00
scrawl
282601d6e9 support the allowSkipping extra parameter for playBink command. 2013-01-07 13:19:52 +01:00
Chris Robinson
efca5ded47 Clean up some header includes to reduce nesting 2013-01-05 21:12:08 -08:00
scrawl
5ed04ae53e added black bars 2012-12-15 19:23:03 +01:00
scrawl
faad64b254 Esc cancels the video 2012-12-12 01:13:53 +01:00
scrawl
c49966dd29 started over 2012-12-11 22:49:31 +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
c4facc233e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-12-01 11:30:51 +01:00
scrawl
064cb80c0a fix wait dialog fading 2012-11-23 20:48:53 +01:00
scrawl
c8562d8442 toggleCollisionBoxes actually does something useful now 2012-11-20 02:20:54 +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
Marc Zinnschlag
6d5333be05 some code cleanup 2012-11-06 13:08:25 +01:00
greye
932a9dc6f9 applying new interface vol.8, inconsistent 2012-11-06 11:53:00 +04:00
emoose
5c1b3fc043 Fixed: scene: adjust rotation/scale when creating objects 2012-11-05 20:45:04 +00: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
greye
d205723a17 resolving m prefix/ESMStore movement 2012-11-05 18:02:47 +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
scrawl
b7aa7e4cef pause all animations 2012-11-04 11:57:51 +01: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
greye
9f923e7963 fix crashing if /home/greye/.cache not exist 2012-10-25 15:14:34 +04: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
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
scrawl
73c69e8eda video playback 2012-09-25 02:35:50 +02:00
scrawl
78b2d51cfc fix a map crash 2012-09-22 16:52:31 +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
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
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
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
4f3eb3c34a character preview WIP 2012-09-13 00:54:32 +02:00
scrawl
a8d9aa98b1 some fixes 2012-09-11 19:18:26 +02: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
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
greye
6961830efb using real player eye direction when moving 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
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
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
45306e4bc3 fixed rotation adjustment 2012-08-11 13:23:54 +04:00
greye
38b06aee6c resolving conflicts 2012-08-09 21:49:00 +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
ec9cf4d3c6 rotateObject() added, input system rewritten 2012-08-09 00:15:52 +04:00
Marc Zinnschlag
0c5f886683 Merge remote branch 'greye/player_control' 2012-08-04 21:55:13 +02:00
greye
ff62770657 World::isUnderwater(), World::isSwimming() 2012-08-03 14:42:09 +04:00
scrawl
15a16aeba1 Fixed DirectX HLSL shaders and re-enabled them in the gui 2012-08-01 04:11:16 +02: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
8c8228a15c fix terrain num lights setting 2012-07-24 00:08:53 +02: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
2eca27bba9 fix horizon color of the sky reflection 2012-07-23 14:21:40 +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
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
scrawl
739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 2012-07-19 16:23:30 +02:00
scrawl
778e59ee37 terrain as it was before, with about 4x less code 2012-07-15 08:21:43 +02:00
scrawl
b8384162b6 merge 2012-07-13 06:16:55 +02:00
scrawl
ad7383be43 sky 2012-07-11 09:08:55 +02:00
scrawl
e0a99f104b settings tab "shadows" 2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc shader mode button in settingswindow 2012-07-11 03:19:51 +02:00
scrawl
865bfc6f47 sync mrt_output setting 2012-07-11 02:31:03 +02:00
scrawl
3537af051d removed the old shader helper 2012-07-10 00:17:52 +02:00
scrawl
5d1e6b6bf6 remove cg profile check 2012-07-10 00:09:47 +02:00
scrawl
1a9f59d5d4 shadows 2012-07-10 00:07:33 +02:00
scrawl
81d30ff63a temp commit 2012-07-09 19:20:41 +02:00
scrawl
a095572205 fixed some textures, started with sky 2012-07-06 10:31:48 +02:00
scrawl
4ea6530772 hello world. 2012-07-04 00:26:57 +02:00
scrawl
a1e48b0feb builds now 2012-07-03 22:48:16 +02:00
Marc Zinnschlag
c85aaafac2 more include cleanup (most removing Ogre.h) 2012-07-03 15:32:38 +02:00
Marc Zinnschlag
4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 2012-07-03 12:30:50 +02:00
Marc Zinnschlag
76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 2012-06-29 16:48:50 +02:00
scrawl
63ce143a04 fix triangle / batch counts with compositors 2012-06-22 12:56:04 +02:00
scrawl
447158e9d6 shutdown crash fix 2012-06-09 19:15:11 +02:00
scrawl
42e44ac1b5 fixed some leaks 2012-06-06 21:08:20 +02:00
scrawl
69e6bc6588 add water settings to settings window 2012-05-29 06:45:44 +02:00
scrawl
5d03e86613 added field of view and texture filtering to settings window 2012-05-29 04:54:54 +02:00
scrawl
14f4f09f83 proper resolution switching (reposition GUI & adjust mouse clipping region) 2012-05-28 09:19:25 +02:00
scrawl
f6a6684685 when the resolution changes, adjust camera aspect ratio and recreate compositors 2012-05-27 21:39:18 +02:00
scrawl
656a8f1be9 working menu transparency slider 2012-05-23 01:32:36 +02:00
Marc Zinnschlag
7938566004 Merge remote branch 'scrawl/graphics' 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-05-21 11:24:36 +02:00
scrawl
8f2c8bbea4 Merge branch 'master' into graphics 2012-05-21 09:50:46 +02:00
scrawl
8a0c859c16 Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI 2012-05-18 22:27:48 +02:00
scrawl
c9aa0ca1f4 don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region 2012-05-17 19:54:09 +02:00
scrawl
933a40de14 better floating object label positioning. 2012-05-14 21:37:43 +02:00
scrawl
11ebae3be2 toggleCompositors command useful for debugging 2012-04-29 03:33:10 +02:00
scrawl
4ce83badc9 flickering lights 2012-04-28 20:42:53 +02:00
scrawl
e443455612 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2012-04-24 00:54:35 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
scrawl
7400b7f313 fix underwater effect staying active when teleporting from underwater to a cell that doesn't have water 2012-04-19 23:25:58 +02:00
scrawl
c6da3872b4 light improvements 2012-04-19 20:59:57 +02:00
scrawl
aa4a1b675f fixed the sky reflection issue 2012-04-19 01:08:26 +02:00
scrawl
046ef39c4a use camera-relative rendering to prevent precision artifacts when moving far from (0,0,0) 2012-04-18 01:10:00 +02:00
scrawl
13b67faf2f adding more safety checks 2012-04-16 20:39:41 +02:00
scrawl
fa5a1432c9 map lighting tweak, default settings tweak 2012-04-14 15:58:58 +02:00
scrawl
a33ae35e94 some fixes 2012-04-13 13:28:31 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
scrawl
1df7be7fee - fixes to texture filtering setting 
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
 2012-04-09 00:10:42 +02:00
scrawl
c0f991ac0a underwater depth effect 2012-04-06 18:51:30 +02:00
scrawl
456eb95209 reversed sun and moon paths (sunrise at east) 2012-04-06 18:22:37 +02:00
scrawl
c169f9e171 underwater tweaks 2012-04-06 16:11:08 +02:00
scrawl
a41eee9a72 specular lighting 2012-04-06 14:07:52 +02:00
scrawl
8bfc81f398 Merge branch 'master' into water 2012-04-05 20:09:38 +02:00
scrawl
622fb568cf removed MRT setting and figure it out automatically 2012-04-05 19:27:54 +02:00
Marc Zinnschlag
000cfad82d Merge remote branch 'scrawl/gamesettings' 2012-04-05 18:07:47 +02:00
scrawl
1b89a9e203 various fixes 2012-04-05 15:30:55 +02:00
scrawl
f49131e1b8 renamed setting, automatically disable MRT when unsupported 2012-04-05 13:09:59 +02:00
scrawl
f6342cfd60 fixed viewport background color, fixed indentation of some old functions 2012-04-05 11:52:06 +02:00
scrawl
3f05aba76d got MRT working, some minor quirks to solve (black viewport background) 2012-04-05 01:21:36 +02:00
scrawl
cc4076d42a basic noise 2012-04-03 21:16:43 +02:00
scrawl
052cc47ee9 fixed waterAdded 2012-04-03 16:53:33 +02:00
scrawl
8aea311797 added visibility flags for everything 2012-04-03 15:13:47 +02:00
scrawl
16481b0594 Merge branch 'master' into minimap 2012-04-02 19:38:36 +02:00
scrawl
342464530d rotated map working 2012-04-02 19:37:24 +02:00
scrawl
ff15f28787 options for texture filtering and mipmaps 2012-04-02 18:01:49 +02:00
scrawl
39ee9e9ab8 setting for field of view 2012-04-02 17:51:51 +02:00
scrawl
fd662f937a add settings for viewing distance and fog 2012-04-02 15:51:48 +02:00
scrawl
e0631dd9be Merge branch 'master' into minimap 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-02 14:38:02 +02:00
Marc Zinnschlag
6022d3ab13 Merge remote branch 'corristo/pgrd-rendering' 
reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
 2012-04-02 12:04:47 +02:00
scrawl
0a5757791c Merge branch 'master' into minimap 2012-04-01 20:17:07 +02:00
scrawl
ee754eda6c don't create sky until entering an exterior cell 2012-04-01 15:07:41 +02:00
Nikolay Kasyanov
057c2f2e2a Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-31 13:42:13 +04:00
scrawl
fc5cd703bb maps are now rendered with correct rotation, however for interiors the arrow is wrong 2012-03-30 16:34:36 +02:00