728e9cce5a
Merge remote branch 'lgro/config_fixes'
13 years ago
d97854be00
Bug fixes for configuration handling.
...
Corrected retrieving installation path from wine registry on MacOS.
Updated doxygen comments.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
3da6af6e38
Bug fixes for configuration handling.
...
Added erasing double quotes from paths, corrected retriveing
installation path from wine registry. Updated doxygen comments.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
f6a80bfc95
Small define/include fixes for compiling on windows
13 years ago
5f72199419
Merge remote branch 'lgro/config_fixes'
13 years ago
e0206edc44
Fixed stupid bug in getGlobalDataPath.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
13 years ago
b2b09320fc
Merge branch 'config'
13 years ago
547d6a0639
Merge remote branch 'lgro/config' into config
13 years ago
971ae94fbf
Revert "workaround for the configuration problems"
...
This reverts commit 850501e922
13 years ago
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
13 years ago
0c0b594090
Issue #168 - Configuration cleanup
...
Removed unnecessary path methods - according to forum disscusion:
http://openmw.org/forum/viewtopic.php?f=6&t=448
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
38a0d1d1c5
Merging in master
13 years ago
e58f2f5363
Eliminating unnecessary data from skeletons and shape saving
13 years ago
2217847c57
Fixing a crash
13 years ago
850501e922
workaround for the configuration problems
13 years ago
ddb8b1e1bc
Merge remote branch 'lgro/config' into config
13 years ago
80008ed09f
Issue #168 - Configuration cleanup
...
Fixed bug with configuration tokens parsing - when something
appear after token it should be appended to replaced path.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
13 years ago
1a6a49b9b8
Merge remote branch 'lgro/fix_warnings'
13 years ago
8829d46bda
Clean up compilation warnings.
...
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
bcc4d7a7c9
Issue #133 Handle resources across multiple data directories
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
273eac12a1
Merge remote branch 'jhooks/animation2' into animation2
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
components/nifogre/ogre_nif_loader.cpp
13 years ago
cb95c82af2
Merge remote-tracking branch 'upstream/master'
13 years ago
b004e2479c
Issue #133 Handle resources across multiple data directories - WIP
...
Work In Progress - added support for multiple paths in SoundManager.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
1da519a914
Some cleanup
13 years ago
86f88bedae
Issue #168 - Configuration cleanup
...
Removed 'data' part from token names, added token cleaning when
invalid or unknown token is passed as commandline parameter.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
0d7f39fcb5
Merge branch 'refdata' into next
13 years ago
c5dee2c4fb
Issue #168 - Configuration cleanup
...
Corrected tokens processing. If directory exist then tokens
shall be replaced by correct path, otherwise they are silently
removed from path container.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
ea241d85ef
Fixed some issues with the CMake files
13 years ago
c081160591
replaced container store in ref data with new custom data implementation
13 years ago
f4b6caac59
Revert "Issue #178 - workaround for compilation problems with ogre 1.8.0."
...
This reverts commit 37e272b3b5
13 years ago
1d96b99532
Issue #168 - Configuration cleanup
...
Added tokens processing, modified getInstallPath for linux
so we could use ~/.wine/dosdevices symlinks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
6de0847b86
Slightly better performance on animation
13 years ago
ec6243dd77
fixed compilation problem with llvm clang: constant type explicitly set to float
13 years ago
cd0df082df
Textures are now blended between cells and the texture blending functions are now more abstract
13 years ago
841bdded76
Merge branch 'mwregistry' of https://github.com/swick/openmw into swick-mwregistry
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
637302fc87
Added blended textures to the terrain
13 years ago
18108c02a7
Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
13 years ago
406897aa64
Issue #168 - Configuration cleanup - WIP
...
Sources update.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
7c24ae9ac7
Issue #168 - Configuration cleanup - WIP
...
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
bcf3e45ff6
Proper buffer designation
13 years ago
463acb2f75
Use linuxpath for FreeBSD as well
13 years ago
62eaaab69d
move include from .hpp to .cpp; line.empty() instead of line.size() > 0; change type of startPos and pos and move to other scope
13 years ago
16c214a17a
find InstalledPath in wine registry; mInstalledPath in Files::Path
13 years ago
0c2de2c00c
Merge branch 'animation2'
13 years ago
9b910dda94
clean up
13 years ago
b4174b6419
Vector instead of new/delete
13 years ago
8663177ad1
Oops, forgot the delete...
13 years ago
96ed96d4dd
Quick test at getting Morrowinds install path from the registry on windows
13 years ago
37e272b3b5
Issue #178 - workaround for compilation problems with ogre 1.8.0.
13 years ago
d1793bc4bd
Animation files in the correct directory
13 years ago
0712bba49b
Changing a few things around with handleshapes
13 years ago
eab69f18ac
File output switch
13 years ago
295eb27c2d
Better Text Indices; Better file output
13 years ago
859ac1153e
Basic Text Indices Working
13 years ago
0715f9b6ab
Preparing to use text indices
13 years ago
595d0b1192
Cleanup; warnings
13 years ago
45c57721ff
Turning off hardware skinning2
13 years ago
762727308e
Hardware skinning working (YESgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --all)
13 years ago
5cfac197d4
Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal
13 years ago
baa3f51886
Trying to fix errors
13 years ago
cef2f5e927
Trying to get code to conform with older c++
13 years ago
d855bb4fc6
physics reenabled
13 years ago
022f0fd5bd
link order fix for components
13 years ago
6d10c76b06
Unique Identifiers for Creatures and NPC Free Parts
13 years ago
d51dfebde1
NPCs fully rendered
13 years ago
47112ad7f9
Changing a lot of things
13 years ago
0902a3db89
Filled out NpcAnimation and CreatureAnimation classes
13 years ago
28bd9ce362
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
13 years ago
39338f4be1
NPC bounded parts
13 years ago
5c48d8fc1e
more stuff
13 years ago
835c3f2603
Working towards npc rendering
13 years ago
7bd911b401
Problems with handles
13 years ago
e8ec9093f8
More NIFLoader code
13 years ago
828a3904a5
BSAArchive done and some change to NIFLoader
13 years ago
7319f7a8c6
Many bugs fixed related to changing cells
13 years ago
c25b49d2b6
refdata change
13 years ago
9aac625000
Changes to move the mutable ESM::Position data to RefData
13 years ago
cb1373a4c7
rewrote cmake scripts for components
13 years ago
325250f347
Merge remote branch 'gus/journal' into physicsfix
...
Conflicts:
components/files/windowspath.cpp
13 years ago
241cf2555d
Fixe collision shape bug.
13 years ago
c52ae6825f
Applying Gus's Windows fix2
13 years ago
0992f1e903
Applying Gus's Windows fix
13 years ago
bf42d20f98
Fixed some compilation errors on windows.
...
Note that it works on my computer, but it *might* not work on older versions
of windows.
13 years ago
b448fc7d4c
Issue #31 : Do not try to load dynamical generated cells from ESM/P files
13 years ago
8da15440e0
Issue #31 : added function for creating cell records
13 years ago
cd7aaab48e
Merge branch 'cells' into next
...
Conflicts:
apps/openmw/engine.cpp
13 years ago
02ce672fdc
preload cell's reference list when accessing a reference outside of the actice cells (memory usage and speed optimisation)
13 years ago
7799f7abc8
Merge remote branch 'gus/bullet_bug' into next
13 years ago
f0dd38b431
Issue #28 : replaced the nested map structure in the CellList
13 years ago
e4a2f5547b
Issue #28 : added load-state for cells
13 years ago
ce7202a147
Issue #28 : shifting around functionality among CellStore, Cells and CellList
14 years ago
34428f5a7c
Issue #168 : Configuration cleanup, part 2
...
Tabs vs spaces cleanup. Removed unnecessary empty function.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
b63a2602c3
fixed a missing include
14 years ago
d43455fd57
Issue #168 : Configuration cleanup, part 2
...
Corrected --data and --data-local parameters handling.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
54cb6deab9
Issue #168 : Configuration cleanup, part 2
14 years ago
48c24d4904
Issue #128 : Configuration cleanup - added missing cstring header.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
ea7eb7a62d
fixes #128 Configuration cleanup.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
1bf7c4e53d
Improve bullet performances
14 years ago
b157273cd9
Merge branch 'next'
...
Conflicts:
apps/openmw/main.cpp
14 years ago
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>
14 years ago
2b5dc0042b
fix for issue 138 (record loading failed for some NPCs)
14 years ago
ba55b51627
removed a leftover debug message
14 years ago
e48d265b5d
Mac fix: added local config dir support, app root dir is dir where bundle located
14 years ago
8446619ac4
Merge branch 'components_namespaces' into next
...
Conflicts:
apps/openmw/mwrender/interior.cpp
components/bsa/bsa_archive.cpp
14 years ago
57972eb042
Mantis: #18 - Move components from global namespace into their own namespace.
...
Added namespace around generated win_1252 table.
Added generation of header guard and ToUTF8 namespace in gen_iconv.
Small corrections in Makefile.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
e9ff9a446b
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/nifogre into NifOgre namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
2ddd5dba11
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/nifbullet into NifBullet namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
514b55766f
Mantis: #18 - Move components from global namespace into their own namespace.
...
Updated components/misc tests.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
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>
14 years ago
8a84201ba2
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/bsa into Bsa namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
bc92b7b1fa
Merge branch 'directories' into next
...
Conflicts:
components/files/multidircollection.hpp
components/nifogre/ogre_nif_loader.hpp
14 years ago
0f2df4e2b8
more cleanup
14 years ago
2132488408
merge
14 years ago
56affd018a
Some cleanup
14 years ago
a6e83f5b9b
case-handling fix for references in cells
14 years ago
9eefee7168
Say strict
14 years ago
93f41e25a4
fs-strict
14 years ago
65cc0e8317
trying strict
14 years ago
3a9007849d
Windows fix
14 years ago
a719a6b468
Getting rid of animation code in nif loader
14 years ago
d59856af5c
minor performance improvement
14 years ago
4f304cfff2
Merge remote branch 'jhooks/directories' into directories
14 years ago
4d31ca2c86
Leading slashes now work, efficiency changes
14 years ago
5fb3dc854b
Merge branch 'optimisation'
14 years ago
ac4af583b7
Merge remote branch 'jhooks/directories' into directories
14 years ago
45453fd7a9
Case insensitive external loader working
14 years ago
f2a0fa8af2
Adding files to directory map
14 years ago
a95a0f821b
Merge remote branch 'jhooks/directories' into directories
...
Conflicts:
components/files/multidircollection.hpp
14 years ago
2aaa0f4578
Backslash working in linux
14 years ago
b92955763a
Introducing Dir Archive
14 years ago
231be8f381
Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file).
14 years ago
51b74c2f05
starting
14 years ago
b945ce61a5
Merge remote branch 'upstream/master'
14 years ago
0d9dde0fcf
experimental: each material with the same texture is loaded only once. Problem: it doesn't take into account other material properties (which seems to be always the same anyway)
14 years ago
b05f780675
fix a compiler error under window
14 years ago
80691250ec
don't create a new virtual machine for each script and frame
14 years ago
a133920eb0
boost filesystem fix
14 years ago
d9f1b64213
some file collection bug fixing
14 years ago
6e880cffb2
changed engine class to support multiple data directories for esm files
14 years ago
d260e5c1bd
added file collection class
14 years ago
5b6ec405e3
Merge branch 'script'
14 years ago
7f0a75c803
Merge branch 'config'
14 years ago
3cb994764c
Merge remote branch 'corristo/header-refactoring'
14 years ago
bdfd28f44d
adjusted components/files namespace; some related cleanup
14 years ago
7131c08ca4
moved path.hpp/path.cpp to a new component
14 years ago
861dc6a16e
redirecting output of expression evalutation to new report channel
14 years ago
125319c441
splitting off console output from messageBox channel
14 years ago
2ac1cc8aee
Trying to animate creatures
14 years ago
d035441876
Reintroducing animation
14 years ago
79911b16d0
Fixed enum formatting in components/esm headers
14 years ago
7c506301b7
Merge remote branch 'corristo/header-refactoring' into header-refactoring
...
Conflicts:
CMakeLists.txt
14 years ago
1e5768170f
Refactored remaining headers in components/esm except defs.hpp.
...
Removed obsolete *.cpp files.
14 years ago
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
14 years ago
a94de76801
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
14 years ago
833a61dd82
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
14 years ago
c571148bef
Merge branch 'collision'
14 years ago
3ad2b9986e
fix actors not beeing deleted. Need the latest OEngine.
14 years ago
d7226fc9c2
Merge branch 'tab_completion'
14 years ago
b2194398a4
fixed a bug in loading. Every collision mesh is correctly loaded now.
14 years ago
9d4cda6510
OEngine doesn't rely on OpenMW anymore
14 years ago
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
14 years ago
229a91a625
Remove unused code/dependencies
14 years ago
3552ad045d
Removed obsolete macBundlePath function from fileops.cpp. Using Ogre::macBundlePath
14 years ago
ecfe57caf2
platform check fix
14 years ago
3d75eea377
Merge remote-tracking branch 'upstream/master'
14 years ago
4dd76ff36e
Remove no longer needed local .gitignore
14 years ago
f65f210149
An unsigned integer can not be smaller than 0 so there's no point in checking
14 years ago
d68141d203
Remove unused variables
14 years ago
9ee83caaa2
Avoid crash when no bones are available
14 years ago
696861349e
Rename skel to mSkel
14 years ago
4028600768
Builds on OS X now
14 years ago
26b780d1ac
Remove unused variables and fix signed/unsigned comparison to make the compiler happy
14 years ago
1e9dc4b435
de-Windownizing and some build-fixes
14 years ago
86ded891d9
modified the nif loader for shapes used for raycasting only.
14 years ago
d3c1640723
add physic support
14 years ago
1dc452ec91
Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions
14 years ago
6a14ea8ec3
handle physics during player changing cells
14 years ago
a8ade56c80
Add a bullet Shape Loader
14 years ago
d865c3cfc6
backend for tab completion: identifiers
14 years ago
6848115c18
backend for tab completion: keywords
14 years ago
27f69d0f5b
Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp.
14 years ago
b791a8f6be
Merge remote branch 'zini/master'
14 years ago
dd4d022301
Converted all tabs to four spaces
14 years ago
6b6ee5440e
Minimal set of fixes to build with MinGW.
14 years ago
11406ae6f3
cleanupandupdate
14 years ago
5336b90149
music player and NPC rendering branch
14 years ago
60601682cd
Beast races fixed
14 years ago
1896a6a2e8
Preliminary npcs4
14 years ago
467988455c
Preliminary npcs3
14 years ago
13d8ea09b0
Cell case insensitivity, exterior and interior cells
14 years ago
ffaaad188a
using theirs
14 years ago
38ab9f7a3d
Merge branch 'newchar'
...
Conflicts:
components/esm_store/store.hpp
14 years ago
cc86fe54d5
Merge remote branch 'amos/gui-windows' into newchar
14 years ago
30f2d4fdd4
Added LAND and LTEX to esm_store
14 years ago
770276281b
changed numeric char type defs from char to signed char
14 years ago
d36fa3deda
Merge branch 'master' of http://github.com/zinnschlag/openmw
14 years ago
255b0d03a9
Started early work on terrain code (no rendering yet.)
14 years ago
c16f79afc6
fixed a bug in esm loader, that made all doors and chests locked by default
14 years ago
e39caef261
second set of additional doxygen comments
14 years ago
ee101440a2
Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations.
14 years ago
cd3e976b7c
Added birthsign dialog and spell effect widget.
14 years ago
eec34e9f0e
Added dialog for picking class from a list.
15 years ago
54996684aa
Merge branch 'master' into gui-windows
15 years ago
573917f3e1
Removed the need to configure the misc skills, they are now automatically set to any skills not part of the major/minor group.
15 years ago
3e170002e2
Merge remote branch 'zinnschlag/cell'
15 years ago
71e5a15298
Minor improvement to to_utf8
15 years ago
30e0d713ed
Changed list of skill names to contain the ID of the names instead, the actual names are then fetched from GMST.
15 years ago
edb2df7d27
Merge remote branch 'zini/newchar' into gui-windows
15 years ago
415426c30b
Convert tabs to spaces.
15 years ago
1c79a62957
Added a static list of skill names to ESM::Skill.
15 years ago
9a2f128f58
improved record searching
15 years ago
0414d7f862
load skill and magic effect records
15 years ago
6a12ce313e
Fixed uninit var in loadland.hpp
15 years ago
814d721e33
build external cell names from name of region instead of from internal region id
15 years ago
5f84b680af
implemented exterior coc
15 years ago
0eae9d1504
Removed -Werror again
15 years ago
91e8590288
Merge branch 'master' of http://github.com/zinnschlag/openmw
15 years ago
f55362cbdc
Some Windows-help to cmake/FindAudiere.cmake + non-important changes.
15 years ago
058f2d0cce
fixed a problem with previous merge
15 years ago
1dc805d0d4
Merge branch 'master' into exterior
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
15 years ago
5552c44753
Cleaned up strnlen in esm_reader. Added -Werror switch to g++.
15 years ago
e30306f7c3
Removed redundant custom exception class
15 years ago
c5d3a40fde
Fixed ESM bug (quest records).
15 years ago
d32563063b
Alternative fix to mesh crash bug
15 years ago
044bf0ab48
fixed parsing explicit references in the body of control structures
15 years ago
15878b12fd
Merge branch 'master' into exterior
15 years ago
c18e83d7c0
extended scripting extensions to code segment 3 (instructions and functions with optional arguments)
15 years ago
b3cc3073a3
changed encoding of segment 3 opcodes (increasing the number of opcodes, while reducing the width of the argument)
15 years ago
08d2b80434
message box fix
15 years ago
f4e79a48f0
implemented optional arguments
15 years ago
276a9db6f7
added missing button implementation for MessageBox
15 years ago
72cc0a3983
fixed typo in documentation
15 years ago
9a7c72cdbe
Merge commit 'ape/master'
15 years ago
27166b4ee4
added bone assignment, skeleton is disabled for meshes
...
Skeleton isn't assigned to the meshes for now, because it crashes on some.
15 years ago
2ad9850070
Added .wav -> .mp3 sound file lookup
15 years ago
6583b66e82
added load function for exteriors to cell sstore
15 years ago
3127602c57
Added file_finder component. Used by sound system.
15 years ago
d52e2f68cd
added searchExt function to cell RecList
15 years ago
38ad2d98f9
Fixed windows issues + one minor optimization on to_utf8
15 years ago
358e1ca5a5
Added custom UTF8 converter. Removed iconv dependency.
15 years ago
2cfe5f0697
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
15 years ago
47a28fe02b
If nif has a skeleton vertices are placed on the right position.
15 years ago
6a936100a7
Merge remote branch 'upstream/master'
15 years ago
d8f8bd12d3
Disabled loading skins.nif. NifLoader builds now a skeleton (if available)
15 years ago
5d4dba981f
Fixed mistake in NPC record struct
15 years ago
0d4f2ab3ef
disabled escape sequences in script strings (doesn't work with Windows paths)
15 years ago
181b538e4a
restructured ogre nif code (struct -> class with singleton), formated code
15 years ago
8086933282
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
15 years ago
Marc Zinnschlag
Lukasz Gromanowski
Alexander "Ace" Olofsson
Pieter van der Kloet
Jason Hooks
Nikolay Kasyanov
Jacob Essex
Dmitry Marakasov
Sebastian Wick
gugus
Jason Hooks
Jason Hooks
athile
Jan-Peter Nilsson
athile
Yuri Krupenin
Nicolay Korslund
Jan Borsodi
Armin Preiml