krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
2122 commits 35 branches 0 tags 65 MiB
Commit graph

1243 commits

Author SHA1 Message Date
scrawl
9612ce595b Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision 
Conflicts:
	CMakeLists.txt
 2012-03-13 17:09:50 +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
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
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
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
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
Michael Papageorgiou
1776ede9e1 Broken sound path fix 2012-03-05 16:06:46 +02: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
Jason Hooks
a81ecb5f65 Bug 210 fix 2012-03-03 18:26:11 -05: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
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