Chris Robinson
10037e79e7
Add a skeleton decoder class using mpg123 and libsndfile
2012-03-16 23:18:15 -07:00
Chris Robinson
45b612ab3b
Add a skeleton output classs using OpenAL
2012-03-16 22:12:17 -07:00
Chris Robinson
42b445383f
Remove Mangle- and OpenEngine-related sound code
...
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
2012-03-16 17:08:13 -07:00
scrawl
3e4cf64a77
Merge branch 'master' into shaders
2012-03-16 20:46:18 +01:00
scrawl
5ea2122f79
sun gradually disappears
2012-03-16 20:39:58 +01:00
scrawl
d18b3271b1
transition tweak 2
2012-03-16 20:32:41 +01:00
scrawl
460b584934
transition tweaks
2012-03-16 19:49:01 +01:00
scrawl
a67cc8e73b
more fixes
2012-03-16 19:02:33 +01:00
gugus
10321ff51a
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-16 17:58:23 +01:00
gugus
042d87f77f
a lot of clean up
2012-03-16 17:53:34 +01:00
gugus
91801e5cab
stop spamming messages
2012-03-16 17:39:14 +01:00
gugus
56a84b6a1a
choices works. The only thing remaining is the script arguments problems.
...
Need a lot of clean up too.
2012-03-16 17:30:59 +01:00
scrawl
c885ec1bd1
Merge branch 'master' into minimap
2012-03-16 17:10:27 +01:00
scrawl
91d2031eb7
first attempt at map window
2012-03-16 17:09:31 +01:00
Michael Papageorgiou
b2c6d52db1
Another file search fix
2012-03-16 09:00:18 +02:00
scrawl
877cb2aca7
much better looking moons
2012-03-15 20:35:23 +01:00
scrawl
e354203c21
stars rotation
2012-03-15 19:49:15 +01:00
Alexander "Ace" Olofsson
e8eea03b4c
Fixed a few more non-virtual destructor warnings
2012-03-15 17:40:42 +01:00
Marc Zinnschlag
a7211d2a90
Merge remote branch 'werdanith/searchfix'
2012-03-15 16:54:29 +01:00
Michael Papageorgiou
588ac44bc7
Improved matching for the FileListLocator
2012-03-15 17:32:10 +02:00
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
2012-03-15 16:01:41 +01:00
k1ll
b7eb7ff8e3
Added support for linking static Ogre libraries and plugins into the launcher and openmw.
2012-03-15 15:51:39 +01:00
Marc Zinnschlag
6f9d9c0f9e
another armour class detection fix
2012-03-15 15:05:14 +01:00
Marc Zinnschlag
7ab20c3eb1
fixed armour class detection
2012-03-15 14:36:12 +01:00
Marc Zinnschlag
c616d005e8
fixed a spelling mistake
2012-03-15 14:31:16 +01:00
Marc Zinnschlag
3c3fb8d706
Merge remote branch 'werdanith/activationsounds2' into equipment
2012-03-15 14:06:48 +01:00
Michael Papageorgiou
f7c7ed0ac7
Fix regression with locating sound files
2012-03-15 13:56:46 +02:00
scrawl
2edd7e59f4
some fixes and facilities for saving the fog of war to disk
2012-03-14 20:44:06 +01:00
gugus
07d8d654cd
one step toward function filters and end choices.
2012-03-14 18:47:29 +01:00
scrawl
5a46d58da5
fully working fog of war
2012-03-14 17:44:19 +01:00
scrawl
583a25f634
fog of war rendering (incomplete)
2012-03-14 14:51:58 +01:00
Marc Zinnschlag
81abd97753
Merge remote branch 'scrawl/weather'
2012-03-14 09:40:22 +01:00
Marc Zinnschlag
010c8e6041
Merge remote branch 'scrawl/viewingdistance'
2012-03-14 09:35:24 +01:00
Michael Papageorgiou
947288e13a
Merge master and rewrite around the new detection function
2012-03-14 00:38:44 +02:00
scrawl
e8267c7363
adjusted fog distance, prevents objects suddenly popping up on cell load
2012-03-13 22:14:35 +01:00
scrawl
8421fd2670
fixed a visual issue with the stars
2012-03-13 19:57:33 +01:00
Michael Papageorgiou
db9085ae59
Pickup sounds for weapons
2012-03-13 20:40:30 +02:00
Michael Papageorgiou
7c1475b723
Pickup sounds for potions, repair, gold, lights, rings
2012-03-13 20:01:55 +02:00
Michael Papageorgiou
34e18df0fe
Pickup sounds for apparatus, books, clothes, ingredients, lockpicks, misc and probes
2012-03-13 18:50:32 +02:00
scrawl
118250171d
Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders
...
Conflicts:
apps/openmw/mwrender/objects.cpp
2012-03-13 17:31:10 +01:00
scrawl
f46d9b094b
fix weather sounds sometimes playing in interiors
2012-03-13 17:25:07 +01:00
Michael Papageorgiou
6dddf8a3d5
Pickup sounds for armors
2012-03-13 18:05:38 +02:00
scrawl
4813a1ce9d
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
2012-03-13 16:00:59 +01:00
scrawl
771f920c2c
Merge branch 'master' of https://github.com/zinnschlag/openmw into minimap
2012-03-13 15:59:09 +01:00
Marc Zinnschlag
cbbc295eb6
implemented new equipment functions in MWClass
2012-03-13 15:35:06 +01:00
Marc Zinnschlag
c314cddb1c
added getEquipmentSkill function to Class hierarchy
2012-03-13 14:27:13 +01:00
Marc Zinnschlag
ea336214de
more inventory sanity checks
2012-03-13 14:04:19 +01:00
Marc Zinnschlag
4b73116b9d
added getEquipmentSlots function to MWWorld::Class hierarchy
2012-03-13 13:50:11 +01:00
Marc Zinnschlag
635b7ec6cb
slot system
2012-03-13 13:31:11 +01:00
Michael Papageorgiou
703e484a92
Doors and Containers sounds, now in 3D
2012-03-13 14:17:49 +02:00
Michael Papageorgiou
836732096e
Fix both relative and 3D sounds
2012-03-13 14:08:32 +02:00
Marc Zinnschlag
222b5b741e
Merge branch 'master' into equipment
2012-03-13 12:14:47 +01:00
Pieter van der Kloet
1ed1c29db9
Fix Boost path problem for Boost versions below 1.43
2012-03-12 14:46:48 +01:00
Pieter van der Kloet
96c0b8760e
Got rid of the console showing up on Windows and removed libpng stuff
2012-03-12 02:37:40 +01:00
scrawl
fa68be2b19
set map window cell name
2012-03-10 16:05:12 +01:00
scrawl
5b38b17baf
local map rendering (nothing to see yet, as it is not displayed in GUI)
2012-03-10 15:28:18 +01:00
Marc Zinnschlag
79158b9325
NPCs are using InventoryStore instead of ContainerStore from now on
2012-03-10 12:49:54 +01:00
Marc Zinnschlag
84c8cd3720
added InventoryStore class (doesn't do anything yet)
2012-03-10 12:49:27 +01:00
Marc Zinnschlag
5562653578
provisionally fill up containers on cell load
2012-03-10 12:36:29 +01:00
Marc Zinnschlag
06e0706b35
added fill and clear functions to container store
2012-03-10 12:11:07 +01:00
scrawl
2196e1321b
added weather sounds
2012-03-09 18:30:03 +01:00
Marc Zinnschlag
c259b25fcf
Merge remote branch 'werdanith/soundmanagerrefactor'
2012-03-09 17:27:11 +01:00
Michael Papageorgiou
6f46f2b7a0
SoundManager: add the ability to play non-3d looping sounds
2012-03-09 18:10:23 +02:00
Michael Papageorgiou
a309ef7b55
Corrected setPlaylist and added stopMusic
2012-03-09 03:56:29 +02:00
Michael Papageorgiou
44620ada86
SoundManager: Finish up with Task #172 , plus cleanup
2012-03-09 03:22:16 +02:00
Michael Papageorgiou
ad6175c78a
SoundManager: Set up the priority for file look up right and take care of a corner case
2012-03-08 23:06:52 +02: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
Michael Papageorgiou
054a176c86
Added new FileLibrary class to handle music, this fixes a number of issues.
2012-03-07 17:46:51 +02:00
scrawl
8be661c802
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
2012-03-07 13:29:59 +01:00
gugus
4990ba48ed
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-07 09:47:46 +01:00
Marc Zinnschlag
3d1cbcd4e7
Merge remote branch 'jhooks/animperform'
2012-03-07 09:20:29 +01:00
Michael Papageorgiou
54353794e5
SoundManager: Completely rewrote the file management
2012-03-07 02:20:15 +02:00
Jason Hooks
39ff8d6a01
Compile error retry
2012-03-06 18:28:41 -05:00
Michael Papageorgiou
03ea3bb62f
SoundManager: first attempt at refactoring. BROKEN
2012-03-06 01:21:00 +02:00
Jason Hooks
9848b67174
Fixing errors
2012-03-05 17:46:29 -05: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
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
Jacob Essex
eca91d17bb
Indentation tweaks and code cleanup
2012-03-04 11:46:33 +00:00
Jacob Essex
941a22034f
Merge branch 'terrain_next' of git://github.com/scrawl/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-03-04 11:30:37 +00:00
Jacob Essex
bcd2371baa
Code cleanup: Removed unneeded Ogre namespace
2012-03-04 11:21:47 +00:00
Jason Hooks
a81ecb5f65
Bug 210 fix
2012-03-03 18:26:11 -05:00
scrawl
a8939bc318
disabled the composite map, improves loading time a lot
2012-03-04 00:08:56 +01:00
scrawl
d74b78a302
very minor performance improvement
2012-03-03 12:26:08 +01:00
scrawl
b882c03adc
fixed terrain regions without vertexcolours, tweaked maxPixelError
2012-03-02 23:36:48 +01:00
Jacob Essex
3c934e3e44
Fixed a bug with fog not being applied to initially created terrain when starting in exteriors.
2012-03-02 22:31:17 +00:00
Jacob Essex
07a2e5a5be
Removed dead code, fixed a error, added comments and tweaked some constants (after trying to find their min/max values)
2012-03-02 21:20:12 +00:00
Jacob Essex
0f705eaca5
Removed the option of not splitting terrain as it was slower and adding to code complexity. The only real reason for keeping it, which was that it made debugging some texture issues easier is now gone.
2012-03-02 21:03:53 +00:00
Jacob Essex
3ecc427b96
Implemented slightly better texture splatting
2012-03-02 20:27:20 +00:00
scrawl
461ec9f3d6
fix regarding last commit
2012-03-02 18:50:55 +01:00
scrawl
0d4e3b8e75
remove alpha channel from colour map
2012-03-02 18:33:05 +01:00
scrawl
ba0365a427
collision shape scale fix
2012-03-02 16:47:39 +01:00
scrawl
2bea4c4724
fixed the global colour map, apparently Ogre::Terrain was corrupting it
...
somehow, now we are just bypassing Ogre::Terrain for the colour map and
passing it directly to the material, which makes more sense
performance-wise anyway
2012-03-02 15:29:12 +01:00
Marc Zinnschlag
1e998545c7
fixed log path
2012-03-02 15:15:44 +01:00
scrawl
04c141ddd5
Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-03-02 13:49:57 +01:00
Jacob Essex
8dd6e75ae1
Vertex colours now uses the Ogre::Terrain colour map
2012-03-02 11:56:51 +00: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
scrawl
562cc7aa30
fixed 2 assertions that caused crashes
2012-03-01 15:03:43 +01:00
scrawl
fddf7b4dd0
terrain material now supports point lights
2012-03-01 14:35:39 +01: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
Jacob Essex
611f336d07
Now doesn't attempt to use fake vertex colours with cells that don't have vertex colours
2012-02-29 23:38:21 +00:00
Jacob Essex
6924348696
Fixed some texture splatting issues with loading empty terrain cells
2012-02-29 23:33:54 +00:00
Jacob Essex
1d0ae9c8d1
Start of a basic implementation of fake vertex colours
2012-02-29 23:05:22 +00:00
scrawl
bac7f23604
Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-02-29 19:38:34 +01:00
scrawl
e04ef38a5c
Merge branch 'next' of https://github.com/zinnschlag/openmw into terrain_next
2012-02-29 11:01:03 +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
scrawl
be5555956c
improved composite map, now adapts to the ambient/diffuse light
2012-02-28 22:04:44 +01:00
scrawl
f2c3616638
Merge branch 'next' into terrain_next
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
cmake/FindOGRE.cmake
2012-02-28 21:49:45 +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
Jacob Essex
13e3955916
Merge branch 'terrain' of github.com:Yacoby/openmw into terrain
2012-02-28 16:22:19 +00: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
scrawl
f55905609f
fixed the terrain normals - they had to be adjusted because we use Morrowind's coordinate system
2012-02-28 17:18:07 +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
abcf25ead2
terrain shader performance improvement (tested on opengl only, please test on directx)
2012-02-28 16:41:05 +01:00
scrawl
5b5e8ba4fd
fix a typo that caused SPLIT_TERRAIN=true blendmap to be too detailed (causing insane loading times)
2012-02-28 16:20:57 +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
scrawl
dbd2d390fd
terrain material fixes:
...
- disable normal and parallax mapping
- disable specular mapping and specular
2012-02-27 21:12:16 +01:00
scrawl
f34b2c73c5
committing the terrain material generator from ogre 1.7.4, it seems to
...
be almost impossible to make a derived class of TerrainMaterialGeneratorA
because of the many classes it contains and the inter-relationships
between them; just adding the whole source makes it a lot easier to modify
if we decide to update this source from OGRE upstream at any point
(which seems unlikely), we can take the diff from this commit on
to see the changes we did to the material generator
2012-02-27 19:44:52 +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
scrawl
8d5783d75d
- set moon phase using (day%32)/4 (not really correct, but good for now)
...
- added all weather patterns from morrowind.ini
2012-02-25 21:06:03 +01:00
scrawl
e31ad90802
moon positions and fading
2012-02-25 16:36:45 +01:00
scrawl
4650672bb1
thunderstorm
2012-02-25 13:46:17 +01:00
Lukasz Gromanowski
c9a1789db8
Bug fix for processing data paths in OpenMW Launcher.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-25 10:20:42 +01:00
scrawl
0ebdce543a
- added night sky rendering with stars, nebulas, and fading in/out to sunset / sunrise
...
- changed WeatherGlobals members to static
2012-02-24 23:26:38 +01:00
Marc Zinnschlag
771d50fe69
removed a redundant assert and a left-over comment
2012-02-24 20:20:32 +01:00
Marc Zinnschlag
68da94c8f0
workaround for older boost versions
2012-02-24 20:19:32 +01:00
scrawl
9560904d8a
visibility fixes
2012-02-24 18:47:09 +01:00
scrawl
67c7b965f0
calculate a sun position depending on time of day
2012-02-24 18:30:16 +01:00
scrawl
811c4a41b7
fade in/out for sunrise and sunset
2012-02-24 17:42:31 +01:00
scrawl
aad8f6605e
send a raycast through the physics engine to check if sun is visible
2012-02-24 16:12:43 +01:00
Jason Hooks
08f3ecf935
Slightly better performance on animation2
2012-02-24 01:30:17 -05:00
Jason Hooks
fb51b281b2
Slightly better performance on animation
2012-02-24 01:16:30 -05:00
scrawl
af83742e6f
- disable the sky renderer completely in interior cells
...
- SkyManager update (initial sun glare effect, no raycast)
2012-02-23 21:44:56 +01:00
scrawl
d9c02ca526
- added isCellExterior / isCellQuasiExterior methods to World
...
- interior now have the sun disabled properly (and ambient managed by cell, not sky)
2012-02-23 21:12:06 +01:00
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
2012-02-23 20:33:34 +01:00
scrawl
a5720e9a4f
set sky colors according to time of day
2012-02-23 19:49:56 +01:00
Marc Zinnschlag
26bd2be1e8
Merge branch 'equipment' into next
2012-02-23 13:02:20 +01:00
Marc Zinnschlag
8f60d5b180
made container store data members private
2012-02-23 13:01:53 +01:00
Marc Zinnschlag
af23cc352e
more cleanup
2012-02-23 12:58:12 +01:00
Marc Zinnschlag
699246e54b
removed insertIntoContainer function from MWWorld::Class hierarchy
2012-02-23 12:53:48 +01:00
Marc Zinnschlag
f39aa2a68d
changed take action to use the new container store interface
2012-02-23 12:38:25 +01:00
Marc Zinnschlag
1d551030d1
container related script instruction are using the new container interface now
2012-02-23 12:34:51 +01:00
Marc Zinnschlag
e13e858c7a
fixed container store iterator; new add function
2012-02-23 12:34:25 +01:00
Marc Zinnschlag
b7ea110632
manually created objects were initialised incompletely
2012-02-23 12:33:50 +01:00
Marc Zinnschlag
5f72199419
Merge remote branch 'lgro/config_fixes'
2012-02-23 09:28:11 +01:00
Lukasz Gromanowski
d5f1d7eed7
Fix for processing tokens inside data-local config option.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-22 23:56:07 +01:00
scrawl
ce98397565
adding ini values for 'cloudy' and 'clear'
2012-02-22 20:39:14 +01:00
scrawl
1badb5d04f
some restructurings
2012-02-22 20:12:08 +01:00
scrawl
41a8b22ebd
implemented weather transitions (currently only blends the clouds)
2012-02-22 19:17:37 +01:00
Pieter van der Kloet
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
2012-02-22 08:34:47 +01:00
scrawl
4efc5bc1f2
forgot to add file
2012-02-21 22:56:34 +01:00
scrawl
b2de9e8f45
allow setting the clouds opacity
2012-02-21 22:11:41 +01:00
scrawl
c1fb5ce769
added (incomplete) WeatherManager, created by World
2012-02-21 20:22:46 +01:00
scrawl
83753dc384
tweaked the cloud animation speed
2012-02-21 17:42:43 +01:00
scrawl
91ffacbb6d
added moon phases
2012-02-21 17:38:15 +01:00
scrawl
10ca67c0a5
fixed the sky elements positioning delay (nodes are now children of the camera node)
2012-02-21 16:49:28 +01:00
scrawl
2d8b0a4ac0
merged the sky manager implementation with its interface
2012-02-21 16:15:38 +01:00
Marc Zinnschlag
b2b09320fc
Merge branch 'config'
2012-02-21 13:55:58 +01:00
Marc Zinnschlag
547d6a0639
Merge remote branch 'lgro/config' into config
2012-02-21 11:50:23 +01:00
scrawl
694a537b57
- removed caelum sources, resources, build scripts
2012-02-21 00:14:20 +01:00
scrawl
04d7db2860
moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience
2012-02-20 23:53:17 +01:00
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)
2012-02-20 23:41:22 +01:00
scrawl
090c0586a0
leak fix
2012-02-20 22:20:34 +01:00
scrawl
6d37f53fa2
- abstracted the sun creation code into a CelestialBody class to be reused for the moons
...
- fixed render queue problem
2012-02-20 22:15:13 +01:00
scrawl
ad0f9f4bcf
fixed the sun rendering (rendered without depth check)
2012-02-20 21:32:12 +01:00
scrawl
3b3218d907
fixed 3 gcc warnings in sky.cpp
2012-02-20 18:45:04 +01:00
scrawl
8b5da06fce
Merge branch 'next' into weather
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-02-20 18:33:13 +01:00
Marc Zinnschlag
db205cf8aa
Merge remote branch 'scrawl/next' into test
...
Conflicts:
libs/openengine
2012-02-20 14:54:08 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Marc Zinnschlag
1beaea0115
forgot to add cone file
2012-02-20 14:14:39 +01:00
Marc Zinnschlag
781b16a00e
removed bCollision variable from World
2012-02-20 14:07:16 +01:00
Marc Zinnschlag
7eae24bb45
some fixes
2012-02-20 14:02:24 +01:00
Marc Zinnschlag
4a16553acc
replaced an include with a forward declaration
2012-02-20 12:44:17 +01:00
Marc Zinnschlag
e3e6b3809f
added container store iterator (a.k.a. the most hilarious iterator I ever had the misfortune to write)
2012-02-20 12:38:34 +01:00
scrawl
c884f70a61
added sun rendering (unfinished)
2012-02-20 00:52:44 +01:00
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>
2012-02-20 00:02:00 +01:00
Jason Hooks
7e1e746201
More changes
2012-02-19 17:59:50 -05:00
scrawl
705d85e7d1
Merge branch 'next' into weather
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-02-19 23:27:26 +01:00
scrawl
60856b46e6
moved the renderer update call from OMW::Engine to RenderingManager
2012-02-19 23:22:29 +01:00
scrawl
1d9f0f4813
added MWSkyManager; already has atmosphere and moving clouds (although their colour is static)
2012-02-19 23:09:14 +01:00
Jason Hooks
38a0d1d1c5
Merging in master
2012-02-19 15:39:12 -05:00
Jason Hooks
e330c22d68
Removing unneeded files
2012-02-19 02:04:47 -05:00
Jason Hooks
e58f2f5363
Eliminating unnecessary data from skeletons and shape saving
2012-02-19 02:01:15 -05:00
scrawl
457d9fd9f8
updated vmformat.txt
2012-02-18 18:30:01 +01:00
scrawl
f81b615976
implemented script functions FadeIn, FadeOut, FadeTo
2012-02-18 18:25:28 +01:00
scrawl
899aa5b870
fix last commit, also reacts to ToggleWireframe and not only twf
2012-02-18 16:36:54 +01:00
scrawl
40e23fe26f
added twf console command
2012-02-18 16:06:03 +01:00
gugus
9716199d18
script "fix". I'm waiting for you Zini^^
2012-02-18 12:19:42 +01:00
gugus
c0bd86ce44
scripts. Not tested
2012-02-17 20:20:23 +01:00
gugus
232e478768
Fix for prefix/suffix stuff
2012-02-15 13:23:59 +01:00
Marc Zinnschlag
d9c1ed3d5e
Merge remote branch 'corristo/osx-packaging' into config
2012-02-15 10:32:16 +01: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
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
gugus
bc72b2d535
fixed text color
2012-02-12 22:24:23 +01: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
d66b6743f4
minor fix
2012-02-12 13:58:02 +01:00
Marc Zinnschlag
d9945a976d
Merge remote branch 'gus/DialogueSystem' into dialogue
2012-02-12 13:47:04 +01:00
Marc Zinnschlag
facc36fa34
Merge remote branch 'corristo/osx-packaging' into packaging
2012-02-12 13:35:54 +01:00
Marc Zinnschlag
a0ac6e5150
cells were sometimes not fully loaded
2012-02-12 12:35:29 +01:00
Jacob Essex
286701e3a5
Removed the flawed shading, updated textures, removed the need for a unused base texture
2012-02-11 20:54:29 +00:00
gugus
4d4ae41a4a
greetings are working now
2012-02-11 12:19:02 +01:00
gugus
4658ec276f
increased the max size of the text of the dialogue
2012-02-11 12:18:47 +01:00
gugus
eee5d20809
a little fix
2012-02-10 22:54:17 +01:00
gugus
f1dc360720
added the script instruction addTopic
2012-02-10 22:02:24 +01:00
gugus
554bf8e586
Improvement in the dialogue manager
2012-02-10 22:01:31 +01: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
gugus
94ab65f8bb
fixe a compiling error?
2012-02-10 16:21:04 +01:00
gugus
ea8335a393
addTopic function
2012-02-10 16:09:43 +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
gugus
e7ef39cabc
more improvements to dialogue filters. Some of them are still missing.
2012-02-09 19:27:15 +01:00
gugus
f76e0e1941
corrected the light problem
2012-02-08 00:32:22 +01:00
Jacob Essex
9cc3af34e5
Removed composite maps, fixes to texture sizes and unloading
2012-02-07 12:41:08 +00: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
gugus
c65c160e7b
finished connecting the dialogue GUI and the dialogue manager
2012-02-05 12:25:23 +01:00
gugus
abe38e5f87
Started to weire the dialogue manager and the dialogue GUI
2012-02-05 10:54:56 +01: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
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
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
Nikolay Kasyanov
a301fc355e
Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins)
2012-01-29 23:41:27 +04:00
Marc Zinnschlag
5a70f28f47
removed a warning
2012-01-29 20:29:02 +01:00
Lukasz Gromanowski
b004e2479c
Issue #133 Handle resources across multiple data directories - WIP
...
Work In Progress - added support for multiple paths in SoundManager.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-29 20:27:03 +01:00
Marc Zinnschlag
81d0d58346
Merge remote branch 'mirc/master' into openengine
2012-01-29 20:25:11 +01:00
Cris Mihalache
daa8fb15ce
Removed all physics-related code from Engine
2012-01-29 20:51:20 +02:00
Cris Mihalache
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
2012-01-29 17:31:18 +02:00
Jason Hooks
1da519a914
Some cleanup
2012-01-29 00:42:55 -05:00
gugus
5cbd256e1c
"full" question support. Now needs to be linked with the dialogue Manager.
2012-01-28 16:16:49 +01:00
gugus
debec44b51
better colors (not perfect yet), and some basic question support (not finished yet).
2012-01-28 16:08:22 +01:00
Marc Zinnschlag
0d7f39fcb5
Merge branch 'refdata' into next
2012-01-28 11:46:34 +01:00
Marc Zinnschlag
f2972b1ca0
turned ContainerStore from a template into a simple struct
2012-01-28 11:45:55 +01:00
Pieter van der Kloet
ea241d85ef
Fixed some issues with the CMake files
2012-01-28 01:36:17 +01:00
Marc Zinnschlag
8de6761a79
general cleanup
2012-01-27 15:11:02 +01:00
Marc Zinnschlag
c081160591
replaced container store in ref data with new custom data implementation
2012-01-27 14:55:58 +01:00
gugus
f7cf5f9bef
improved the dialogue GUI. Questions are still missing.
2012-01-27 14:50:13 +01:00
Marc Zinnschlag
b0256cea34
replaced movement settings in ref data with new custom data implementation
2012-01-27 13:17:30 +01:00
Marc Zinnschlag
aa87bd4030
replaced creature stats in ref data with new custom data implementation
2012-01-26 11:35:47 +01:00
Lukasz Gromanowski
1d96b99532
Issue #168 - Configuration cleanup
...
Added tokens processing, modified getInstallPath for linux
so we could use ~/.wine/dosdevices symlinks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-25 23:55:43 +01:00
Marc Zinnschlag
c6761e3470
replaced NPC stats in ref data with new custom data implementation
2012-01-25 16:56:49 +01:00