scrawl
3e4cf64a77
Merge branch 'master' into shaders
2012-03-16 20:46:18 +01:00
Michael Papageorgiou
b2c6d52db1
Another file search fix
2012-03-16 09:00:18 +02:00
Alexander "Ace" Olofsson
e8eea03b4c
Fixed a few more non-virtual destructor warnings
2012-03-15 17:40:42 +01:00
Nikolay Kasyanov
65fc141b62
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-03-15 20:38:21 +04:00
Marc Zinnschlag
1c0bf162f2
boost compatibility fix
2012-03-15 16:56:36 +01:00
Marc Zinnschlag
a7211d2a90
Merge remote branch 'werdanith/searchfix'
2012-03-15 16:54:29 +01:00
Michael Papageorgiou
588ac44bc7
Improved matching for the FileListLocator
2012-03-15 17:32:10 +02:00
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
2012-03-15 16:01:41 +01:00
Marc Zinnschlag
3c3fb8d706
Merge remote branch 'werdanith/activationsounds2' into equipment
2012-03-15 14:06:48 +01:00
Michael Papageorgiou
f7c7ed0ac7
Fix regression with locating sound files
2012-03-15 13:56:46 +02: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
a7f89b864e
Merge branch 'pgrd' into pgrd-rendering
2012-03-14 12:59:58 +04: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
scrawl
118250171d
Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders
...
Conflicts:
apps/openmw/mwrender/objects.cpp
2012-03-13 17:31:10 +01:00
scrawl
4813a1ce9d
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
2012-03-13 16:00:59 +01:00
Nikolay Kasyanov
f292a5a7ca
Feature #37 (In Progress) Render Path Grid
...
now using mwRoot instead of ogre's root, so no more messing with coordinates.
2012-03-12 02:37:07 +04:00
Nikolay Kasyanov
4659076129
Feature #37 (In Progress) Render Path Grid
...
workaround for strange ESMStore bug
2012-03-10 20:45:55 +04:00
Nikolay Kasyanov
11f957a64d
Feature #37 (In Progress) Render Path Grid
...
cubes for path grid points
strange crash when trying to get path grids from Debugging
2012-03-10 20:03:00 +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
Marc Zinnschlag
69127fa8f1
boost compatibility fix; added a missing include
2012-03-09 17:33:10 +01:00
Marc Zinnschlag
c259b25fcf
Merge remote branch 'werdanith/soundmanagerrefactor'
2012-03-09 17:27:11 +01:00
Michael Papageorgiou
ad6175c78a
SoundManager: Set up the priority for file look up right and take care of a corner case
2012-03-08 23:06:52 +02:00
Nikolay Kasyanov
08db70e137
disabled debug output
2012-03-08 01:00:13 +04:00
Michael Papageorgiou
054a176c86
Added new FileLibrary class to handle music, this fixes a number of issues.
2012-03-07 17:46:51 +02: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
Marc Zinnschlag
3d1cbcd4e7
Merge remote branch 'jhooks/animperform'
2012-03-07 09:20:29 +01:00
Michael Papageorgiou
54353794e5
SoundManager: Completely rewrote the file management
2012-03-07 02:20:15 +02:00
Nikolay Kasyanov
540e4f77a7
Feature #161 (In Progress) Load REC_PGRD records
...
improved debug output
2012-03-06 15:52:23 +04:00
Jason Hooks
9848b67174
Fixing errors
2012-03-05 17:46:29 -05:00
scrawl
f7b706d24e
use the vertex colours that morrowind supplies for a lot of meshes
2012-03-05 18:50:56 +01:00
scrawl
ff8f95fcca
fix batch lighting, removed the "bumping number of lights" hack
2012-03-04 23:18:40 +01:00
scrawl
332671b43d
lighting fix
2012-03-04 22:26:40 +01:00
scrawl
b2109a1302
make the vertex colours only affect diffuse, this caused some areas to
...
be darker than they should be
2012-03-04 22:01:02 +01: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
scrawl
8910b0d471
use shaders for all NIF materials. this has numerous advantages:
...
- vertex colours are now working as they should (and they have a huge impact on the look)
- the lighting is per pixel and looks a lot better
- by using shaders, we can use more lights at a time (fixed function has max of 8)
2012-03-04 20:59:23 +01: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
scrawl
04c141ddd5
Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-03-02 13:49:57 +01:00
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Michael Papageorgiou
a1cbc7fb42
Altered getFver to fix a warning
2012-03-01 14:00:45 +02:00
Alexander "Ace" Olofsson
b6915a6090
Forgot that IsWow64Process would return false on a native 64-bit application
2012-03-01 01:03:31 +01: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
scrawl
f2c3616638
Merge branch 'next' into terrain_next
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
cmake/FindOGRE.cmake
2012-02-28 21:49:45 +01:00
Lukasz Gromanowski
9a4cd6c2b1
Fixes #200 - Paths with quotes for data-local option.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-27 23:56:58 +01:00
Jason Hooks
8d7a5f469b
a few changes
2012-02-26 21:27:54 -05:00
Nikolay Kasyanov
1addef2cc3
added missing include for macospath.cpp
2012-02-25 17:47:57 +04:00
Marc Zinnschlag
728e9cce5a
Merge remote branch 'lgro/config_fixes'
2012-02-24 09:03:48 +01:00
Lukasz Gromanowski
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>
2012-02-23 23:21:17 +01:00
Lukasz Gromanowski
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>
2012-02-23 23:01:42 +01:00
Alexander "Ace" Olofsson
f6a80bfc95
Small define/include fixes for compiling on windows
2012-02-23 20:06:06 +01:00
Marc Zinnschlag
5f72199419
Merge remote branch 'lgro/config_fixes'
2012-02-23 09:28:11 +01:00
Lukasz Gromanowski
e0206edc44
Fixed stupid bug in getGlobalDataPath.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-22 20:00:17 +01:00
Pieter van der Kloet
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
2012-02-22 08:34:47 +01:00
Marc Zinnschlag
b2b09320fc
Merge branch 'config'
2012-02-21 13:55:58 +01:00
Marc Zinnschlag
547d6a0639
Merge remote branch 'lgro/config' into config
2012-02-21 11:50:23 +01:00
Marc Zinnschlag
971ae94fbf
Revert "workaround for the configuration problems"
...
This reverts commit 850501e922
.
2012-02-21 11:50:04 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Lukasz Gromanowski
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>
2012-02-20 00:02:00 +01:00
Jason Hooks
38a0d1d1c5
Merging in master
2012-02-19 15:39:12 -05:00
Jason Hooks
e58f2f5363
Eliminating unnecessary data from skeletons and shape saving
2012-02-19 02:01:15 -05:00
Jason Hooks
2217847c57
Fixing a crash
2012-02-18 15:29:40 -05:00
Marc Zinnschlag
850501e922
workaround for the configuration problems
2012-02-16 13:14:16 +01:00
Marc Zinnschlag
ddb8b1e1bc
Merge remote branch 'lgro/config' into config
2012-02-16 09:12:15 +01:00
Lukasz Gromanowski
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>
2012-02-15 22:34:51 +01:00
Marc Zinnschlag
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
2012-02-13 16:36:57 +01:00
Marc Zinnschlag
1a6a49b9b8
Merge remote branch 'lgro/fix_warnings'
2012-02-13 11:06:41 +01:00
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
Jacob Essex
cd0df082df
Textures are now blended between cells and the texture blending functions are now more abstract
2012-01-23 17:19:54 +00: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
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
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