mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 05:49:56 +00:00
Code Issues Releases Wiki Activity
1873 commits 38 branches 54 tags 122 MiB
Commit graph

1873 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikolay Kasyanov
ee92da3c4a Merge remote-tracking branch 'upstream/master' 2012-02-15 11:33:53 +04:00
Nikolay Kasyanov
2020d916ec added missing comment 2012-02-15 11:30:35 +04:00
Nikolay Kasyanov
57a4b19880 Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete 2012-02-15 11:27:51 +04:00
Marc Zinnschlag
7b457c05bc updated readme 2012-02-14 09:39:58 +01:00
Marc Zinnschlag
8277df04b1 bumping version number 2012-02-14 09:26:06 +01:00
Marc Zinnschlag
e1defd3595 adjusted the globally installed openmw.cfg file 2012-02-14 09:25:12 +01:00
Marc Zinnschlag
9af08ff18d store screenshots in user directory instead of local directory 2012-02-13 18:34:21 +01:00
Marc Zinnschlag
77201d05bc post-merge fix 2012-02-13 16:42:01 +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
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
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
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
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
Marc Zinnschlag
4fcb721054 openengine update (physics crash workaround 2012-02-10 14:59:22 +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
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
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
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
Cris Mihalache
ed5892eb5c Finished moving the bulk of character creation code 2012-01-30 21:53:17 +02:00
Cris Mihalache
d17ba6ce19 Forgot the CharacterCreation files 2012-01-30 19:27:49 +02:00
Cris Mihalache
4b758376be Created a class for char gen, and starting moving code to it 2012-01-30 16:38:43 +02:00
Marc Zinnschlag
78b6ceabc7 Merge branch 'refdata' into equipment 2012-01-30 12:38:55 +01:00
Marc Zinnschlag
e19cea3e7b Merge branch 'refdata' into next 2012-01-30 12:38:35 +01:00
Marc Zinnschlag
a4785ffc4f minor fix 2012-01-30 12:38:13 +01:00
Jason Hooks
2d0e83a2cf Reversing changes 2012-01-30 00:06:29 -05:00
Jason Hooks
d2b3c1dbac Collision may be working correctly 2012-01-29 18:13:43 -05:00
Jason Hooks
9c73fa6b6d Physics sort of fixed 2012-01-29 17:50:51 -05:00