mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 09:26:38 +00:00
Code Issues Releases Wiki Activity
15016 commits 115 branches 76 tags 128 MiB
Commit graph

15016 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
10d4771550 Merge remote branch 'corristo/osx-packaging' 2012-02-13 16:35:13 +01:00
Marc Zinnschlag
1a6a49b9b8 Merge remote branch 'lgro/fix_warnings' 2012-02-13 11:06:41 +01:00
Nikolay Kasyanov
5a42c6c6f5 Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher 2012-02-13 10:31:43 +04:00
gugus
bc72b2d535 fixed text color 2012-02-12 22:24:23 +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
d66b6743f4 minor fix 2012-02-12 13:58:02 +01:00
Marc Zinnschlag
d9945a976d Merge remote branch 'gus/DialogueSystem' into dialogue 2012-02-12 13:47:04 +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
Marc Zinnschlag
facc36fa34 Merge remote branch 'corristo/osx-packaging' into packaging 2012-02-12 13:35:54 +01:00
Marc Zinnschlag
8ae2120e15 Merge remote branch 'ace/win-packaging' into packaging 2012-02-12 13:35:33 +01:00
Marc Zinnschlag
a0ac6e5150 cells were sometimes not fully loaded 2012-02-12 12:35:29 +01:00
Jacob Essex
286701e3a5 Removed the flawed shading, updated textures, removed the need for a unused base texture 2012-02-11 20:54:29 +00:00
gugus
4d4ae41a4a greetings are working now 2012-02-11 12:19:02 +01:00
gugus
4658ec276f increased the max size of the text of the dialogue 2012-02-11 12:18:47 +01:00
gugus
eee5d20809 a little fix 2012-02-10 22:54:17 +01:00
gugus
f1dc360720 added the script instruction addTopic 2012-02-10 22:02:24 +01:00
gugus
554bf8e586 Improvement in the dialogue manager 2012-02-10 22:01:31 +01:00
Lukasz Gromanowski
4fae3bd7c6 Merge pull request #3 from pvdk/config 
Changed the order of preference for the configuration files
 2012-02-10 12:50:58 -08:00
Pieter van der Kloet
eea8773be1 Changed the order of preference for the configuration files 2012-02-10 21:45:46 +01:00
Marc Zinnschlag
bc71fb47e0 minor fix 2012-02-10 21:24:33 +01:00
Pieter van der Kloet
17b1546dc1 Changed the way screenshots are created (Bug #191) 2012-02-10 20:23:59 +01:00
gugus
94ab65f8bb fixe a compiling error? 2012-02-10 16:21:04 +01:00
gugus
ea8335a393 addTopic function 2012-02-10 16:09:43 +01:00
Marc Zinnschlag
4fcb721054 openengine update (physics crash workaround 2012-02-10 14:59:22 +01:00
Marc Zinnschlag
4a188f2820 Merge remote branch 'gus/master' 2012-02-10 14:57:51 +01:00
Marc Zinnschlag
bb7730a708 Merge branch 'lightfix' 2012-02-10 14:55:52 +01:00
gugus
597e670eef corrected the light problem 2012-02-10 14:51:49 +01:00
Marc Zinnschlag
00ac2deefb Merge remote branch 'pvdk/cmakeogre' into cmakeogre 2012-02-10 14:36:34 +01:00
Marc Zinnschlag
b878c87ba8 Merge branch 'renderingfix' 2012-02-10 14:33:27 +01:00
gugus
e7ef39cabc more improvements to dialogue filters. Some of them are still missing. 2012-02-09 19:27:15 +01:00
gugus
f76e0e1941 corrected the light problem 2012-02-08 00:32:22 +01:00
Pieter van der Kloet
7bf8497215 Fixed CMake problem with Ogre plugins path 2012-02-07 21:41:08 +01:00
Pieter van der Kloet
efe3a3fcbe Merge branch 'master' of https://github.com/zinnschlag/openmw into cmakeogre 2012-02-07 21:38:16 +01:00
Jacob Essex
9cc3af34e5 Removed composite maps, fixes to texture sizes and unloading 2012-02-07 12:41:08 +00:00
gugus
8affa30ff1 magic commit that fixe the crash when activating collision after changing cell. 
To be faire, this commit should break the collision system... there must be something I don't understand with bullet ghost objects :p
 2012-02-06 23:15:19 +01:00
Marc Zinnschlag
c4e028effe fixing a faulty include 2012-02-06 10:48:58 +01:00
Marc Zinnschlag
0b0254d30e spelling fix 2012-02-06 10:48:14 +01:00
Marc Zinnschlag
784c6fe0ff some cleanup 2012-02-06 10:41:13 +01:00
Marc Zinnschlag
e1600d9a2a fixed movable object cleanup for ordinary objects 2012-02-06 10:29:18 +01:00
Marc Zinnschlag
c471aa950f re-enabled batching for statics; fixed a misplaced assert 2012-02-06 09:42:24 +01:00
gugus
c65c160e7b finished connecting the dialogue GUI and the dialogue manager 2012-02-05 12:25:23 +01:00
gugus
abe38e5f87 Started to weire the dialogue manager and the dialogue GUI 2012-02-05 10:54:56 +01:00
Nikolay Kasyanov
df6d9c7fa4 Merge remote-tracking branch 'upstream/master' 2012-02-04 13:50:08 +04:00
Marc Zinnschlag
ee02154805 lights without a mesh were not rendered 2012-02-04 10:48:15 +01:00
Marc Zinnschlag
52a6605f10 Merge remote branch 'mirc/refactor_wm' into refactor_wm 
- changed the way dynamics stats are passed to the character creation object
- some more clean up

Conflicts:
	.gitignore
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
 2012-02-03 11:24:28 +01:00
Marc Zinnschlag
c447ea073c Merge branch 'cmakefix' into next 2012-02-03 10:31:16 +01:00
Cris Mihalache
4bc7051741 Finished refactoring, brought CharacterCreation up to standards 2012-02-02 18:31:28 +02:00
Nikolay Kasyanov
472d88e2c5 Feature #162 - Need to create app bundle using CMake, not by hand WIP 2012-02-01 20:48:13 +04:00
Pieter van der Kloet
c255c519e4 Replaced FindOGRE.cmake, this one looks for debug libraries too 2012-01-31 21:10:40 +01:00