mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-22 00:53:50 +00:00
Code Issues Releases Wiki Activity
2151 commits 38 branches 54 tags 122 MiB
Commit graph

393 commits

Author SHA1 Message Date
Lukasz Gromanowski
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>
 2012-02-12 15:45:08 +01:00
Lukasz Gromanowski
bcc4d7a7c9 Issue #133 Handle resources across multiple data directories 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-12 14:21:07 +01:00
Marc Zinnschlag
273eac12a1 Merge remote branch 'jhooks/animation2' into animation2 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
	components/nifogre/ogre_nif_loader.cpp
 2012-02-12 13:41:06 +01:00
Nikolay Kasyanov
cb95c82af2 Merge remote-tracking branch 'upstream/master' 2012-01-29 23:39:36 +04:00
Lukasz Gromanowski
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>
 2012-01-29 20:27:03 +01:00
Jason Hooks
1da519a914 Some cleanup 2012-01-29 00:42:55 -05:00
Lukasz Gromanowski
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>
 2012-01-28 11:59:08 +01:00
Marc Zinnschlag
0d7f39fcb5 Merge branch 'refdata' into next 2012-01-28 11:46:34 +01:00
Lukasz Gromanowski
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>
 2012-01-28 09:49:09 +01:00
Pieter van der Kloet
ea241d85ef Fixed some issues with the CMake files 2012-01-28 01:36:17 +01:00
Marc Zinnschlag
c081160591 replaced container store in ref data with new custom data implementation 2012-01-27 14:55:58 +01:00
Lukasz Gromanowski
f4b6caac59 Revert "Issue #178 - workaround for compilation problems with ogre 1.8.0." 
This reverts commit 37e272b3b5.

It shouldn't be commited and pushed to config branch.
 2012-01-26 00:14:03 +01:00
Lukasz Gromanowski
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>
 2012-01-25 23:55:43 +01:00
Jason Hooks
6de0847b86 Slightly better performance on animation 2012-01-25 01:21:30 -05:00
Nikolay Kasyanov
ec6243dd77 fixed compilation problem with llvm clang: constant type explicitly set to float 2012-01-24 16:01:29 +04:00
Lukasz Gromanowski
841bdded76 Merge branch 'mwregistry' of https://github.com/swick/openmw into swick-mwregistry 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-01-22 15:52:47 +01:00
Lukasz Gromanowski
406897aa64 Issue #168 - Configuration cleanup - WIP 
Sources update.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-01-21 17:58:49 +01:00
Lukasz Gromanowski
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>
 2012-01-21 01:31:20 +01:00
Jason Hooks
bcf3e45ff6 Proper buffer designation 2012-01-18 22:00:03 -05:00
Dmitry Marakasov
463acb2f75 Use linuxpath for FreeBSD as well 2012-01-18 15:16:45 +04:00
Sebastian Wick
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 2012-01-17 23:19:17 +01:00
Sebastian Wick
16c214a17a find InstalledPath in wine registry; mInstalledPath in Files::Path 2012-01-17 19:18:17 +01:00
Marc Zinnschlag
0c2de2c00c Merge branch 'animation2' 2012-01-17 15:37:51 +01:00
Marc Zinnschlag
9b910dda94 clean up 2012-01-17 15:10:53 +01:00
Alexander "Ace" Olofsson
b4174b6419 Vector instead of new/delete 2012-01-17 09:02:45 +01:00
Alexander "Ace" Olofsson
8663177ad1 Oops, forgot the delete... 2012-01-16 23:21:13 +01:00
Alexander "Ace" Olofsson
96ed96d4dd Quick test at getting Morrowinds install path from the registry on windows 2012-01-16 23:09:25 +01:00
Lukasz Gromanowski
37e272b3b5 Issue #178 - workaround for compilation problems with ogre 1.8.0. 2012-01-13 20:41:38 +01:00
Jason Hooks
d1793bc4bd Animation files in the correct directory 2012-01-12 20:09:55 -05:00
Jason Hooks
0712bba49b Changing a few things around with handleshapes 2012-01-12 16:03:07 -05:00
Jason Hooks
eab69f18ac File output switch 2012-01-10 00:34:29 -05:00
Jason Hooks
295eb27c2d Better Text Indices; Better file output 2012-01-06 18:23:41 -05:00
Jason Hooks
859ac1153e Basic Text Indices Working 2012-01-06 02:27:10 -05:00
Jason Hooks
0715f9b6ab Preparing to use text indices 2012-01-06 00:55:02 -05:00
Jason Hooks
595d0b1192 Cleanup; warnings 2012-01-05 21:45:17 -05:00
Jason Hooks
45c57721ff Turning off hardware skinning2 2012-01-04 20:30:06 -05:00
Jason Hooks
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) 2012-01-02 23:06:10 -05:00
gugus
5cfac197d4 Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal 2011-12-29 17:59:21 +01:00
Jason Hooks
baa3f51886 Trying to fix errors 2011-12-28 14:48:28 -05:00
Jason Hooks
cef2f5e927 Trying to get code to conform with older c++ 2011-12-27 19:19:45 -05:00
Jason Hooks
d855bb4fc6 physics reenabled 2011-12-27 17:52:17 -05:00
Marc Zinnschlag
022f0fd5bd link order fix for components 2011-12-26 22:28:53 +01:00
Jason Hooks
6d10c76b06 Unique Identifiers for Creatures and NPC Free Parts 2011-12-17 01:29:08 -05:00
Jason Hooks
d51dfebde1 NPCs fully rendered 2011-12-15 00:33:10 -05:00
Jason Hooks
47112ad7f9 Changing a lot of things 2011-12-13 23:49:03 -05:00
Jason Hooks
0902a3db89 Filled out NpcAnimation and CreatureAnimation classes 2011-12-11 22:40:00 -05:00
gugus
28bd9ce362 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal 2011-12-11 11:21:57 +01:00
Jason Hooks
39338f4be1 NPC bounded parts 2011-12-09 15:20:35 -05:00
Jason Hooks
5c48d8fc1e more stuff 2011-12-09 03:02:09 -05:00
Jason Hooks
835c3f2603 Working towards npc rendering 2011-11-27 02:27:06 -05:00
Jason Hooks
7bd911b401 Problems with handles 2011-11-24 23:13:34 -05:00
Jason Hooks
e8ec9093f8 More NIFLoader code 2011-11-23 18:18:51 -05:00
Jason Hooks
828a3904a5 BSAArchive done and some change to NIFLoader 2011-11-23 02:17:21 -05:00
Jason Hooks
7319f7a8c6 Many bugs fixed related to changing cells 2011-11-19 01:01:19 -05:00
Jason Hooks
c25b49d2b6 refdata change 2011-11-08 22:59:39 -05:00
Jacob Essex
9aac625000 Changes to move the mutable ESM::Position data to RefData 2011-11-08 00:08:00 +00:00
Marc Zinnschlag
cb1373a4c7 rewrote cmake scripts for components 2011-11-06 09:30:15 +01:00
Marc Zinnschlag
325250f347 Merge remote branch 'gus/journal' into physicsfix 
Conflicts:
	components/files/windowspath.cpp
 2011-10-29 14:01:19 +02:00
gugus
241cf2555d Fixe collision shape bug. 2011-10-29 13:35:43 +02:00
Jason Hooks
c52ae6825f Applying Gus's Windows fix2 2011-10-18 21:04:31 -04:00
Jason Hooks
0992f1e903 Applying Gus's Windows fix 2011-10-18 21:02:42 -04:00
gugus
bf42d20f98 Fixed some compilation errors on windows. 
Note that it works on my computer, but it *might* not work on older versions
of windows.
 2011-10-02 13:05:08 +02:00
Marc Zinnschlag
b448fc7d4c Issue #31: Do not try to load dynamical generated cells from ESM/P files 2011-09-27 10:22:55 +02:00
Marc Zinnschlag
8da15440e0 Issue #31: added function for creating cell records 2011-09-26 11:11:30 +02:00
Marc Zinnschlag
cd7aaab48e Merge branch 'cells' into next 
Conflicts:
	apps/openmw/engine.cpp
 2011-09-24 12:10:53 +02:00
Marc Zinnschlag
02ce672fdc preload cell's reference list when accessing a reference outside of the actice cells (memory usage and speed optimisation) 2011-09-24 11:45:59 +02:00
Marc Zinnschlag
7799f7abc8 Merge remote branch 'gus/bullet_bug' into next 2011-09-22 19:08:33 +02:00
Marc Zinnschlag
f0dd38b431 Issue #28: replaced the nested map structure in the CellList 2011-09-22 12:21:24 +02:00
Marc Zinnschlag
e4a2f5547b Issue #28: added load-state for cells 2011-09-22 11:48:04 +02:00
Marc Zinnschlag
ce7202a147 Issue #28: shifting around functionality among CellStore, Cells and CellList 2011-09-10 11:23:30 +02:00
Lukasz Gromanowski
34428f5a7c Issue #168: Configuration cleanup, part 2 
Tabs vs spaces cleanup. Removed unnecessary empty function.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-09-06 17:59:40 +02:00
Marc Zinnschlag
b63a2602c3 fixed a missing include 2011-09-06 10:02:39 +02:00
Lukasz Gromanowski
d43455fd57 Issue #168: Configuration cleanup, part 2 
Corrected --data and --data-local parameters handling.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-09-02 22:45:21 +02:00
Lukasz Gromanowski
54cb6deab9 Issue #168: Configuration cleanup, part 2 2011-09-02 20:01:24 +02:00
Lukasz Gromanowski
48c24d4904 Issue #128: Configuration cleanup - added missing cstring header. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-08-20 10:11:34 +02:00
Lukasz Gromanowski
ea7eb7a62d fixes #128 Configuration cleanup. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-08-19 21:06:09 +02:00
gugus
1bf7c4e53d Improve bullet performances 2011-08-03 11:41:16 +02:00
Marc Zinnschlag
b157273cd9 Merge branch 'next' 
Conflicts:
	apps/openmw/main.cpp
 2011-07-31 19:28:12 +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
Marc Zinnschlag
2b5dc0042b fix for issue 138 (record loading failed for some NPCs) 2011-07-04 23:36:22 +02:00
Marc Zinnschlag
ba55b51627 removed a leftover debug message 2011-06-26 21:29:22 +02:00
Nikolay Kasyanov
e48d265b5d Mac fix: added local config dir support, app root dir is dir where bundle located 2011-06-26 20:15:42 +04:00
Marc Zinnschlag
8446619ac4 Merge branch 'components_namespaces' into next 
Conflicts:
	apps/openmw/mwrender/interior.cpp
	components/bsa/bsa_archive.cpp
 2011-06-19 20:22:29 +02:00
Lukasz Gromanowski
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>
 2011-06-19 19:33:30 +02:00
Lukasz Gromanowski
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>
 2011-06-19 19:14:14 +02:00
Lukasz Gromanowski
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>
 2011-06-19 18:45:23 +02:00
Lukasz Gromanowski
514b55766f Mantis: #18 - Move components from global namespace into their own namespace. 
Updated components/misc tests.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-06-19 18:25:09 +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
Lukasz Gromanowski
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>
 2011-06-19 16:46:34 +02:00
Marc Zinnschlag
bc92b7b1fa Merge branch 'directories' into next 
Conflicts:
	components/files/multidircollection.hpp
	components/nifogre/ogre_nif_loader.hpp
 2011-06-15 22:40:24 +02:00
Marc Zinnschlag
0f2df4e2b8 more cleanup 2011-06-15 22:33:31 +02:00
Jason Hooks
2132488408 merge 2011-06-15 13:24:37 -04:00
Jason Hooks
56affd018a Some cleanup 2011-06-15 13:09:47 -04:00
Marc Zinnschlag
a6e83f5b9b case-handling fix for references in cells 2011-06-13 13:47:59 +02:00
Jason Hooks
9eefee7168 Say strict 2011-06-11 20:01:21 -04:00
Jason Hooks
93f41e25a4 fs-strict 2011-06-08 17:29:28 -04:00
Jason Hooks
65cc0e8317 trying strict 2011-06-08 17:15:13 -04:00
Jason Hooks
3a9007849d Windows fix 2011-06-08 00:35:30 -04:00
Jason Hooks
a719a6b468 Getting rid of animation code in nif loader 2011-06-07 18:57:24 -04:00
Marc Zinnschlag
d59856af5c minor performance improvement 2011-06-08 00:52:25 +02:00