Marc Zinnschlag
7d112e4d5c
rewrote logic of content file loading
2013-02-07 11:33:08 +01:00
scrawl
814969dcae
Cache integrity check uses relative paths, so that changing the build folder works without reset
2013-02-07 02:23:41 +01:00
Marc Zinnschlag
43912f927a
Merge remote-tracking branch 'potatoesmaster/importer' into next
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-02-06 10:12:40 +01:00
Emanuel Guevel
a4f051e85a
Fix game files import
2013-02-06 00:51:05 +01:00
Emanuel Guevel
6e3c016351
Add archives to settings imported by mwiniimporter
...
Add Morrowind.bsa by default.
2013-02-06 00:51:05 +01:00
scrawl
86d65519e3
Settings window fix
2013-02-05 23:57:30 +01:00
Michal Sciubidlo
347a734364
Move OpenDialog to editor and use it in startup dialogue.
...
Remove debug output from DataFilesList.
2013-02-05 22:06:36 +01:00
Michal Sciubidlo
f7e5ea24f4
Merge branch 'startup' into cs_load.
...
Fix include in textinputdialog.cpp.
2013-02-05 21:23:49 +01:00
scrawl
608c112f34
Supply the new render window to mygui
2013-02-05 20:48:25 +01:00
scrawl
31f760ccce
Fixing issues from last commit: restored input and occlusion queries
2013-02-05 20:26:13 +01:00
scrawl
c4d518132f
With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.
2013-02-05 19:22:08 +01:00
scrawl
499f3ac0d1
Slightly better ripple normal blending. Not physically accurate at all, but looks good.
2013-02-05 16:40:41 +01:00
scrawl
3772cd9257
Refraction can be disabled separately now
2013-02-05 14:29:46 +01:00
Marc Zinnschlag
c409f1184e
cleaned up object movement and fixed a bug regarding local scripts
2013-02-05 12:19:06 +01:00
Marc Zinnschlag
86fb3574a0
Merge remote-tracking branch 'wheybags/master' into next
2013-02-05 11:55:47 +01:00
Marc Zinnschlag
cfceb45009
adjusted gcc settings again to avoid problems with older compiler versions
2013-02-05 11:53:48 +01:00
Marc Zinnschlag
3fe5757770
updated changelog for 0.21.0 again
2013-02-05 10:28:49 +01:00
scrawl
a29919d02d
restored global map
2013-02-05 00:39:56 +01:00
scrawl
35b5fdab5d
Merge branch 'terrainfix' into graphics
2013-02-05 00:28:59 +01:00
scrawl
09180666b2
Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix
2013-02-05 00:21:42 +01:00
scrawl
58cf182db2
better place for syncing
2013-02-05 00:21:29 +01:00
scrawl
bb1f23875d
Merge branch 'terrainfix' into graphics
2013-02-04 23:16:11 +01:00
scrawl
596628d339
Fix terrain derived data update (bug 534, bug 544)
2013-02-04 23:13:01 +01:00
Michal Sciubidlo
66ec4ca7d9
Split launcher specific code from DataFilesList back to DataFilesPage.
2013-02-04 22:14:14 +01:00
scrawl
0f37c24d5f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-04 21:55:41 +01:00
scrawl
e949765922
cloud blending now as before (0 -> 0.25 -> 1)
2013-02-04 19:21:47 +01:00
scrawl
a7d910614f
extern/shiny update: made caching more robust
2013-02-04 18:04:09 +01:00
scrawl
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
2013-02-04 18:03:03 +01:00
Marc Zinnschlag
ba0d13fc12
moved code for creating new base content records into the Document class
2013-02-04 13:50:38 +01:00
Marc Zinnschlag
4c973a0f67
constructing documents from a file list instead of a single name
2013-02-04 13:46:54 +01:00
Marc Zinnschlag
7b1b0ec41c
Merge branch 'cgfix'
2013-02-04 10:27:06 +01:00
Marc Zinnschlag
3f0a49a2f6
Merge branch 'master' into startup
...
Conflicts:
apps/opencs/CMakeLists.txt
2013-02-04 10:22:37 +01:00
scrawl
fa07288b15
tweaked map light color
2013-02-03 20:29:50 +01:00
scrawl
5cc8af0f14
fix map positions
2013-02-03 20:06:03 +01:00
scrawl
a44dfcd2ac
Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good.
2013-02-03 19:28:31 +01:00
scrawl
109d0a942f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-03 19:02:57 +01:00
scrawl
979a874220
Fixed the custom near clip planes
2013-02-03 19:01:59 +01:00
scrawl
5334934612
Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.
2013-02-03 18:03:09 +01:00
Marc Zinnschlag
a002b253d1
silenced a cmake warning
2013-02-03 16:18:17 +01:00
Mark Siewert
3e43db5f76
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-03 16:14:41 +01:00
scrawl
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
2013-02-03 15:46:23 +01:00
Tom Mason
ac112ef972
refactored special variable code
2013-02-03 13:27:27 +00:00
Marc Zinnschlag
c97553703a
fixes for static build without cg
2013-02-03 13:47:55 +01:00
Marc Zinnschlag
a4872e3217
rewrote the opencs cmake scripts (more compact and no more annoying warnings)
2013-02-03 13:30:40 +01:00
Marc Zinnschlag
d6a73a2a02
updated changelog
2013-02-03 11:41:31 +01:00
Tom Mason
f785659297
Implemented OnPCAdd special variable
...
Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised
for items added through it.
Does not get reset on drop, as per original morrowind.
2013-02-02 17:36:12 +00:00
Michal Sciubidlo
155cca0c9a
Upload missing files.
...
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
2013-02-02 18:36:01 +01:00
Marc Zinnschlag
67a1ec5166
added provisional startup dialogue
2013-02-02 16:14:58 +01:00
Marc Zinnschlag
827261e8b4
increased version number
2013-02-02 13:42:11 +01:00
Marc Zinnschlag
85697e4628
reverted to C++03
2013-02-02 13:24:28 +01:00