mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 20:26:43 +00:00
Code Issues Releases Wiki Activity
9941 commits 115 branches 76 tags 128 MiB
Commit graph

378 commits

Author SHA1 Message Date
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
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
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
Marc Zinnschlag
767cb54e7c added missing columns to journal info table 2013-10-31 12:54:55 +01:00
Marc Zinnschlag
ba88c94d58 first attempt at an info record collection 2013-10-29 13:18:22 +01:00
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02:00
Marc Zinnschlag
adf3a41a83 added topic and journal tables 2013-10-20 17:15:32 +02:00
Jordan Ayers
296b2ab870 Magic Effect: Recognize other display types. 
Fill out the list of effects which use percentage formatting.
Add in types which use Feet and level labels.
 2013-10-08 23:55:14 -05:00
Jordan Ayers
6ab7002908 MagicEffect: Put magnitude type into ESM::MagicEffect helper. 2013-10-07 22:28:55 -05:00
Marc Zinnschlag
baae548106 added project scope filter saving 2013-09-27 13:56:40 +02:00
Marc Zinnschlag
4ea5191d7d fixed write function for ESM variant type 2013-09-27 13:17:04 +02:00
Marc Zinnschlag
5779f799ab create project file when saving content file 2013-09-27 11:36:06 +02:00
Marc Zinnschlag
c42e74dadf make 4 byte record type accessable from record struct 2013-09-24 13:17:28 +02:00
Marc Zinnschlag
d4b2a6b9f1 Merge remote-tracking branch 'graffy76/esxSelector' into saving 2013-09-23 10:09:43 +02:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
Marc Zinnschlag
bf0fba68af added save stage for globals 2013-09-16 12:51:57 +02:00
Marc Zinnschlag
874ce26bef added missing consts to record save functions 2013-09-16 12:32:35 +02:00
Marc Zinnschlag
1ee228a566 fix for the ESMWriter fix 2013-09-15 15:30:17 +02:00
Marc Zinnschlag
bcd36bd378 various ESMWriter fixes 2013-09-15 15:00:15 +02:00
Marc Zinnschlag
9332684335 allow the use of value types in string filters 2013-09-05 15:05:49 +02:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
Marc Zinnschlag
f605dcdd24 Merge branch 'filter' 2013-08-24 14:51:05 +02:00
Marc Zinnschlag
e03e2f0817 Merge remote-tracking branch 'scrawl/master' 2013-08-21 19:50:08 +02:00
scrawl
d086346b07 Fix loading of some cells in TR 2013-08-21 17:26:11 +02:00
Chris Robinson
602be9bbe7 Avoid swimming into the air from underwater 2013-08-21 07:24:54 -07:00
scrawl
e27437f8ed New terrain renderer - improvements: 
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
 - Fixes several blending issues and cell border seams
 - Fix map render to use the terrain bounding box instead of an arbitrary height
 - Different LODs are now properly connected instead of using skirts
 - Support self shadowing
 - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
 - Support a fixed function fallback (though the splatting shader usually performs better)
 - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
 2013-08-19 20:34:20 +02:00
Chris Robinson
73437dfdca GetEffect can accept an effect ID string as well 2013-08-13 19:18:21 -07:00
Chris Robinson
5968165de0 Merge remote-tracking branch 'zini/master' into werewolf 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2013-08-09 07:00:00 -07:00
Chris Robinson
ae183cb3e4 Handle werewolf stats 2013-08-09 05:14:58 -07:00
Marc Zinnschlag
a95715b61d added description field to filter record 2013-08-09 13:45:50 +02:00
Marc Zinnschlag
501753c01b Merge remote-tracking branch 'scrawl/master' into columns 2013-08-03 15:06:30 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
Marc Zinnschlag
6f90e071f4 added filter record (will not be used in OpenMW prior to 1.1) 2013-07-22 20:50:04 +02:00
Marc Zinnschlag
47f7bbd48a fixed OpenCS crash during cell loading when loading multiple ESX files 2013-07-16 12:08:35 +02:00
Marc Zinnschlag
744198fc44 added blank function to CellRef and moved a function that was in the wrong file 2013-06-08 15:49:59 +02:00
Marc Zinnschlag
c626e2b257 Merge branch 'ref' 
Conflicts:
	apps/opencs/view/doc/view.hpp
 2013-05-19 14:59:01 +02:00
scrawl
ca81335319 Fix bug loading attribute values 2013-05-16 21:45:49 +02:00
scrawl
8a3d3f954b NPC/creature persistence flag 2013-05-16 18:50:26 +02:00
Marc Zinnschlag
b21dae8d75 added blank function to all referencable record structs 2013-05-06 14:10:43 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
Glorf
6ea82333d4 Headers cleanup 2013-04-28 16:38:33 +02:00
Glorf
98baf9fac1 Bugfix #718 2013-04-28 16:36:12 +02:00
scrawl
c519fc360d Move away from fixed record names for body parts 2013-04-18 00:19:34 +02:00
Marc Zinnschlag
0c33dd86d5 added basic cell table 2013-04-14 17:04:55 +02:00
Marc Zinnschlag
ec6dff38b1 added basic spell table 2013-04-09 11:40:36 +02:00
Marc Zinnschlag
85e5bd212b Merge remote-tracking branch 'scrawl/master' 2013-04-08 20:05:52 +02:00
scrawl
f3c8cd2065 Don't buy/sell keys which are set to open a lock 2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6 Implemented levelled items 2013-04-07 21:01:02 +02:00
Marc Zinnschlag
60cc95305d added basic birthsign table 2013-04-07 20:26:39 +02:00
Marc Zinnschlag
e25f5c6dfe added basic region table 2013-04-07 16:32:06 +02:00
Marc Zinnschlag
ff1d908af4 added script table 2013-04-07 15:17:35 +02:00
Marc Zinnschlag
ec7a8f1add small fix 2013-04-06 21:58:28 +02:00
Marc Zinnschlag
8bf569d58a added basic sound table 2013-04-06 21:21:10 +02:00
Marc Zinnschlag
73da794d77 added basic race table 2013-04-04 14:34:39 +02:00
Marc Zinnschlag
18e046e628 cleaned up race record struct 2013-04-04 13:50:36 +02:00
Marc Zinnschlag
8c7d578ddc moved the CellRef struct to its own header 2013-04-04 12:13:15 +02:00
Marc Zinnschlag
7136ac0079 added missing attribute columns to faction table 2013-04-04 10:58:53 +02:00
Marc Zinnschlag
384c88182d dealing with unset attribute fields 2013-04-02 14:15:22 +02:00
Marc Zinnschlag
f9f520df34 adjusted faction record to increase consistency with other records 2013-04-02 13:59:45 +02:00
Marc Zinnschlag
c71edb613d added faction table 2013-04-02 12:00:45 +02:00
Marc Zinnschlag
607435aaf2 Merge branch 'class' 2013-03-31 10:49:56 +02:00
scrawl
e27e53f607 Fix not playable body parts appearing in the race selection menu. 2013-03-30 20:04:05 +01:00
scrawl
6f1575d42a CELL record corrections 2013-03-27 17:27:43 +01:00
Marc Zinnschlag
ea3b14f2d2 added skill columns to class 2013-03-26 09:43:13 +01:00
Marc Zinnschlag
c7275965b8 added basic class record table 2013-03-25 13:22:06 +01:00
Marc Zinnschlag
1078386fd7 Merge branch 'skills' into next 2013-03-25 11:07:14 +01:00
Marc Zinnschlag
114f99ddbf add skill records when creating a new base file 2013-03-24 15:10:03 +01:00
scrawl
8e2f9f5186 Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips 2013-03-22 12:24:09 +01:00
scrawl
918cdcffc2 Split up components/esm/loadlocks 2013-03-22 05:50:54 +01:00
Marc Zinnschlag
7df0f6aaee prepared skill record for use in editor 2013-03-21 14:30:27 +01:00
Marc Zinnschlag
1d1471b81c fixed a bug in ESM::Variant::write (was affecting string values) 2013-03-21 12:57:10 +01:00
scrawl
dd57eabc3e Better use an enum for magic effect IDs 2013-03-16 23:28:26 +01:00
Marc Zinnschlag
75bd30844d added optional format sub-record to tes3 record 2013-03-12 14:33:35 +01:00
Marc Zinnschlag
16570ce87b moved header record struct to separate file 2013-03-12 09:16:03 +01:00
Marc Zinnschlag
731ac6a160 removed redundant copy of Header::Data 2013-03-12 08:30:51 +01:00
Marc Zinnschlag
9e68a420ae restructuring tes3 record structs 2013-03-12 08:15:20 +01:00
Marc Zinnschlag
b085c4f749 removing more leftovers 2013-03-11 16:53:42 +01:00
Marc Zinnschlag
2e1a1fd11a removing some remains of the removed GMST fixing feature 2013-03-11 16:30:47 +01:00
Marc Zinnschlag
64d517dd79 removed unused file type information from esm component 2013-03-11 14:42:49 +01:00
greye
9133182f2f restore loading CELL records in esmtool 2013-03-05 20:25:20 +04:00
Marc Zinnschlag
dc3edc6024 Merge branch 'vartype' 2013-03-05 10:59:08 +01:00
Marc Zinnschlag
1489570b09 change variant in info record to new type 2013-03-05 10:34:03 +01:00
Marc Zinnschlag
1b19ab6028 fixed gmst integers 2013-03-05 08:15:03 +01:00
Marc Zinnschlag
ba4907fbaf use new Variant type for GMSTs 2013-03-05 08:02:27 +01:00
Marc Zinnschlag
ce49ad54a1 some cleanup and fixing 2013-03-05 08:02:05 +01:00
Marc Zinnschlag
a1ac20c6f3 changed global variable records to new variant type 2013-03-04 14:32:59 +01:00
Marc Zinnschlag
65081f5520 added variant class 2013-03-04 14:32:23 +01:00
Marc Zinnschlag
230136438b minor cleanup 2013-02-28 22:17:07 +01:00
lazydev
60f2219450 fixed zini's norices 2013-03-01 00:46:05 +04:00
lazydev
169a1ff1ce Merge branch 'master' of git://github.com/zinnschlag/openmw 2013-02-28 23:02:19 +04:00
scrawl
6683e43efc Removed commented code 2013-02-28 12:35:18 +01:00
scrawl
f75681d89b Ignore ESX header version 2013-02-28 12:12:51 +01:00
Marc Zinnschlag
3bd228f71b fix for global variables of type short 2013-02-28 11:50:29 +01:00
lazydev
b93eb84401 fix for https://bugs.openmw.org/issues/573 2013-02-28 02:43:03 +04:00
lazydev
759b2e96bf fix for https://bugs.openmw.org/issues/577 2013-02-27 01:37:40 +04:00
Marc Zinnschlag
a7102c143f ESX variable type cleanup 2013-02-26 14:37:11 +01:00
Chris Robinson
db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 03:32:35 -08:00
Nathan Jeffords
44b1c66c4b fixed various warnings about converting size_t to int 2013-02-23 10:23:38 -08:00
Chris Robinson
e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 03:42:37 -08:00
Douglas Mencken
df5919f2c5 Use `signed char' explicitly where needed. It is important because: 
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
  and unsigned char.
- Assuming that char is always unsigned or signed can lead to
  compile-time and run-time errors.

You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).

Conflicts:

	components/esm/loadcell.hpp
 2013-02-15 20:28:14 +01:00
Chris Robinson
f197c67e95 Fix a circular include 2013-02-09 12:46:20 -08:00
Marc Zinnschlag
f19fbaa293 Merge remote-tracking branch 'mark76/multiple_esm_esp' into next 2013-02-09 15:30:29 +01:00
Mark Siewert
eefbdde6de - For pull request: remove all instances of maps used to track refnumbers. 
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
 2013-02-09 13:00:57 +01:00
Marc Zinnschlag
d5dd0640c7 basic gmst support 2013-02-08 09:58:19 +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
Mark Siewert
713d324eeb - Minor code cleanup 2013-01-20 19:07:33 +01: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
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
Nathan Jeffords
fec9a59237 changed EMSLoader to use ConstrainedDataStream 
Changed the EMSLoader class to use the ConstrainedDataStream so that
future changes may benifit from its increased performance.
 2013-01-04 13:41:03 -08:00
Emanuel Guevel
02bf02f288 ESMReader, ESMWriter: use Utf8Encoder 2013-01-04 01:52:03 +01: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
334588bf1c Merge branch 'editor2' 2012-12-28 23:31:43 +01:00
Mark Siewert
049b0e66e0 - Restore ability to generate references in the same cell from multiple plugins 
- Disable some code related to deleting entries in the store so that it builds again
 2012-12-25 20:27:30 +01:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
Thoronador
5a7a8629b6 remove unnecessary include directive 2012-12-17 23:20:43 +01:00
Thoronador
32f051d61d Remove 'GMST fixing' for dirty GMST records 
The 'fixing' for so-called dirty GMSTs does not work properly in its
current state anyway, so it should be removed. Fixing the 'GMST fixing'
might not be possible, because whether or not a GMST is 'dirty' depends
on the language version of MW. Therefore different 'fixing' algorithms
would be required for the different MW localisations, and I do not see
a good reason why GMST values should be hard-coded in the GMST load
procedure. In my opinion, it only clutters the code.

Last but not least, I believe that it is not the task of the engine to
clean ESM files from dirty entries. That is a job for the modders, who
should only release clean ESM/ESP files in the first place. The engine
should not need to worry about whether a file is 'dirty' or not.

That is why I believe a feature for cleaning ESM/ESP files shall not be
part of the engine.
 2012-12-17 23:13:33 +01:00
Marc Zinnschlag
5cd2fe00ab initialise blank global records 2012-12-03 22:16:02 +01:00
Marc Zinnschlag
8a09e03d5c global variable editing (no undo support yet) 2012-11-29 14:45:34 +01:00
Marc Zinnschlag
ef9575498f basic (non-editable) subview for global variables 2012-11-26 12:29:22 +01:00
Mark Siewert
b103426cf0 - Partially reimplement deleting objects defined in a parent esX file. 
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
 2012-11-25 19:07:16 +01:00
Mark Siewert
896ab44d1e - Add some updated files missing from last commit. 
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
 2012-11-25 17:19:29 +01:00
Mark Siewert
8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
 2012-11-25 14:12:44 +01:00
Mark Siewert
31fb715bd7 - Add support for moving existing references by plugin files. No cell changing yet. 
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
 2012-11-17 21:50:25 +01:00
Mark Siewert
2175f13b67 - Add tracking for dependencies between plugins. 
- Add reference number mangling required for moving references around.
 2012-11-17 00:21:51 +01:00
scrawl
5f7d349126 several missing includes 2012-11-14 05:32:23 +01:00
Mark Siewert
42eefaf36f - Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned). 
- Reference loader now (partially) supports MVRF tag.
 2012-11-10 21:43:41 +01:00
Marc Zinnschlag
75f64aa38b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
 2012-11-10 15:44:44 +01:00
greye
b1ef0026a9 race selection/inventory preview character model update 2012-11-10 11:41:12 +04:00
greye
c3f0dc0dfb m prefix for NpcAnimation members 2012-11-08 23:11:43 +04:00
Marc Zinnschlag
662054acf4 Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter 2012-11-08 14:55:31 +01:00
Mark Siewert
7f77bf76c7 - Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used. 
- Add many TODOs to mark points where more work is required to fully implement this feature.
 2012-11-06 22:13:19 +01:00
Mark Siewert
64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 2012-11-06 20:37:29 +01:00
greye
8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 2012-11-05 17:41:36 +04:00
greye
5ac54d1fff alter ESM::Script for storing id as std::string 2012-11-05 17:18:01 +04:00
greye
d5628c678f add mId field to every record indexed by id 2012-11-05 17:18:01 +04:00
greye
f0a3ee0ef9 gmst id should be lowercase, wipe RecIdListT 2012-11-05 17:14:02 +04:00
Marc Zinnschlag
510674aa5e Merge branch 'master' into alchemy 
Conflicts:
	components/esm/loadmgef.hpp
 2012-10-18 14:37:05 +02:00
Marc Zinnschlag
5fbca239dd Issue #61: potion creation (1st part; still missing some implementations) 2012-10-18 14:02:06 +02:00
scrawl
1a2034b4dd training window 2012-10-17 18:03:02 +02:00
Marc Zinnschlag
e05e683da3 Merge remote-tracking branch 'scrawl/spellcreation' 2012-10-12 17:19:30 +02:00
scrawl
8ccb0907e6 assertion -> exception; added the old effect flags again 2012-10-12 14:26:10 +02:00
Marc Zinnschlag
3fd887c030 silenced some warnings 2012-10-09 17:11:41 +02:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
Mark Siewert
1f961d575e Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	components/esm/loadland.hpp
	components/esm_store/reclists.hpp
 2012-10-07 20:35:54 +02:00
Mark Siewert
28d4d7ea3f Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. 
- Remove check for 255 master/plugin files.
 2012-10-07 20:00:55 +02:00
scrawl
21493c2dbd added magic effect flags from Research wiki page 2012-10-01 23:33:07 +02:00
greye
31f7325e1f fix land loading 2012-10-01 15:46:32 +04:00