mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 18:32:36 +00:00
Code Issues Projects Releases Wiki Activity
2,484 Commits 18 Branches 66 Tags
Commit Graph

1519 Commits

Author SHA1 Message Date
Pieter van der Kloet
2429f3960f Merge remote-tracking branch 'upstream/master' into launcher 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
 2012-03-05 23:43:59 +01:00
Marc Zinnschlag
25f5bdf7aa Merge remote branch 'scrawl/weather' 2012-03-05 22:45:52 +01:00
scrawl
3ea2a9f05d changeWeather bugfix 2012-03-05 19:13:11 +01:00
Marc Zinnschlag
69f0ec99f1 implemented dialogue scripts 2012-03-05 16:56:14 +01:00
Michael Papageorgiou
1776ede9e1 Broken sound path fix 2012-03-05 16:06:46 +02:00
Marc Zinnschlag
65756db49e Merge remote branch 'gus/DialogueSystem' into dialogue 2012-03-05 11:34:16 +01:00
Marc Zinnschlag
4bdfbb6d4f Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-03-05 11:34:06 +01:00
Marc Zinnschlag
896c7d9fa5 Merge remote branch 'scrawl/batching2' 2012-03-05 10:54:55 +01:00
Marc Zinnschlag
e7fa1d94b8 Merge remote branch 'scrawl/shapefix' 2012-03-05 10:51:18 +01:00
scrawl
42a7375a0b adjusted the batch region size, this was the cause for lights going on/off bug 2012-03-04 23:26:35 +01:00
scrawl
ff8f95fcca fix batch lighting, removed the "bumping number of lights" hack 2012-03-04 23:18:40 +01:00
scrawl
8910b0d471 use shaders for all NIF materials. this has numerous advantages: 
- vertex colours are now working as they should (and they have a huge impact on the look)
 - the lighting is per pixel and looks a lot better
 - by using shaders, we can use more lights at a time (fixed function has max of 8)
 2012-03-04 20:59:23 +01:00
Jason Hooks
a81ecb5f65 Bug 210 fix 2012-03-03 18:26:11 -05:00
scrawl
d74b78a302 very minor performance improvement 2012-03-03 12:26:08 +01:00
scrawl
ba0365a427 collision shape scale fix 2012-03-02 16:47:39 +01:00
Marc Zinnschlag
1e998545c7 fixed log path 2012-03-02 15:15:44 +01:00
Marc Zinnschlag
be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 2012-03-02 12:11:44 +01:00
Michael Papageorgiou
b3159683a4 Replace gengetopt with bullet program options for esmtool's argument handling 2012-03-02 04:41:29 +02:00
Nikolay Kasyanov
b283ad86fb revert to old launcher stylesheet location on OS X 2012-03-01 17:16:44 +04:00
Michael Papageorgiou
185cd63462 ESMTool set to use default Latin encoding 2012-03-01 14:19:27 +02:00
Pieter van der Kloet
5ffa3264b2 Appended resources/ to the stylesheet path 2012-03-01 04:38:37 +01:00
Marc Zinnschlag
3c5f8a4a23 void pointer workaround 2012-02-29 10:13:25 +01:00
Marc Zinnschlag
ed0fa255b0 Merge remote branch 'scrawl/weather' into next 2012-02-28 23:33:22 +01:00
Pieter van der Kloet
11ec5cf2e2 Stylesheet location changed in CMakeLists and some minor fixes to the launcher 2012-02-28 22:45:03 +01:00
Pieter van der Kloet
b320733e45 Fixed Qt exits, this time for all occurrences 2012-02-28 21:00:02 +01:00
scrawl
c8aab3a562 fix sun angle 2012-02-28 20:28:46 +01:00
Pieter van der Kloet
5b54a658d8 Launcher improvements: ask for data dir and write it to cfg if none is found 
and prevent removal of the default profile
 2012-02-28 17:19:44 +01:00
Pieter van der Kloet
1512481c07 Changed the way whitespace was removed from retrieved Ogre values 2012-02-28 17:18:01 +01:00
scrawl
b3db4f1c27 slightly improved moon fading 2012-02-28 15:20:46 +01:00
Marc Zinnschlag
7aaa7f185f same for launcher 2012-02-28 09:46:48 +01:00
Marc Zinnschlag
4c2fffdd61 temporarily disabled multi data path support in OpenMW 2012-02-28 09:27:35 +01:00
Marc Zinnschlag
2c20aeab90 Merge remote branch 'werdanith/activationsounds' into next 2012-02-27 18:24:33 +01:00
Marc Zinnschlag
2608491906 Merge remote branch 'corristo/master' 2012-02-27 16:05:04 +01:00
Nikolay Kasyanov
d58b408ae1 Deploying Qt image format plugins on OS X considered useless 2012-02-27 19:00:06 +04:00
Michael Papageorgiou
fe977fe313 More container and door trap fixes 2012-02-27 16:59:45 +02:00
Michael Papageorgiou
28fdfb0f99 Added container locked and trapped activation sounds 2012-02-27 16:37:05 +02:00
Marc Zinnschlag
739870489a Merge remote branch 'scrawl/weather' into weather 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-02-27 15:02:03 +01:00
scrawl
c9ceb74e5c transition fix 2012-02-27 12:21:00 +01:00
Michael Papageorgiou
c6861ed2a9 Added door activation sounds 2012-02-27 09:39:35 +02:00
Jason Hooks
36e9322830 a few changes2 2012-02-26 21:43:04 -05:00
Jason Hooks
8d7a5f469b a few changes 2012-02-26 21:27:54 -05:00
Marc Zinnschlag
053a2996d2 fix for non-standard erase function 2012-02-26 23:31:16 +01:00
Alexander "Ace" Olofsson
be8690e333 Fix for debug crash on windows 2012-02-26 22:45:17 +01:00
scrawl
8b0ef8f98c improvements to sun glare 2012-02-26 20:46:09 +01:00
scrawl
932983c2fa fix toggleSky 2012-02-26 18:21:11 +01:00
scrawl
c1d39bb35f tweaked cloud color 2012-02-26 15:54:52 +01:00
scrawl
f79bf1f300 fog 2012-02-26 13:13:29 +01:00
scrawl
528cff5a59 implemented ChangeWeather script function 2012-02-26 11:51:02 +01:00
scrawl
a05ba97382 choose a random weather depending on region's weather probabilities 2012-02-25 23:41:02 +01:00
scrawl
d77d5080bd implemented GetCurrentWeather script function 2012-02-25 21:34:38 +01:00