mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-10-31 19:56:42 +00:00
Code Issues Releases Wiki Activity
3772 commits 38 branches 54 tags 122 MiB
Commit graph

87 commits

Author SHA1 Message Date
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2012-07-17 10:32:18 +02:00
Marc Zinnschlag
4bfed952bc Merge remote branch 'guidoj/master' 2012-07-17 10:17:06 +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
ada88596dc Fix an abort at shutdown 
Ogre uses a special method to delete the stream object, so it needs to be
allocated properly.
 2012-07-16 15:30:09 -07:00
Chris Robinson
7734771245 Use Ogre to load ESM data instead of Mangle 2012-07-15 08:31:03 -07:00
Marc Zinnschlag
182017b8e9 Issue #314: Moved ingredients and potions to a different type of record list 2012-07-13 13:08:48 +02:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
scrawl
10cfe0f5bc Issue #295: Class creation dialogs tooltips; plus tons of other improvements 2012-05-27 06:39:10 +02:00
scrawl
8ce4727424 skill tooltips 2012-05-21 01:58:11 +02:00
scrawl
630241c8e2 load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum. 2012-05-17 13:12:38 +02:00
scrawl
4ce83badc9 flickering lights 2012-04-28 20:42:53 +02:00
Jason Hooks
7fce57f335 Getting started with a new branch 2012-04-11 20:16:22 -04:00
Lukasz Gromanowski
ea8e5cb6f8 Issue #225: Land struct is not copyable. 
Disabled copy constructor and assignment operator in Land structure.
 2012-04-04 21:39:21 +02:00
Lukasz Gromanowski
cd2789b15a Revert "Issue #225: Correction to commit ae98904." 
This reverts commit 0e5c90d3e7.
 2012-04-04 21:05:19 +02:00
Lukasz Gromanowski
0e5c90d3e7 Issue #225: Correction to commit ae98904. 
Changed pointer to LandData struct to simple member variable.
 2012-04-02 23:50:53 +02:00
Lukasz Gromanowski
ae989040e5 Issue #225: Fix for memleak when loading terrain. 2012-04-01 21:29:49 +02:00
Marc Zinnschlag
2d2af4b28a Merge remote branch 'scrawl/terrain18' into terrain 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
 2012-03-30 15:38:14 +02:00
scrawl
d5c49fa036 getWaterLevel use CellStore ; attempted fix for morrowind without tribunal 2012-03-30 10:12:28 +02:00
scrawl
42c5d515e6 fixed interior water level 2012-03-29 04:50:40 +02:00
Jacob Essex
b76b62e5e4 Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore 2012-03-27 09:20:22 +01:00
scrawl
9076401892 Merge branch 'next' into terrain 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
 2012-03-22 22:31:49 +01:00
Marc Zinnschlag
ff866269ec Merge remote branch 'corristo/pgrd' 
Removed a warning

Conflicts:
	CMakeLists.txt
 2012-03-14 16:45:53 +01:00
Nikolay Kasyanov
988c1111e9 Feature #161 (Fix) Load REC_PGRD records 
fixed edge decoding, thanks Project Aedra!
 2012-03-14 12:54:52 +04:00
Nikolay Kasyanov
de5b692f9f Feature #161 (Resolved) Load REC_PGRD records 2012-03-10 18:12:45 +04:00
Nikolay Kasyanov
fda5b59eb6 Feature #161 (In Progress) Load REC_PGRD records 
now using vector instead of C arrays
fixed path grid edge loading
added path grid to cell store
implemented dedicated storage class for path grids
 2012-03-09 23:35:20 +04:00
Nikolay Kasyanov
08db70e137 disabled debug output 2012-03-08 01:00:13 +04:00
scrawl
8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 2012-03-07 13:29:59 +01:00
Nikolay Kasyanov
540e4f77a7 Feature #161 (In Progress) Load REC_PGRD records 
improved debug output
 2012-03-06 15:52:23 +04:00
Nikolay Kasyanov
e58e00ef2a Feature #161 (In Progress) Load REC_PGRD records 
Point coords definitely not floats
 2012-03-05 00:04:36 +04:00
Nikolay Kasyanov
40e07bbd2a Feature #161 (In Progress) Load REC_PGRD records 
Struct sizes seems correct, but floats is broken
 2012-03-03 18:27:38 +04:00
Michael Papageorgiou
a1cbc7fb42 Altered getFver to fix a warning 2012-03-01 14:00:45 +02:00
Jacob Essex
6924348696 Fixed some texture splatting issues with loading empty terrain cells 2012-02-29 23:33:54 +00:00
Jacob Essex
1d0ae9c8d1 Start of a basic implementation of fake vertex colours 2012-02-29 23:05:22 +00:00
Jacob Essex
637302fc87 Added blended textures to the terrain 2012-01-21 17:59:12 +00:00
Jacob Essex
18108c02a7 Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered 2012-01-21 16:59:08 +00:00
Marc Zinnschlag
ce7202a147 Issue #28: shifting around functionality among CellStore, Cells and CellList 2011-09-10 11:23:30 +02:00
Lukasz Gromanowski
ac9b1715d5 Added new command line option: "encoding" 
Added new command line option: "encoding" which allow to
change font encoding used in game messages.

Currently there are three evailable encodings:

    win1250 - Central and Eastern European (languages
              that use Latin script, such as Polish,
              Czech, Slovak, Hungarian, Slovene, Bosnian,
              Croatian, Serbian (Latin script),
              Romanian and Albanian)

    win1251 - languages that use the Cyrillic alphabet
              such as Russian, Bulgarian, Serbian Cyrillic
              and others

    win1252 - Western European (Latin) - default

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-07-17 22:16:50 +02:00
Lukasz Gromanowski
90985e849e Mantis: #18 - Move components from global namespace into their own namespace. 
Moving classes from components/misc into Misc namespace.

Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-06-19 18:14:03 +02:00
Nikolay Kasyanov
79911b16d0 Fixed enum formatting in components/esm headers 2011-04-08 22:26:27 +04:00
Nikolay Kasyanov
1e5768170f Refactored remaining headers in components/esm except defs.hpp. 
Removed obsolete *.cpp files.
 2011-04-08 17:58:21 +04:00
Nikolay Kasyanov
a2c42ab5a2 components/esm header refactoring in progress. Refactored: 
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
 2011-04-06 20:11:08 +04:00
Jan-Peter Nilsson
4dd76ff36e Remove no longer needed local .gitignore 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
f65f210149 An unsigned integer can not be smaller than 0 so there's no point in checking 2011-03-07 19:13:24 +01:00
athile
27f69d0f5b Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp. 2011-01-10 16:13:32 -07:00
Yuri Krupenin
b791a8f6be Merge remote branch 'zini/master' 2011-01-08 16:24:26 +03:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Yuri Krupenin
6b6ee5440e Minimal set of fixes to build with MinGW. 2011-01-03 17:00:53 +03:00
Marc Zinnschlag
38ab9f7a3d Merge branch 'newchar' 
Conflicts:
	components/esm_store/store.hpp
 2010-10-22 10:27:32 +02:00
Marc Zinnschlag
cc86fe54d5 Merge remote branch 'amos/gui-windows' into newchar 2010-10-22 10:12:39 +02:00
Nicolay Korslund
30f2d4fdd4 Added LAND and LTEX to esm_store 2010-10-03 12:41:35 +02:00