Commit graph

2111 commits

Author SHA1 Message Date
Nikolay Kasyanov
65fc141b62 Merge branch 'master' into pgrd-rendering
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
2012-03-15 20:38:21 +04:00
Marc Zinnschlag
ff866269ec Merge remote branch 'corristo/pgrd'
Removed a warning

Conflicts:
	CMakeLists.txt
2012-03-14 16:45:53 +01:00
Nikolay Kasyanov
a8e25bc32c Feature #37 (In Progress) Render Path Grid
improved path grid point mesh (closer to vanilla MW)
2012-03-14 15:03:04 +04:00
Nikolay Kasyanov
a7f89b864e Merge branch 'pgrd' into pgrd-rendering 2012-03-14 12:59:58 +04:00
Nikolay Kasyanov
988c1111e9 Feature #161 (Fix) Load REC_PGRD records
fixed edge decoding, thanks Project Aedra!
2012-03-14 12:54:52 +04: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
Nikolay Kasyanov
3a705baa29 Feature #37 (In Progress) Render Path Grid
added simple pathgrid edges
2012-03-14 03:06:56 +04: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
scrawl
f46d9b094b fix weather sounds sometimes playing in interiors 2012-03-13 17:25:07 +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
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
f292a5a7ca Feature #37 (In Progress) Render Path Grid
now using mwRoot instead of ogre's root, so no more messing with coordinates.
2012-03-12 02:37:07 +04:00
Nikolay Kasyanov
387c84e606 small fix in CMakeLists, thx ace13 2012-03-11 18:46:32 +04: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
Nikolay Kasyanov
4659076129 Feature #37 (In Progress) Render Path Grid
workaround for strange ESMStore bug
2012-03-10 20:45:55 +04:00
Nikolay Kasyanov
11f957a64d Feature #37 (In Progress) Render Path Grid
cubes for path grid points
strange crash when trying to get path grids from Debugging
2012-03-10 20:03:00 +04:00
Nikolay Kasyanov
6357adffcf Fixed typo 2012-03-10 18:13:44 +04:00
Nikolay Kasyanov
5328853445 Feature #37 (In Progress) Render Path Grid
added "togglepathgrid" script command
2012-03-10 18:13:44 +04: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
Michael Papageorgiou
054a176c86 Added new FileLibrary class to handle music, this fixes a number of issues. 2012-03-07 17:46:51 +02:00
Marc Zinnschlag
3d1cbcd4e7 Merge remote branch 'jhooks/animperform' 2012-03-07 09:20:29 +01:00