Pieter van der Kloet
|
96c0b8760e
|
Got rid of the console showing up on Windows and removed libpng stuff
|
13 years ago |
Marc Zinnschlag
|
79158b9325
|
NPCs are using InventoryStore instead of ContainerStore from now on
|
13 years ago |
Marc Zinnschlag
|
84c8cd3720
|
added InventoryStore class (doesn't do anything yet)
|
13 years ago |
Marc Zinnschlag
|
5562653578
|
provisionally fill up containers on cell load
|
13 years ago |
Marc Zinnschlag
|
06e0706b35
|
added fill and clear functions to container store
|
13 years ago |
scrawl
|
2196e1321b
|
added weather sounds
|
13 years ago |
Marc Zinnschlag
|
c259b25fcf
|
Merge remote branch 'werdanith/soundmanagerrefactor'
|
13 years ago |
Michael Papageorgiou
|
6f46f2b7a0
|
SoundManager: add the ability to play non-3d looping sounds
|
13 years ago |
Michael Papageorgiou
|
a309ef7b55
|
Corrected setPlaylist and added stopMusic
|
13 years ago |
Michael Papageorgiou
|
44620ada86
|
SoundManager: Finish up with Task #172, plus cleanup
|
13 years ago |
Michael Papageorgiou
|
ad6175c78a
|
SoundManager: Set up the priority for file look up right and take care of a corner case
|
13 years ago |
gugus
|
82c6b0f92a
|
choice function. Do not work.
|
13 years ago |
gugus
|
6f7752633a
|
there was no extension in the compiler context. Corrected. But Choice doesn't work.
|
13 years ago |
gugus
|
39415f0b4a
|
fix compilation bug with Visual C++
|
13 years ago |
Michael Papageorgiou
|
054a176c86
|
Added new FileLibrary class to handle music, this fixes a number of issues.
|
13 years ago |
gugus
|
4990ba48ed
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
|
13 years ago |
Marc Zinnschlag
|
3d1cbcd4e7
|
Merge remote branch 'jhooks/animperform'
|
13 years ago |
Michael Papageorgiou
|
54353794e5
|
SoundManager: Completely rewrote the file management
|
13 years ago |
Jason Hooks
|
39ff8d6a01
|
Compile error retry
|
13 years ago |
Michael Papageorgiou
|
03ea3bb62f
|
SoundManager: first attempt at refactoring. BROKEN
|
13 years ago |
Jason Hooks
|
9848b67174
|
Fixing errors
|
13 years ago |
Pieter van der Kloet
|
2429f3960f
|
Merge remote-tracking branch 'upstream/master' into launcher
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
|
13 years ago |
Marc Zinnschlag
|
25f5bdf7aa
|
Merge remote branch 'scrawl/weather'
|
13 years ago |
scrawl
|
3ea2a9f05d
|
changeWeather bugfix
|
13 years ago |
Marc Zinnschlag
|
69f0ec99f1
|
implemented dialogue scripts
|
13 years ago |
Michael Papageorgiou
|
1776ede9e1
|
Broken sound path fix
|
13 years ago |
Marc Zinnschlag
|
65756db49e
|
Merge remote branch 'gus/DialogueSystem' into dialogue
|
13 years ago |
Marc Zinnschlag
|
4bdfbb6d4f
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
13 years ago |
Marc Zinnschlag
|
896c7d9fa5
|
Merge remote branch 'scrawl/batching2'
|
13 years ago |
Marc Zinnschlag
|
e7fa1d94b8
|
Merge remote branch 'scrawl/shapefix'
|
13 years ago |
scrawl
|
42a7375a0b
|
adjusted the batch region size, this was the cause for lights going on/off bug
|
13 years ago |
Jason Hooks
|
a81ecb5f65
|
Bug 210 fix
|
13 years ago |
scrawl
|
d74b78a302
|
very minor performance improvement
|
13 years ago |
scrawl
|
ba0365a427
|
collision shape scale fix
|
13 years ago |
Marc Zinnschlag
|
1e998545c7
|
fixed log path
|
13 years ago |
Marc Zinnschlag
|
be70d197e5
|
Merge branch 'next'
Conflicts:
.gitignore
cmake/FindOGRE.cmake
|
13 years ago |
Michael Papageorgiou
|
b3159683a4
|
Replace gengetopt with bullet program options for esmtool's argument handling
|
13 years ago |
Nikolay Kasyanov
|
b283ad86fb
|
revert to old launcher stylesheet location on OS X
|
13 years ago |
Michael Papageorgiou
|
185cd63462
|
ESMTool set to use default Latin encoding
|
13 years ago |
Pieter van der Kloet
|
5ffa3264b2
|
Appended resources/ to the stylesheet path
|
13 years ago |
Marc Zinnschlag
|
3c5f8a4a23
|
void pointer workaround
|
13 years ago |
Marc Zinnschlag
|
ed0fa255b0
|
Merge remote branch 'scrawl/weather' into next
|
13 years ago |
Pieter van der Kloet
|
11ec5cf2e2
|
Stylesheet location changed in CMakeLists and some minor fixes to the launcher
|
13 years ago |
Pieter van der Kloet
|
b320733e45
|
Fixed Qt exits, this time for all occurrences
|
13 years ago |
scrawl
|
c8aab3a562
|
fix sun angle
|
13 years ago |
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
|
13 years ago |
Pieter van der Kloet
|
1512481c07
|
Changed the way whitespace was removed from retrieved Ogre values
|
13 years ago |
scrawl
|
b3db4f1c27
|
slightly improved moon fading
|
13 years ago |
Marc Zinnschlag
|
7aaa7f185f
|
same for launcher
|
13 years ago |
Marc Zinnschlag
|
4c2fffdd61
|
temporarily disabled multi data path support in OpenMW
|
13 years ago |
Marc Zinnschlag
|
2c20aeab90
|
Merge remote branch 'werdanith/activationsounds' into next
|
13 years ago |
Marc Zinnschlag
|
2608491906
|
Merge remote branch 'corristo/master'
|
13 years ago |
Nikolay Kasyanov
|
d58b408ae1
|
Deploying Qt image format plugins on OS X considered useless
|
13 years ago |
Michael Papageorgiou
|
fe977fe313
|
More container and door trap fixes
|
13 years ago |
Michael Papageorgiou
|
28fdfb0f99
|
Added container locked and trapped activation sounds
|
13 years ago |
Marc Zinnschlag
|
739870489a
|
Merge remote branch 'scrawl/weather' into weather
Conflicts:
apps/openmw/CMakeLists.txt
|
13 years ago |
scrawl
|
c9ceb74e5c
|
transition fix
|
13 years ago |
Michael Papageorgiou
|
c6861ed2a9
|
Added door activation sounds
|
13 years ago |
Jason Hooks
|
36e9322830
|
a few changes2
|
13 years ago |
Jason Hooks
|
8d7a5f469b
|
a few changes
|
13 years ago |
Marc Zinnschlag
|
053a2996d2
|
fix for non-standard erase function
|
13 years ago |
Alexander "Ace" Olofsson
|
be8690e333
|
Fix for debug crash on windows
|
13 years ago |
scrawl
|
8b0ef8f98c
|
improvements to sun glare
|
13 years ago |
scrawl
|
932983c2fa
|
fix toggleSky
|
13 years ago |
scrawl
|
c1d39bb35f
|
tweaked cloud color
|
13 years ago |
scrawl
|
f79bf1f300
|
fog
|
13 years ago |
scrawl
|
528cff5a59
|
implemented ChangeWeather script function
|
13 years ago |
scrawl
|
a05ba97382
|
choose a random weather depending on region's weather probabilities
|
13 years ago |
scrawl
|
d77d5080bd
|
implemented GetCurrentWeather script function
|
13 years ago |
scrawl
|
8d5783d75d
|
- set moon phase using (day%32)/4 (not really correct, but good for now)
- added all weather patterns from morrowind.ini
|
13 years ago |
scrawl
|
e31ad90802
|
moon positions and fading
|
13 years ago |
scrawl
|
4650672bb1
|
thunderstorm
|
13 years ago |
Lukasz Gromanowski
|
c9a1789db8
|
Bug fix for processing data paths in OpenMW Launcher.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
13 years ago |
scrawl
|
0ebdce543a
|
- added night sky rendering with stars, nebulas, and fading in/out to sunset / sunrise
- changed WeatherGlobals members to static
|
13 years ago |
Marc Zinnschlag
|
771d50fe69
|
removed a redundant assert and a left-over comment
|
13 years ago |
Marc Zinnschlag
|
68da94c8f0
|
workaround for older boost versions
|
13 years ago |
scrawl
|
9560904d8a
|
visibility fixes
|
13 years ago |
scrawl
|
67c7b965f0
|
calculate a sun position depending on time of day
|
13 years ago |
scrawl
|
811c4a41b7
|
fade in/out for sunrise and sunset
|
13 years ago |
scrawl
|
aad8f6605e
|
send a raycast through the physics engine to check if sun is visible
|
13 years ago |
Jason Hooks
|
08f3ecf935
|
Slightly better performance on animation2
|
13 years ago |
Jason Hooks
|
fb51b281b2
|
Slightly better performance on animation
|
13 years ago |
scrawl
|
af83742e6f
|
- disable the sky renderer completely in interior cells
- SkyManager update (initial sun glare effect, no raycast)
|
13 years ago |
scrawl
|
d9c02ca526
|
- added isCellExterior / isCellQuasiExterior methods to World
- interior now have the sun disabled properly (and ambient managed by cell, not sky)
|
13 years ago |
scrawl
|
90af78e3b8
|
attempt to fix openmw's lighting (restored the sun, set proper ambient value outside)
- the fix should remain in this branch since the main branch still has the lighting by caelum
|
13 years ago |
scrawl
|
a5720e9a4f
|
set sky colors according to time of day
|
13 years ago |
Marc Zinnschlag
|
26bd2be1e8
|
Merge branch 'equipment' into next
|
13 years ago |
Marc Zinnschlag
|
8f60d5b180
|
made container store data members private
|
13 years ago |
Marc Zinnschlag
|
af23cc352e
|
more cleanup
|
13 years ago |
Marc Zinnschlag
|
699246e54b
|
removed insertIntoContainer function from MWWorld::Class hierarchy
|
13 years ago |
Marc Zinnschlag
|
f39aa2a68d
|
changed take action to use the new container store interface
|
13 years ago |
Marc Zinnschlag
|
1d551030d1
|
container related script instruction are using the new container interface now
|
13 years ago |
Marc Zinnschlag
|
e13e858c7a
|
fixed container store iterator; new add function
|
13 years ago |
Marc Zinnschlag
|
b7ea110632
|
manually created objects were initialised incompletely
|
13 years ago |
Marc Zinnschlag
|
5f72199419
|
Merge remote branch 'lgro/config_fixes'
|
13 years ago |
Lukasz Gromanowski
|
d5f1d7eed7
|
Fix for processing tokens inside data-local config option.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
13 years ago |
scrawl
|
ce98397565
|
adding ini values for 'cloudy' and 'clear'
|
13 years ago |
scrawl
|
1badb5d04f
|
some restructurings
|
13 years ago |
scrawl
|
41a8b22ebd
|
implemented weather transitions (currently only blends the clouds)
|
13 years ago |
Pieter van der Kloet
|
280babc719
|
Fixed stylesheet and configuration problems with the launcher and code cleanup
|
13 years ago |
scrawl
|
4efc5bc1f2
|
forgot to add file
|
13 years ago |
scrawl
|
b2de9e8f45
|
allow setting the clouds opacity
|
13 years ago |
scrawl
|
c1fb5ce769
|
added (incomplete) WeatherManager, created by World
|
13 years ago |
scrawl
|
83753dc384
|
tweaked the cloud animation speed
|
13 years ago |
scrawl
|
91ffacbb6d
|
added moon phases
|
13 years ago |
scrawl
|
10ca67c0a5
|
fixed the sky elements positioning delay (nodes are now children of the camera node)
|
13 years ago |
scrawl
|
2d8b0a4ac0
|
merged the sky manager implementation with its interface
|
13 years ago |
Marc Zinnschlag
|
b2b09320fc
|
Merge branch 'config'
|
13 years ago |
Marc Zinnschlag
|
547d6a0639
|
Merge remote branch 'lgro/config' into config
|
13 years ago |
scrawl
|
694a537b57
|
- removed caelum sources, resources, build scripts
|
13 years ago |
scrawl
|
04d7db2860
|
moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience
|
13 years ago |
scrawl
|
6aac3d4b77
|
- removed caelum (we can get it from the git history, if needed)
- added code for moon rendering (they are not visible by default)
|
13 years ago |
scrawl
|
090c0586a0
|
leak fix
|
13 years ago |
scrawl
|
6d37f53fa2
|
- abstracted the sun creation code into a CelestialBody class to be reused for the moons
- fixed render queue problem
|
13 years ago |
scrawl
|
ad0f9f4bcf
|
fixed the sun rendering (rendered without depth check)
|
13 years ago |
scrawl
|
3b3218d907
|
fixed 3 gcc warnings in sky.cpp
|
13 years ago |
scrawl
|
8b5da06fce
|
Merge branch 'next' into weather
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
13 years ago |
Marc Zinnschlag
|
db205cf8aa
|
Merge remote branch 'scrawl/next' into test
Conflicts:
libs/openengine
|
13 years ago |
Marc Zinnschlag
|
e02cba58b1
|
Merge branch 'master' into next
Conflicts:
apps/openmw/mwclass/light.cpp
|
13 years ago |
Marc Zinnschlag
|
1beaea0115
|
forgot to add cone file
|
13 years ago |
Marc Zinnschlag
|
781b16a00e
|
removed bCollision variable from World
|
13 years ago |
Marc Zinnschlag
|
7eae24bb45
|
some fixes
|
13 years ago |
Marc Zinnschlag
|
4a16553acc
|
replaced an include with a forward declaration
|
13 years ago |
Marc Zinnschlag
|
e3e6b3809f
|
added container store iterator (a.k.a. the most hilarious iterator I ever had the misfortune to write)
|
13 years ago |
scrawl
|
c884f70a61
|
added sun rendering (unfinished)
|
13 years ago |
Lukasz Gromanowski
|
0c0b594090
|
Issue #168 - Configuration cleanup
Removed unnecessary path methods - according to forum disscusion:
http://openmw.org/forum/viewtopic.php?f=6&t=448
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
13 years ago |
Jason Hooks
|
7e1e746201
|
More changes
|
13 years ago |
scrawl
|
705d85e7d1
|
Merge branch 'next' into weather
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
13 years ago |
scrawl
|
60856b46e6
|
moved the renderer update call from OMW::Engine to RenderingManager
|
13 years ago |
scrawl
|
1d9f0f4813
|
added MWSkyManager; already has atmosphere and moving clouds (although their colour is static)
|
13 years ago |
Jason Hooks
|
38a0d1d1c5
|
Merging in master
|
13 years ago |
Jason Hooks
|
e330c22d68
|
Removing unneeded files
|
13 years ago |
Jason Hooks
|
e58f2f5363
|
Eliminating unnecessary data from skeletons and shape saving
|
13 years ago |
scrawl
|
457d9fd9f8
|
updated vmformat.txt
|
13 years ago |
scrawl
|
f81b615976
|
implemented script functions FadeIn, FadeOut, FadeTo
|
13 years ago |
scrawl
|
899aa5b870
|
fix last commit, also reacts to ToggleWireframe and not only twf
|
13 years ago |
scrawl
|
40e23fe26f
|
added twf console command
|
13 years ago |
gugus
|
9716199d18
|
script "fix". I'm waiting for you Zini^^
|
13 years ago |
gugus
|
c0bd86ce44
|
scripts. Not tested
|
13 years ago |
gugus
|
232e478768
|
Fix for prefix/suffix stuff
|
13 years ago |
Marc Zinnschlag
|
d9c1ed3d5e
|
Merge remote branch 'corristo/osx-packaging' into config
|
13 years ago |
Nikolay Kasyanov
|
2020d916ec
|
added missing comment
|
13 years ago |
Nikolay Kasyanov
|
57a4b19880
|
Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete
|
13 years ago |
Marc Zinnschlag
|
9af08ff18d
|
store screenshots in user directory instead of local directory
|
13 years ago |
Marc Zinnschlag
|
77201d05bc
|
post-merge fix
|
13 years ago |
Marc Zinnschlag
|
27caee664e
|
Merge remote branch 'lgro/config' into config
Conflicts:
components/files/path.hpp
|
13 years ago |
Marc Zinnschlag
|
10d4771550
|
Merge remote branch 'corristo/osx-packaging'
|
13 years ago |
Marc Zinnschlag
|
1a6a49b9b8
|
Merge remote branch 'lgro/fix_warnings'
|
13 years ago |
Nikolay Kasyanov
|
5a42c6c6f5
|
Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher
|
13 years ago |
gugus
|
bc72b2d535
|
fixed text color
|
13 years ago |