Commit graph

1371 commits

Author SHA1 Message Date
Marc Zinnschlag
c22e38f825 removing 255 content file limitation 2013-12-17 21:19:05 +01:00
Marc Zinnschlag
1cf1d49bc4 fix to content file reading error reporting in case of missing dependency 2013-12-16 11:39:24 +01:00
Marc Zinnschlag
bf4ffe94dc fixed a memory leak in the script record 2013-12-15 16:19:45 +01:00
Marc Zinnschlag
3590fa40bd store global script state in saved game files 2013-12-15 16:16:50 +01:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
2013-12-07 12:27:06 +01:00
Marc Zinnschlag
674931a851 remove terminating 0 from strings read from ESM records 2013-12-06 14:24:14 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-06 07:36:16 +01:00
Marc Zinnschlag
07f692bdd2 Merge remote-tracking branch 'scrawl/master' 2013-12-05 16:04:50 +01:00
scrawl
062ea627b3 Add parallax mapping for objects 2013-12-05 15:51:07 +01:00
scrawl
69c0bb1723 Add normal, specular & parallax mapping for terrain 2013-12-05 15:51:01 +01:00
Alexander "Ace" Olofsson
47c60a7037 Fix C4716 (Must return a value) error on Windows MSVC 2013-12-04 21:48:25 +01:00
scrawl
3a82f8c193 Fix incorrect log file name for launcherOgre.log 2013-12-03 15:56:00 +01:00
Marc Zinnschlag
e269c9e689 changed a few sub record names to make them more unique 2013-12-03 14:30:18 +01:00
Marc Zinnschlag
7d8e3ac651 fixed QuestState::load/save 2013-12-03 13:51:44 +01:00
Marc Zinnschlag
16e2d67b1f added overloaded start/endRecord functions to ESMWriter 2013-12-01 13:32:11 +01:00
Marc Zinnschlag
eec9821cd8 added records for storing journals in saved game files 2013-11-30 14:41:12 +01:00
pvdk
1512ac11ad Fixed the content selector checkboxes appearing as partially checked 2013-11-30 12:16:57 +01:00
Marc Zinnschlag
750133c0dd one more fix to SavedGame record saving 2013-11-30 11:05:07 +01:00
scrawl
e7ad503e30 Merge branch 'particles' into projectiles 2013-11-28 17:16:59 +01:00
Marc Zinnschlag
e432ab5e8a fixed static problem in Land recrod save function 2013-11-28 11:51:21 +01:00
Marc Zinnschlag
b40c0f2a07 one more fix to SavedGame record saving 2013-11-26 09:56:08 +01:00
scrawl
9f5ff033d7 Handle the "GetLOS" alias for GetLineOfSight 2013-11-25 14:06:59 +01:00
scrawl
58dce88c7d Handle the "tai" alias for ToggleAI 2013-11-25 14:03:51 +01:00
scrawl
6b81fd78f1 Particle improvements: Handle LocalSpace flag. Attach particle systems to the base node, since they need to be relative to that when LocalSpace is enabled. Get the bone in emitters/affectors so that resulting particle positions are the same. TODO: Fix Controllers to affect particle systems. 2013-11-25 13:50:33 +01:00
Marc Zinnschlag
1ecadccb28 fixed save function of SavedGame record 2013-11-25 12:59:40 +01:00
Marc Zinnschlag
67cd0887e6 added description field to saved game record; make use of description in GUI 2013-11-24 15:19:56 +01:00
Marc Zinnschlag
fc1501a510 store character profile information in saved game file 2013-11-21 10:53:42 +01:00
Marc Zinnschlag
d6e2701dd6 changed played time data type from float to double 2013-11-21 10:10:41 +01:00
scrawl
3452bd2e0b Add glow effect for enchanted items 2013-11-20 00:13:12 +01:00
Marc Zinnschlag
9487bd33c3 removed broken save function from ESMWriter 2013-11-19 16:07:36 +01:00
Marc Zinnschlag
4c61deca8d fixed save code for SavedGame record 2013-11-19 15:31:39 +01:00
Marc Zinnschlag
35bf98a940 modified esm reader/writer to use UTF8 when no encoder is given 2013-11-19 13:46:24 +01:00
Marc Zinnschlag
903e867c24 change to TES3 record (moved format field to the top) 2013-11-19 13:44:18 +01:00
Marc Zinnschlag
dc75627d53 added secondary saved game header record 2013-11-19 10:51:30 +01:00
Marc Zinnschlag
11e254aac8 Merge remote-tracking branch 'gus/AICombat'
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2013-11-19 09:10:48 +01:00
gus
dff3cf162d ToggleAI script instruction 2013-11-18 23:03:44 +01:00
scrawl
7fd5f1df83 Change setKeepParticlesInLocalSpace to false. Not correct for all particles, but the opposite isn't either. Plus it breaks pretty much all magic VFX. 2013-11-17 23:31:08 +01:00
scrawl
aa84ce3f0d Copy paste mistake (oops) 2013-11-16 14:44:31 +01:00
scrawl
c5f1bbcc5f Add functions to get the effect affecting resistance and weakness for another effect 2013-11-15 19:43:25 +01:00
scrawl
956d8adb99 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
Conflicts:
	apps/openmw/mwgui/inventoryitemmodel.cpp
2013-11-14 14:25:22 +01:00
Marc Zinnschlag
d49b8e7443 Merge branch 'dialogue' 2013-11-14 11:40:50 +01:00
scrawl
a6e2f43b75 Stop continuous VFX when the effect is no longer active. 2013-11-13 15:44:43 +01:00
scrawl
ffdb91bb21 Add particles for Cast + Hit. Not looking quite right yet. 2013-11-11 23:43:28 +01:00
Marc Zinnschlag
2fff7fc843 save info records 2013-11-11 12:21:26 +01:00
scrawl
afafaf73e8 Fix a build error 2013-11-10 22:40:46 +01:00
Marc Zinnschlag
8c4303399f Merge branch 'master' into dialogue
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp
2013-11-10 13:21:39 +01:00
Marc Zinnschlag
418ccf705d Merge branch 'openmw-27'
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
2013-11-06 10:21:25 +01:00
Marc Zinnschlag
2d4a6c0edf cleaned up ID handling in INFO record (including a ESMTool bug fix) 2013-11-05 12:56:20 +01:00
Marc Zinnschlag
9d7695ea88 added missing columns to topic info table 2013-11-05 11:41:48 +01:00
graffy76
ed913936f8 Eliminated game & addon keys from profile configuration 2013-11-03 21:36:41 -06:00