Marc Zinnschlag
6bd48d12af
Issue #107 : SoundManager is accessed only through the interface class from now on
2012-08-09 14:33:21 +02:00
Marc Zinnschlag
d00d40cc3f
Issue #107 : Journal is accessed only through the interface class from now on
2012-08-09 12:56:03 +02:00
Marc Zinnschlag
923109b260
Issue #107 : DialogueManager is accessed only through the interface class from now on
2012-08-09 10:35:53 +02:00
scrawl
15a16aeba1
Fixed DirectX HLSL shaders and re-enabled them in the gui
2012-08-01 04:11:16 +02:00
Marc Zinnschlag
db10baafe1
Merge branch 'scriptconsole'
2012-07-30 12:43:48 +02:00
Marc Zinnschlag
fd6c155118
Issue #352 : added --script-run switch
2012-07-30 12:37:46 +02:00
Marc Zinnschlag
23f8595b87
Issue #352 : refactored script execution in console
2012-07-30 11:57:19 +02:00
Marc Zinnschlag
90de02b901
Issue #350 : console only script instructions
2012-07-30 11:43:28 +02:00
Marc Zinnschlag
78fe6fdce5
Issue #351 : Refactoring Action class
2012-07-27 12:00:10 +02:00
Marc Zinnschlag
2d080ce4ef
compile fix
2012-07-23 21:47:53 +02:00
Marc Zinnschlag
483a6d8605
Merge remote branch 'scrawl/shadersystem'
2012-07-23 21:46:06 +02:00
scrawl
02a52c0ff1
fixed some more settings bugs
2012-07-23 21:39:22 +02:00
scrawl
3ebc6fd590
fixed a settings window bug
2012-07-23 20:50:56 +02:00
scrawl
a70f93b024
fix "Crash when running openmw with --start="XYZ", remove HLSL for windows
2012-07-23 20:12:42 +02:00
Marc Zinnschlag
2c5d3d8df9
Merge remote branch 'scrawl/shadersystem' into shadersystem
...
Attention: We have submodules again. Don't forget to update!
Conflicts:
components/files/configurationmanager.cpp
2012-07-23 14:12:21 +02:00
greye
32b1350b63
CreatureStats class
2012-07-22 18:29:54 +04:00
scrawl
f5ffea4d4b
new button, water timescale
2012-07-19 23:30:41 +02:00
scrawl
e077814a8c
water
2012-07-19 22:23:07 +02:00
scrawl
4434fb640e
Merge branch 'master' into shadersystem
2012-07-17 19:12:02 +02:00
Marc Zinnschlag
2c70a93553
Merge branch 'master' into potions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
2012-07-17 10:32:18 +02:00
Marc Zinnschlag
0d3a7d482e
Merge remote branch 'modred11/master'
2012-07-17 10:21:46 +02:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00
Carl Maxwell
e4d046f69c
Prepending m to the name of every member variable.
...
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
2012-07-13 03:51:58 -07:00
scrawl
e0a99f104b
settings tab "shadows"
2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc
shader mode button in settingswindow
2012-07-11 03:19:51 +02:00
Marc Zinnschlag
6277e39216
Merge branch 'master' into skillgain
2012-07-07 20:27:56 +02: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
Marc Zinnschlag
d30ba14a17
Issue #324 : Finished turning NpcStats into a proper class
2012-07-06 18:23:48 +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
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
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
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
70ac1c818d
Merge remote branch 'scrawl/settingswindow'
2012-06-27 09:02:29 +02:00
scrawl
232fe0be8c
fix for the directx crash
2012-06-26 18:03:52 +02:00
scrawl
30e86e1b9d
settings window resolution sorting, aspect ratio
2012-06-26 15:41:13 +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
scrawl
98f13ebcc0
Merge branch 'misc' of github.com:scrawl/openmw into misc
2012-06-21 12:15:43 +02:00
Marc Zinnschlag
ad251065f4
removed more cout spam
2012-06-21 12:00:56 +02:00
scrawl
15e959868c
make some of the gui mode changes a bit safer
2012-06-19 17:07:00 +02:00
scrawl
ff278ab4ec
chargen generate class: fix result not being shown in review dialog
2012-06-19 15:25:04 +02:00