Chris Robinson
98ae7168b1
Fix double-incrementing a pointer
2012-07-10 00:24:18 -07:00
Chris Robinson
b3aa453f9a
Use Ogre data streams for loading NIFs
2012-07-09 22:02:12 -07:00
Chris Robinson
0143cacd2b
Avoid returning pointers from NIFFile
2012-07-09 21:35:36 -07:00
Chris Robinson
d3a31a24ce
Use proper strings and vectors instead of slice arrays for NIF files
...
Slice arrays use pre-allocated pointers whose memory is managed externally. This is
unnecessary and ultimately detrimental since it prevents any kind of data fixup
(e.g. little endian to big endian, p[adding handling), and it also makes it difficult
to use Ogre data streams.
2012-07-09 21:08:23 -07:00
gugus
557e114992
clean-up + getScale/Angle script instructions
2012-07-09 19:28:44 +02:00
gugus
0a67f60a6e
Clean-up
2012-07-09 18:47:59 +02:00
gugus
e6716c25c3
little correction.
2012-07-09 15:41:19 +02:00
gugus
feec67094f
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwworld/physicssystem.cpp
2012-07-09 15:23:26 +02:00
gugus
03f7740474
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/worldimp.hpp
2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d
merge
2012-07-07 15:27:04 -04:00
Alexander "Ace" Olofsson
113457d934
Fixed some windows issues and got rid of a few tiny warnings while at it.
2012-07-07 01:14:18 +02:00
scrawl
1a5203749f
fix "error in framelistener" when trying to pick up lights that can't be picked up
2012-07-05 17:13:23 +02:00
Chris Robinson
d8d00123ea
Watch for empty children node refs when setting parents
2012-07-03 18:37:04 -07:00
Chris Robinson
832247bff2
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nif/data.hpp
2012-07-03 15:29:18 -07:00
scrawl
78efc31641
different default coordinates for container window to prevent it from going invsible when changing resolution (bug #308 ), fixed some windows not centering when resolution change
2012-07-03 16:51:29 +02:00
scrawl
085891879c
fixed another resolution change bug introduced recently
2012-07-03 16:44:20 +02:00
Marc Zinnschlag
205ed0ce5b
post merge fix
2012-07-03 15:53:42 +02:00
Marc Zinnschlag
cc7c6aa0ad
Merge branch 'decouple'
2012-07-03 15:47:57 +02:00
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
2012-07-03 15:32:38 +02:00
Marc Zinnschlag
87667ab57e
Issue #107 : Ptr related include cleanup
2012-07-03 13:55:53 +02:00
Marc Zinnschlag
5a7b95bf7a
Issue #107 : cleaned up includes in apps/openmw/mwworld/class.hpp
2012-07-03 13:15:20 +02:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
scrawl
d27863bf8e
rename layout files to .layout to get them recognized by layout editor
2012-07-03 11:34:20 +02:00
Chris Robinson
291599c609
Store the parents of NIF's nodes
2012-07-02 22:49:44 -07:00
Chris Robinson
046e9686f9
Cleanup RecordPtrT
...
This moves the index resolution into a separate post method instead of always
checking when access. As a result, it reduces the size of it down to the size
of a pointer, as opposed to 2 pointers + 1 int. The appropriate methods are
added to the various node types to make sure they're resolved.
2012-07-02 21:41:21 -07:00
Marc Zinnschlag
035c1c4b6e
added World interface class; cleanup of World interface
2012-07-03 01:06:38 +02:00
Marc Zinnschlag
efb95e2f83
Issue #317 : check if spell actually exist in AddSpell
2012-07-02 14:25:46 +02:00
Pieter van der Kloet
2db6e4f4cf
Second try: added aspect ratios to the resolution combobox
2012-06-29 19:13:12 +02:00
Marc Zinnschlag
7fcd41c69d
Issue #107 : Detemplateised CellStore; some include cleanup
2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
Marc Zinnschlag
fc063472d0
Revert "Added aspect ratio info to the list of resolutions"
...
This reverts commit be5e047106
2012-06-29 14:41:19 +02:00
Marc Zinnschlag
e5cdc988a6
Merge remote branch 'pvdk/launcher'
2012-06-28 10:14:03 +02:00
Pieter van der Kloet
dded604eca
Improved launcher images made by serpentine
2012-06-28 05:16:26 +02:00
Pieter van der Kloet
be5e047106
Added aspect ratio info to the list of resolutions
2012-06-28 02:06:42 +02:00
Marc Zinnschlag
2603bca7d0
Merge remote branch 'scrawl/shutdowncrash'
2012-06-27 09:05:12 +02:00
Marc Zinnschlag
70ac1c818d
Merge remote branch 'scrawl/settingswindow'
2012-06-27 09:02:29 +02:00
scrawl
b73b39f3c6
launcher bugfix, settings was not written when "Play" was selected
2012-06-27 00:55:25 +02:00
scrawl
87127775e8
fix shutdown crash if ogre was not initialised yet
2012-06-26 19:10:47 +02:00
scrawl
232fe0be8c
fix for the directx crash
2012-06-26 18:03:52 +02:00
scrawl
c37b14f5f7
Merge pull request #5 from pvdk/master
...
Sorting of graphics values
2012-06-26 06:47:39 -07:00
scrawl
30e86e1b9d
settings window resolution sorting, aspect ratio
2012-06-26 15:41:13 +02:00
Pieter van der Kloet
e5159a1950
Modified sorting of the values in the Graphics Page
2012-06-26 15:37:40 +02:00
Pieter van der Kloet
77ac8760d1
Cleaned up the GUI of the Graphics page
2012-06-26 03:07:54 +02:00
Pieter van der Kloet
6fe471c1c6
Resolutions are now sorted descendingly and removed some debug stuff
2012-06-26 02:41:54 +02:00
scrawl
797c2c538d
fix some settings bugs
2012-06-23 12:25:28 +02:00
Marc Zinnschlag
2b68e4d489
Merge remote branch 'scrawl/trianglebatchcount'
2012-06-22 14:30:00 +02:00
scrawl
63ce143a04
fix triangle / batch counts with compositors
2012-06-22 12:56:04 +02:00
Marc Zinnschlag
89dfa54b79
updated changelog
2012-06-21 13:06:34 +02:00
Marc Zinnschlag
68459441f2
adjusting version number
2012-06-21 12:40:44 +02:00
Marc Zinnschlag
4e3adbb805
Merge remote branch 'scrawl/graphics'
2012-06-21 12:36:08 +02:00
