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

944 commits

Author SHA1 Message Date
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
Chris Robinson
b505d4ace0 Fix feet and entity part detachment 2012-07-18 21:39:50 -07:00
Chris Robinson
4af1bce659 Restore and fix some missing parts 2012-07-18 20:14:23 -07:00
Chris Robinson
d9b64b77ec Attach skinned parts to the scene node instead of the named bone 2012-07-18 18:38:55 -07:00
Chris Robinson
db948969c9 Attach NPC parts to the proper bone 2012-07-18 11:14:13 -07:00
Chris Robinson
04e496a6ca Store the entity lists for NPC parts 2012-07-18 10:26:25 -07:00
Chris Robinson
6611b0b317 Use an array instead of a bunch of nearly-identical if blocks 2012-07-18 10:09:16 -07:00
Chris Robinson
02d39080c8 Destroy entities when they're done with. 2012-07-18 00:17:39 -07:00
Chris Robinson
4109d0d923 Destroy entities removed from the NPC 2012-07-17 22:47:56 -07:00
Chris Robinson
92546ca18d Move the last bits of code to createEntities 2012-07-17 20:23:09 -07:00
Chris Robinson
94f3e7a6c0 Store the entity list in the object 2012-07-17 16:00:03 -07:00
Chris Robinson
a590db2cf4 Create entities when loading NIFs for the NPC base 2012-07-17 15:43:40 -07:00
Chris Robinson
3efd2030e2 Create entities when loading NIFs for creatures 2012-07-17 14:11:07 -07:00
Chris Robinson
3dedac5cb1 Create mesh entities for objects when loading the NIF 2012-07-17 13:40:03 -07:00
Chris Robinson
c6cc82a51a Handle multiple entities per NPC part 2012-07-17 12:20:52 -07:00
Chris Robinson
89cfe778f0 Support multiple entities for the NPC base 2012-07-17 11:38:50 -07:00
Chris Robinson
0a4a141f2e Support multiple meshes for creatures 2012-07-17 11:23:34 -07:00
Chris Robinson
6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/animation.hpp
	apps/openmw/mwrender/creatureanimation.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
	components/nifogre/ogre_nif_loader.hpp
 2012-07-17 10:57:15 -07:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
0d3a7d482e Merge remote branch 'modred11/master' 2012-07-17 10:21:46 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
Chris Robinson
a539e98274 Handle all meshes when inserting objects into the scene 2012-07-16 10:48:48 -07:00
scrawl
778e59ee37 terrain as it was before, with about 4x less code 2012-07-15 08:21:43 +02:00
scrawl
29f91753f7 correction 2012-07-14 18:44:03 +02:00
scrawl
93c641efa7 terrain albedo 2012-07-14 18:25:43 +02:00
scrawl
16c2ea3a75 terrain colourmap 2012-07-14 11:13:38 +02:00
Chris Robinson
939d0d2fc5 Return a list of meshes and the skeleton from NIFLoader::load 2012-07-13 20:01:15 -07:00
Carl Maxwell
e4d046f69c Prepending m to the name of every member variable. 
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
    npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
 2012-07-13 03:51:58 -07:00
scrawl
d2fbb11475 temp commit 2012-07-13 11:26:36 +02:00
scrawl
7731e9a6fa finished cleaning up sky 2012-07-13 09:13:12 +02:00
scrawl
b8384162b6 merge 2012-07-13 06:16:55 +02:00
Chris Robinson
ecdd4ee23f Load NiMorphData and NiKeyframeData using proper key lists 2012-07-12 20:56:47 -07:00
Chris Robinson
386ac56bda Remove the NIF loader and code to manually transform the vertices 
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
 2012-07-12 20:12:18 -07: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
07fd9986ef accidently removed the map. 2012-07-09 20:14:07 +02:00
scrawl
b803d0e949 converted shadow caster shader 2012-07-09 19:46:36 +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
33c48b9481 update 2012-07-06 04:28:08 +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
87667ab57e Issue #107: Ptr related include cleanup 2012-07-03 13:55:53 +02:00
Marc Zinnschlag
5a7b95bf7a Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp 2012-07-03 13:15:20 +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
7fcd41c69d Issue #107: Detemplateised CellStore; some include cleanup 2012-06-29 18:54:23 +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
Mark Siewert
bef4bef5d2 - Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied. 
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
 2012-06-10 11:14:46 +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
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
scrawl
36d26e0681 set the camera orientation after using teleport doors 2012-05-30 15:52:39 +02:00
scrawl
1b561ce91f Merge branch 'master' into next 2012-05-29 06:56:23 +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
3daf1ebc3f small map tweak 2012-05-28 05:03:50 +02:00
scrawl
19c428e86c delete fix 2012-05-28 02:04:00 +02:00
scrawl
8f667580bb ogre 1.8 final release compability fixes 2012-05-27 23:12:45 +02:00
scrawl
f6a6684685 when the resolution changes, adjust camera aspect ratio and recreate compositors 2012-05-27 21:39:18 +02:00
scrawl
a7e6a142f9 blend fog of war into adjacent cells 2012-05-27 00:39:33 +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
789dfe1c88 fix a bug with water reflection plane height 2012-05-21 09:50:02 +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
gugus
9dd65dce30 Finished merging. 2012-05-11 11:52:07 +02:00
scrawl
ee883446b5 Merge branch 'master' into graphics 2012-05-04 07:38:11 +02:00
scrawl
02dad448fe make the wireframe mode not affect sky 2012-05-03 05:38:43 +02:00
scrawl
9e6531a6c6 fix for dark corners bug on some cards 2012-04-30 21:22:26 +02:00
scrawl
4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-30 18:46:51 +02:00
scrawl
aaa81397ed Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-30 18:24:05 +02:00
scrawl
50d79a8815 Merge branch 'next' into tooltips 2012-04-29 17:30:34 +02:00
scrawl
9cf6f27f96 small fix 2012-04-29 03:38:00 +02:00
scrawl
11ebae3be2 toggleCompositors command useful for debugging 2012-04-29 03:33:10 +02:00
Marc Zinnschlag
d1d21c8a0e compile fix 2012-04-28 21:21:40 +02:00
scrawl
4ce83badc9 flickering lights 2012-04-28 20:42:53 +02:00
scrawl
1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
 2012-04-24 02:02:03 +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
7ac9523e0c Merge branch 'master' into next 2012-04-23 15:32:02 +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
Marc Zinnschlag
cc86998281 removing some cout spam 2012-04-21 10:12:59 +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
fb0e649191 minor fix 2012-04-19 01:10:55 +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
51a76eda92 Merge branch 'master' into graphics 2012-04-18 01:09:55 +02:00
Jason Hooks
1ce759af06 Merging in master 2012-04-17 18:12:05 -04:00
scrawl
1de1b3e40e Merge branch 'master' into tooltips 2012-04-17 15:57:08 +02:00
scrawl
a11c4da16c vertex colour tweak 2012-04-17 14:22:03 +02:00
Marc Zinnschlag
14ddcc1204 Merge remote branch 'jhooks/clothingarmor' 2012-04-17 00:26:39 +02:00
Jason Hooks
950378ff65 Khajiit male foot fix 2012-04-16 17:25:55 -04:00
scrawl
13b67faf2f adding more safety checks 2012-04-16 20:39:41 +02:00
Marc Zinnschlag
7483c78b4a Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-16 14:06:27 +02:00
scrawl
d1e298c2e1 Merge branch 'master' into tooltips 2012-04-16 13:15:50 +02:00
Jason Hooks
0c9c253778 Fix for some types of boots 2012-04-15 22:49:17 -04:00
scrawl
0a223196e8 Merge branch 'master' into tooltips 2012-04-15 22:23:16 +02:00
scrawl
268b7cd6fc replaced typename checks 2012-04-15 22:05:33 +02:00
Marc Zinnschlag
afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-15 22:06:05 +02:00
Jason Hooks
65c9cf565c Skirt and robe part blanking 2012-04-15 15:16:48 -04:00
scrawl
688e79e6d1 Merge branch 'master' into tooltips 2012-04-15 21:14:39 +02:00
Jason Hooks
bc8bb9c57e Reserve; skirts 2012-04-15 14:22:55 -04:00
scrawl
ab4e03f05f Merge branch 'master' into tooltips 2012-04-15 17:11:14 +02:00
scrawl
d37bc9cba8 basic mouse-over info for in-game objects 2012-04-15 17:10:08 +02:00
Jason Hooks
85ac658cac Adding tons of skin body parts 2012-04-14 22:52:05 -04:00
Jason Hooks
5e1ac0cca1 Gloves, Gauntlets, Boots, Shoes 2012-04-14 20:32:46 -04:00
Jason Hooks
940a90e3ba Pauldrons 2012-04-14 19:21:14 -04:00
Jason Hooks
e5becb1f50 Group add function;Greaves 2012-04-14 18:58:52 -04:00
Jason Hooks
5d4ad4cd81 Shirts and Cuirasses 2012-04-14 16:44:46 -04:00
scrawl
4b0099fb5b npc visibility flags fix 2012-04-14 16:10:47 +02:00
scrawl
fa5a1432c9 map lighting tweak, default settings tweak 2012-04-14 15:58:58 +02:00
scrawl
e05faa184f Merge branch 'terrainshader' into graphics 2012-04-14 15:10:35 +02:00
scrawl
e04d127f30 terrain shader fixes 2012-04-14 15:10:26 +02:00
Jason Hooks
7551926afd Adding helmets 2012-04-13 23:25:15 -04:00
Alexander "Ace" Olofsson
0c6862e3e6 Undefining some windows defines 2012-04-13 15:09:38 +02:00
scrawl
a33ae35e94 some fixes 2012-04-13 13:28:31 +02:00
Jason Hooks
e869433b07 Add or replace individual parts 2012-04-12 22:16:02 -04:00
Jason Hooks
1f566fc93a Another remove function 2012-04-12 20:59:30 -04:00
Jason Hooks
a885f3e942 Remove part function 2012-04-12 20:40:11 -04:00
scrawl
fb78e853d4 removed 2 unneeded lines 2012-04-12 19:18:38 +02:00
scrawl
e2ec889d10 fixed a warning "implicit cast to float3" 2012-04-12 17:40:26 +02:00
scrawl
a96ad7fb82 restored toggleWater 2012-04-12 16:46:56 +02:00
Jason Hooks
7fce57f335 Getting started with a new branch 2012-04-11 20:16:22 -04:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
Jason Hooks
c0f52fef48 one more change 2012-04-09 00:51:10 -04:00
Jason Hooks
80afcb2eac small change 2012-04-08 20:44:44 -04:00
Jason Hooks
74deb5588d Post merge 2012-04-08 20:41:49 -04:00