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
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
Marc Zinnschlag
4f304cfff2
Merge remote branch 'jhooks/directories' into directories
2011-06-08 00:29:12 +02:00
Jason Hooks
4d31ca2c86
Leading slashes now work, efficiency changes
2011-06-07 17:17:25 -04:00
Marc Zinnschlag
5fb3dc854b
Merge branch 'optimisation'
2011-06-07 10:21:29 +02:00
Marc Zinnschlag
ac4af583b7
Merge remote branch 'jhooks/directories' into directories
2011-06-07 09:22:58 +02:00
Jason Hooks
45453fd7a9
Case insensitive external loader working
2011-06-06 20:11:23 -04:00
Jason Hooks
f2a0fa8af2
Adding files to directory map
2011-06-05 23:46:18 -04:00
Marc Zinnschlag
a95a0f821b
Merge remote branch 'jhooks/directories' into directories
...
Conflicts:
components/files/multidircollection.hpp
2011-06-04 10:27:16 +02:00
Jason Hooks
2aaa0f4578
Backslash working in linux
2011-06-04 01:29:57 -04:00
Jason
b92955763a
Introducing Dir Archive
2011-06-03 20:28:47 -04:00
athile
231be8f381
Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file).
2011-05-31 21:55:08 -06:00
Jason Hooks
51b74c2f05
starting
2011-05-23 19:01:36 -04:00
Jason Hooks
b945ce61a5
Merge remote branch 'upstream/master'
2011-05-23 15:01:47 -04:00
gugus
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)
2011-05-23 14:59:36 +02:00
gugus
b05f780675
fix a compiler error under window
2011-05-23 14:56:19 +02:00
Marc Zinnschlag
80691250ec
don't create a new virtual machine for each script and frame
2011-05-18 16:01:19 +02:00
Marc Zinnschlag
a133920eb0
boost filesystem fix
2011-05-10 09:32:47 +02:00
Marc Zinnschlag
d9f1b64213
some file collection bug fixing
2011-05-05 21:39:52 +02:00
Marc Zinnschlag
6e880cffb2
changed engine class to support multiple data directories for esm files
2011-05-05 19:32:42 +02:00
Marc Zinnschlag
d260e5c1bd
added file collection class
2011-05-05 19:00:00 +02:00
Marc Zinnschlag
5b6ec405e3
Merge branch 'script'
2011-04-28 10:30:32 +02:00
Marc Zinnschlag
7f0a75c803
Merge branch 'config'
2011-04-28 10:26:51 +02:00
Marc Zinnschlag
3cb994764c
Merge remote branch 'corristo/header-refactoring'
2011-04-28 10:22:33 +02:00
Marc Zinnschlag
bdfd28f44d
adjusted components/files namespace; some related cleanup
2011-04-28 09:56:50 +02:00
Marc Zinnschlag
7131c08ca4
moved path.hpp/path.cpp to a new component
2011-04-28 09:39:40 +02:00
Marc Zinnschlag
861dc6a16e
redirecting output of expression evalutation to new report channel
2011-04-26 22:07:27 +02:00
Marc Zinnschlag
125319c441
splitting off console output from messageBox channel
2011-04-26 21:48:13 +02:00
Jason Hooks
2ac1cc8aee
Trying to animate creatures
2011-04-13 20:16:46 -04:00
Jason Hooks
d035441876
Reintroducing animation
2011-04-11 20:56:06 -04:00
Nikolay Kasyanov
79911b16d0
Fixed enum formatting in components/esm headers
2011-04-08 22:26:27 +04:00
Marc Zinnschlag
7c506301b7
Merge remote branch 'corristo/header-refactoring' into header-refactoring
...
Conflicts:
CMakeLists.txt
2011-04-08 19:24:21 +02: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
a94de76801
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
2011-04-03 13:20:42 +02:00
Pieter van der Kloet
833a61dd82
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
2011-03-28 17:36:05 +02:00
Marc Zinnschlag
c571148bef
Merge branch 'collision'
2011-03-23 22:57:56 +01:00
gugus
3ad2b9986e
fix actors not beeing deleted. Need the latest OEngine.
2011-03-23 19:16:51 +01:00
Marc Zinnschlag
d7226fc9c2
Merge branch 'tab_completion'
2011-03-23 17:08:52 +01:00
gugus
b2194398a4
fixed a bug in loading. Every collision mesh is correctly loaded now.
2011-03-23 13:42:28 +01:00
gugus
9d4cda6510
OEngine doesn't rely on OpenMW anymore
2011-03-18 13:22:09 +01:00
gugus
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
2011-03-15 13:36:25 +01:00
Jan-Peter Nilsson
229a91a625
Remove unused code/dependencies
2011-03-12 13:20:28 +01:00
Nikolay Kasyanov
3552ad045d
Removed obsolete macBundlePath function from fileops.cpp. Using Ogre::macBundlePath
2011-03-09 21:54:01 +03:00
Marc Zinnschlag
ecfe57caf2
platform check fix
2011-03-09 18:50:24 +01:00
Nikolay Kasyanov
3d75eea377
Merge remote-tracking branch 'upstream/master'
2011-03-08 19:03:20 +03: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
Jan-Peter Nilsson
d68141d203
Remove unused variables
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
9ee83caaa2
Avoid crash when no bones are available
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
696861349e
Rename skel to mSkel
2011-03-07 19:13:24 +01:00
Nikolay Kasyanov
4028600768
Builds on OS X now
2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
26b780d1ac
Remove unused variables and fix signed/unsigned comparison to make the compiler happy
2011-02-27 00:48:49 +01:00
Marc Zinnschlag
1e9dc4b435
de-Windownizing and some build-fixes
2011-02-26 16:37:47 +01:00
gugus
86ded891d9
modified the nif loader for shapes used for raycasting only.
2011-02-22 20:53:58 +01:00
gugus
d3c1640723
add physic support
2011-02-22 14:11:53 +01:00
gugus
1dc452ec91
Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions
2011-02-11 13:33:45 +01:00
Marc Zinnschlag
6a14ea8ec3
handle physics during player changing cells
2011-01-29 16:57:33 +01:00
gugus
a8ade56c80
Add a bullet Shape Loader
2011-01-13 17:51:50 +01:00
Marc Zinnschlag
d865c3cfc6
backend for tab completion: identifiers
2011-01-12 18:48:37 +01:00
Marc Zinnschlag
6848115c18
backend for tab completion: keywords
2011-01-12 18:24:00 +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
Jason Hooks
11406ae6f3
cleanupandupdate
2011-01-01 11:45:11 -05:00
Marc Zinnschlag
5336b90149
music player and NPC rendering branch
2010-12-30 14:50:35 +01:00
Jason Hooks
60601682cd
Beast races fixed
2010-12-21 21:45:54 -05:00
Jason Hooks
1896a6a2e8
Preliminary npcs4
2010-12-13 16:01:52 -05:00
Jason Hooks
467988455c
Preliminary npcs3
2010-12-12 22:05:47 -05:00
Jason Hooks
13d8ea09b0
Cell case insensitivity, exterior and interior cells
2010-10-27 23:22:01 -04:00
Jason Hooks
ffaaad188a
using theirs
2010-10-27 12:32:50 -04: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