Pieter van der Kloet
469d608f51
Merge remote-tracking branch 'upstream/master' into launchernext
2013-02-25 21:26:54 +01:00
Marc Zinnschlag
a535d51cbf
Merge branch 'brokenendfix'
2013-02-25 19:52:22 +01:00
Chris Robinson
5f2c897001
Better handle which collision shapes to load
2013-02-25 10:29:48 -08:00
Chris Robinson
ff1ecb85c6
Don't bother storing the shape name for the submesh name
...
The submesh name Ogre has is completely useless to us
2013-02-25 08:22:57 -08:00
Marc Zinnschlag
151ecaad04
workaround for garbage after an end statement
2013-02-25 10:32:38 +01:00
Chris Robinson
53eb553c57
Be a little more aggressive when looking to skip generating a skeleton
...
This is needed to handle the insane number of nodes and trishapes in
in_prison_ship.nif, as Ogre has a 256-bone limit for skeletons. This is a bit
sketchy, but it works.
2013-02-24 18:12:15 -08:00
Pieter van der Kloet
6eaaf20c94
Merge remote-tracking branch 'upstream/master' into launchernext
2013-02-25 00:56:23 +01:00
Chris Robinson
c60e858b02
Create bones for NiTriShape nodes, and attach the entities to them
...
Otherwise some models don't connect properly. NiTriShapes are more guaranteed
to have unique names than their parent nodes.
2013-02-24 12:42:32 -08:00
Chris Robinson
db9a3aeddf
Merge remote-tracking branch 'zini/master' into animation2
2013-02-24 03:32:35 -08:00
Nathan Jeffords
44b1c66c4b
fixed various warnings about converting size_t to int
2013-02-23 10:23:38 -08:00
Chris Robinson
3c0b29de45
Merge remote-tracking branch 'zini/master' into animation2
2013-02-22 01:34:22 -08:00
greye
82595e66b2
another missing header for #576
2013-02-21 22:47:18 +04:00
Marc Zinnschlag
9b7957cf20
fixed a missing inlcude
2013-02-21 19:27:07 +01:00
Chris Robinson
6ae00be8a3
Fix nifbullet shape transformation
2013-02-19 22:28:15 -08:00
scrawl
f4749f10da
NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this)
2013-02-20 05:35:52 +01:00
Pieter van der Kloet
35b68a3c40
Fixed accidental profile deletion and added sorting by date
2013-02-19 15:58:01 +01:00
Pieter van der Kloet
37fe31e858
Merge remote-tracking branch 'upstream/next' into settings_selwidget
2013-02-19 01:12:47 +01:00
Pieter van der Kloet
178cf2154e
Made checking/unchecking work with the new datafiles model
2013-02-18 17:59:08 +01:00
Chris Robinson
e2d7cc49e3
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 03:42:37 -08:00
Douglas Mencken
df5919f2c5
Use `signed char' explicitly where needed. It is important because:
...
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
and unsigned char.
- Assuming that char is always unsigned or signed can lead to
compile-time and run-time errors.
You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).
Conflicts:
components/esm/loadcell.hpp
2013-02-15 20:28:14 +01:00
Pieter van der Kloet
fd430dc5a9
Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget
...
Conflicts:
apps/launcher/datafilespage.cpp
components/fileorderlist/datafileslist.cpp
2013-02-15 15:38:30 +01:00
Pieter van der Kloet
ee27e3bb58
Merge remote-tracking branch 'upstream/next' into settingsnext
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
apps/launcher/datafilespage.hpp
apps/launcher/graphicspage.cpp
components/fileorderlist/utils/filedialog.cpp
components/fileorderlist/utils/filedialog.hpp
2013-02-15 15:21:14 +01:00
Chris Robinson
da5f11700f
Warn about unhandled node types before the controllers
2013-02-13 00:45:00 -08:00
Chris Robinson
5b2ca6fa7d
Don't complain about RootCollisionNode, it's handled in nifbullet
2013-02-13 00:43:29 -08:00
Michal Sciubidlo
f4d60ae7b2
Files sorting (masters then plugins).
...
Remove unneeded includes.
2013-02-10 19:59:25 +01:00
Michal Sciubidlo
0df7c7e5c1
Rename mPlugins* to mFiles*
2013-02-10 14:08:54 +01:00
Michal Sciubidlo
e4ed397b2d
Merge plugins and masters list view in openDialog. Simplify datafilesmodel.
2013-02-10 14:02:06 +01:00
Chris Robinson
f4e587c72c
Always create a skeleton from a NIF when there's more than one NiNode
2013-02-09 17:48:23 -08:00
Chris Robinson
f197c67e95
Fix a circular include
2013-02-09 12:46:20 -08:00
Chris Robinson
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
2013-02-09 09:46:57 -08:00
Marc Zinnschlag
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
2013-02-09 15:30:29 +01:00
Mark Siewert
eefbdde6de
- For pull request: remove all instances of maps used to track refnumbers.
...
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
2013-02-09 13:00:57 +01:00
Marc Zinnschlag
d5dd0640c7
basic gmst support
2013-02-08 09:58:19 +01:00
Chris Robinson
8b1e7b95ba
Attempt to load the skeleton source if it doesn't yet exist
2013-02-05 17:55:12 -08:00
Michal Sciubidlo
347a734364
Move OpenDialog to editor and use it in startup dialogue.
...
Remove debug output from DataFilesList.
2013-02-05 22:06:36 +01:00
Michal Sciubidlo
f7e5ea24f4
Merge branch 'startup' into cs_load.
...
Fix include in textinputdialog.cpp.
2013-02-05 21:23:49 +01:00
Chris Robinson
bd4fdf47a3
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/sky.cpp
2013-02-05 02:27:57 -08:00
Michal Sciubidlo
66ec4ca7d9
Split launcher specific code from DataFilesList back to DataFilesPage.
2013-02-04 22:14:14 +01:00
Chris Robinson
bec538bfa1
Always declare operator<< for using a TextKeyMap with Ogre::Any
2013-02-04 09:19:59 -08:00
Mark Siewert
3e43db5f76
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-03 16:14:41 +01:00
Chris Robinson
c45b4d6072
Clean up some NIF warning reports
2013-02-02 22:27:08 -08:00
Michal Sciubidlo
155cca0c9a
Upload missing files.
...
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
2013-02-02 18:36:01 +01:00
Chris Robinson
e6e7c69013
Fix handling of filtered entities
2013-02-02 05:26:52 -08:00
Marc Zinnschlag
85697e4628
reverted to C++03
2013-02-02 13:24:28 +01:00
Michal Sciubidlo
492482de7f
Add "open" option in opencs.
2013-02-01 00:42:03 +01:00
Chris Robinson
c6a9ea5007
Use the skeleton as defined in the NIF model
...
The avoids having to duplicate models that get attached to different character
skeletons.
2013-01-30 22:37:39 -08:00
Michal Sciubidlo
ac62dd050d
Rename datafilespage to datafileslist
2013-01-30 21:08:27 +01:00
Michal Sciubidlo
f029a9011a
Move datafilespage to shared space.
2013-01-30 20:21:03 +01:00
Chris Robinson
b6354c6282
Don't share skeleton instances between bounded parts on an NPC
...
However, a skeleton instance will still be shared between entities in an entity
list.
2013-01-30 09:29:16 -08:00
Chris Robinson
0853fa335c
Avoid redundant string concatenations
2013-01-29 01:36:17 -08:00
