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 |
|
Marc Zinnschlag
|
97030c5dba
|
Merge remote branch 'corristo/no-submodules'
|
2012-03-13 12:11:46 +01:00 |
|
Marc Zinnschlag
|
2d9648f88e
|
deleted submodules
|
2012-03-13 12:11:39 +01:00 |
|
Marc Zinnschlag
|
17872bf88b
|
Merge remote branch 'corristo/master'
|
2012-03-13 12:09:41 +01:00 |
|
Nikolay Kasyanov
|
6325697bfe
|
Change in CMakeLists.txt for OS X due to changed ogre plugin path variable name
|
2012-03-12 20:47:47 +04: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 |
|
Nikolay Kasyanov
|
b4343431c6
|
Merged openengine into openmw
|
2012-03-11 18:16:29 +04:00 |
|
Nikolay Kasyanov
|
48c12e9d5c
|
Merge mangle into openmw
|
2012-03-11 18:13:59 +04:00 |
|
Marc Zinnschlag
|
52dd5ab213
|
Merge remote branch 'scrawl/weather'
|
2012-03-11 09:28:43 +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 |
|
Nikolay Kasyanov
|
de5b692f9f
|
Feature #161 (Resolved) Load REC_PGRD records
|
2012-03-10 18:12:45 +04: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 |
|
Nikolay Kasyanov
|
fda5b59eb6
|
Feature #161 (In Progress) Load REC_PGRD records
now using vector instead of C arrays
fixed path grid edge loading
added path grid to cell store
implemented dedicated storage class for path grids
|
2012-03-09 23:35:20 +04:00 |
|
scrawl
|
2196e1321b
|
added weather sounds
|
2012-03-09 18:30:03 +01:00 |
|
Marc Zinnschlag
|
04b0677cbb
|
Merge remote branch 'ace/win-packaging'
|
2012-03-09 18:26:57 +01:00 |
|
Marc Zinnschlag
|
69127fa8f1
|
boost compatibility fix; added a missing include
|
2012-03-09 17:33:10 +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 |
|
Alexander "Ace" Olofsson
|
5beee8598d
|
Giving the windows installer a more personal look.
|
2012-03-09 15:34:47 +01: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 |
|
Nikolay Kasyanov
|
08db70e137
|
disabled debug output
|
2012-03-08 01:00:13 +04: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 |
|
gugus
|
61914a70bd
|
Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem
|
2012-03-07 09:24:41 +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 |
|
Nikolay Kasyanov
|
540e4f77a7
|
Feature #161 (In Progress) Load REC_PGRD records
improved debug output
|
2012-03-06 15:52:23 +04: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
|
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 |
|