gugus
|
07d8d654cd
|
one step toward function filters and end choices.
|
2012-03-14 18:47:29 +01:00 |
|
gugus
|
82c6b0f92a
|
choice function. Do not work.
|
2012-03-07 18:52:27 +01:00 |
|
gugus
|
6f7752633a
|
there was no extension in the compiler context. Corrected. But Choice doesn't work.
|
2012-03-07 18:44:09 +01:00 |
|
gugus
|
39415f0b4a
|
fix compilation bug with Visual C++
|
2012-03-07 17:35:10 +01:00 |
|
gugus
|
4990ba48ed
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
|
2012-03-07 09:47:46 +01:00 |
|
gugus
|
61914a70bd
|
Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem
|
2012-03-07 09:24:41 +01:00 |
|
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
|
e992a75615
|
Merge remote branch 'scrawl/vertexcolours'
|
2012-03-05 22:45:56 +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 |
|
scrawl
|
f7b706d24e
|
use the vertex colours that morrowind supplies for a lot of meshes
|
2012-03-05 18:50:56 +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
|
4c240c644f
|
OpenEngine update (log fix)
|
2012-03-05 10:58:33 +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
|
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
|
12b7c6f1ac
|
Merge remote branch 'corristo/master'
|
2012-03-02 12:11:53 +01:00 |
|
Marc Zinnschlag
|
be70d197e5
|
Merge branch 'next'
Conflicts:
.gitignore
cmake/FindOGRE.cmake
|
2012-03-02 12:11:44 +01:00 |
|
Nikolay Kasyanov
|
70da2a2a99
|
removed tabs
|
2012-03-02 14:18:10 +04:00 |
|
Marc Zinnschlag
|
8da0925e70
|
Merge remote branch 'corristo/master'
|
2012-03-02 11:18:07 +01:00 |
|
Nikolay Kasyanov
|
fa3fbf940c
|
Fix for OS X 10.6 support
|
2012-03-02 14:10:11 +04:00 |
|
Marc Zinnschlag
|
a86d2877fc
|
Merge remote branch 'ace/win64-fixes'
|
2012-03-02 11:00:41 +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 |
|
Michael Papageorgiou
|
a1cbc7fb42
|
Altered getFver to fix a warning
|
2012-03-01 14:00:45 +02:00 |
|
Alexander "Ace" Olofsson
|
2c4ef5c670
|
64-bit install path on windows was easier to fix than expected.
|
2012-03-01 08:13:40 +01:00 |
|
Pieter van der Kloet
|
5ffa3264b2
|
Appended resources/ to the stylesheet path
|
2012-03-01 04:38:37 +01:00 |
|
Alexander "Ace" Olofsson
|
b6915a6090
|
Forgot that IsWow64Process would return false on a native 64-bit application
|
2012-03-01 01:03:31 +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 |
|
Marc Zinnschlag
|
c796c81d00
|
Merge remote branch 'ace/cmake' into defeat
|
2012-02-28 23:32:07 +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
|
dc1fe6fb4d
|
adjusted readme
|
2012-02-28 09:56:12 +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 |
|
Lukasz Gromanowski
|
9a4cd6c2b1
|
Fixes #200 - Paths with quotes for data-local option.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2012-02-27 23:56:58 +01:00 |
|
Alexander "Ace" Olofsson
|
bfb3a4a36b
|
Changed FindOGRE a bit to make it easier to find a source build of Ogre. (At least on windows)
|
2012-02-27 22:22:17 +01:00 |
|
Marc Zinnschlag
|
2c20aeab90
|
Merge remote branch 'werdanith/activationsounds' into next
|
2012-02-27 18:24:33 +01:00 |
|