mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:49:56 +00:00
Code Issues Releases Wiki Activity
2925 commits 38 branches 54 tags 122 MiB
Commit graph

1677 commits

Author SHA1 Message Date
Marc Zinnschlag
af39275a63 Merge remote branch 'scrawl/weather' 2012-03-18 21:07:04 +01:00
scrawl
1907e21207 removed preprocessor constants 2012-03-18 20:44:56 +01:00
scrawl
c2329b7027 removed preprocessor constants 2012-03-18 20:32:50 +01:00
Chris Robinson
b938fd7b36 Make the sound output init return void 2012-03-18 12:19:54 -07:00
Chris Robinson
1965b5bc79 Rename some Sound class member functions 2012-03-18 12:03:15 -07:00
Chris Robinson
403e51cef3 Move the sample type and channel config enums to MWSound and give use appropriate names for the values 2012-03-18 11:56:54 -07:00
Chris Robinson
efae7dfe83 Rename some sound decoder class member variables and functions 2012-03-18 11:47:15 -07:00
Chris Robinson
9656456d30 Make sure the sound decoders are closed when they're finished with 2012-03-18 11:34:23 -07:00
Chris Robinson
362e254720 Rename some more sound class member variables and functions 2012-03-18 11:30:53 -07:00
Chris Robinson
162642e672 Prefix some SoundManager class member variables 2012-03-18 11:17:45 -07:00
gugus
9c85a8c1ce Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-18 19:06:52 +01:00
Marc Zinnschlag
ce2cb709c5 fixed getJournalIndex function 2012-03-18 19:05:35 +01:00
gugus
00d3bc9d23 every filters are check during dialogue now. There is a problem with journal. 2012-03-18 18:58:22 +01:00
gugus
7f2ff6f5f1 removed the TODO 2012-03-18 18:05:28 +01:00
gugus
4afe6dd235 death filter 2012-03-18 18:04:51 +01:00
gugus
48e6a42168 Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanager.cpp
 2012-03-18 17:59:11 +01:00
gugus
34b33b78d2 better filters 2012-03-18 17:58:14 +01:00
Marc Zinnschlag
76b24d9d1a fixed a compile error 2012-03-18 17:30:05 +01:00
Chris Robinson
2f92559fc7 Use OpenAL's linear attenuation model 
We should use the inverse distance clamped model (the default), but we first
need to handle muting sounds that are beyond their max distance. Linear
attenuation doesn't give a proper rolloff, but it makes the sounds silent at
max distance.
 2012-03-18 09:05:38 -07:00
gugus
8740354c80 inventory filter now use player inventory 2012-03-18 17:03:54 +01:00
Chris Robinson
a256b9a7b0 Remove a comment about Audiere 2012-03-18 08:42:55 -07:00
gugus
019a28093b better filters 2012-03-18 15:26:18 +01:00
scrawl
3a00fbb950 removed mygui from source tree and use system install instead 2012-03-18 15:11:37 +01:00
Marc Zinnschlag
d9677cb33e fixed problem with parsing optional string arguments 2012-03-18 14:27:49 +01:00
gugus
100c6a42a5 better default values for filters 2012-03-18 11:32:05 +01:00
Marc Zinnschlag
655f9fe920 Merge remote branch 'k1ll/staticogre' 2012-03-18 11:16:34 +01:00
Marc Zinnschlag
af875896ad fix for issue #179 2012-03-18 11:09:38 +01:00
Chris Robinson
3fea3e7d25 Fix stereo files with libsndfile 2012-03-17 23:47:12 -07:00
Chris Robinson
f7ac94d686 Pass the new position to the sound update method 2012-03-17 23:41:45 -07:00
Chris Robinson
44fc204864 Avoid passing a sound decoder to the play methods 2012-03-17 23:30:43 -07:00
Chris Robinson
ddfa906922 Add a missing include 2012-03-17 22:45:28 -07:00
Chris Robinson
a69ec91242 Remove some unnecessary wrappers and do some small cleanups 2012-03-17 22:13:57 -07:00
Marc Zinnschlag
187b8e58d6 fixed handling of optional instruction/function arguments; removed choice workaround 2012-03-17 19:32:44 +01:00
Chris Robinson
a91085a1b9 Add a couple comments 2012-03-17 10:45:11 -07:00
Chris Robinson
7160d20db3 Be more consistent with the vector orientations given the sound handler 2012-03-17 10:36:34 -07:00
Chris Robinson
cbeff4657f Pass the loop and untracked flags when playing a 3d sound 2012-03-17 10:16:22 -07:00
Chris Robinson
87adf6002a Fix a copy-paste typo in the openal output 2012-03-17 09:57:39 -07:00
Chris Robinson
5563f583ff Add and implement methods to update tracked sounds on an object 2012-03-17 09:51:03 -07:00
Chris Robinson
979ae89aab Pass volume and pitch parameters to streamed sounds 2012-03-17 09:37:41 -07:00
Chris Robinson
cac07d0fbf Remove some unnecessary methods 2012-03-17 09:27:31 -07:00
Chris Robinson
e49a090af7 Remove unnecessary hack 2012-03-17 09:16:09 -07:00
Chris Robinson
d57051375d Implement non-streaming sounds with OpenAL 2012-03-17 09:15:47 -07:00
gugus
f87bd65ae1 Merge branch 'DialogueSystem' of github.com:scrawl/openmw into DialogueSystem 2012-03-17 17:00:28 +01:00
gugus
846196d048 fixed a crash 2012-03-17 16:56:22 +01:00
Chris Robinson
9adf1e8461 Keep a handle on played sounds 2012-03-17 08:02:46 -07:00
scrawl
21143f006b fix several warnings 2012-03-17 15:47:22 +01:00
scrawl
9d4f79bcfc GCC compile fix 2012-03-17 15:24:47 +01:00
Michael Papageorgiou
dbbf50a184 Journal sounds, close sound will be added later 2012-03-17 15:52:57 +02:00
Chris Robinson
656863ec6e Add functions to play sounds 2012-03-17 06:51:44 -07:00
Chris Robinson
a46f8ced05 Keep the sound output's listener updated with the camera position 2012-03-17 06:18:59 -07:00
scrawl
5e939e4818 map window now works for interiors 2012-03-17 13:59:51 +01:00
scrawl
1840401172 weather transitions (e.g. from clear to cloudy) use timescale 2012-03-17 13:14:31 +01:00
scrawl
3ae69f792a no light-"jumps" during night 2012-03-17 12:57:52 +01:00
Chris Robinson
2dabdcb9e5 Add a function to update the sound listener 2012-03-17 04:22:54 -07:00
Chris Robinson
2429755bf1 Make the sound's Play method return void 2012-03-17 03:20:43 -07:00
Chris Robinson
caf5d71d44 Make the sound decoder's Open method return void 
Errors are thrown, not returned
 2012-03-17 03:18:28 -07:00
Chris Robinson
1b41987e18 Move OpenAL_SoundStream function definitions out of the class 2012-03-17 03:15:07 -07:00
Chris Robinson
2f6b73d461 Prevent streamMusic from throwing an exception 2012-03-17 03:06:35 -07:00
Chris Robinson
207d7dd89e Stop and delete the current music before deleting the sound output 2012-03-17 03:01:51 -07:00
Chris Robinson
1ade01edc8 Add a function to stream sounds 2012-03-17 02:55:08 -07:00
Chris Robinson
9cf42f6d0f Flesh out the sound decoder a bit more 2012-03-17 02:51:46 -07:00
Chris Robinson
637617056b Make a skeleton Sound class 2012-03-17 02:45:18 -07:00
Chris Robinson
246b0266fb Remove references to Audiere. It's not supported for now. 2012-03-17 00:11:59 -07:00
Chris Robinson
46cd84aac5 Add a skeleton ffmpeg decoder 2012-03-16 23:59:21 -07:00
Chris Robinson
1322b1e160 Move Sound_Output's definition to a separate header 2012-03-16 23:40:07 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
1a6a49b9b8 Merge remote branch 'lgro/fix_warnings' 2012-02-13 11:06:41 +01: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
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
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
Jason Hooks
6de0847b86 Slightly better performance on animation 2012-01-25 01:21:30 -05:00
Yacoby
46b8d3a83e Merge pull request #1 from corristo/terrain 2012-01-24 05:41:24 -08:00
Jacob Essex
5e3e6f9165 Fixed some minor bugs, a cells terrain can now be rendered as 4 Ogre::Terrain objects, possibly giving a speed increase 2012-01-24 13:29:31 +00:00
Marc Zinnschlag
baf9cff21d added customdata base class (issue #185) 2012-01-24 11:24:05 +01:00
Marc Zinnschlag
4b6cd582a7 removed some redundant (and misplaced) functions 2012-01-24 10:45:40 +01:00
Jacob Essex
cd0df082df Textures are now blended between cells and the texture blending functions are now more abstract 2012-01-23 17:19:54 +00:00
Marc Zinnschlag
26c328e73f added some more comments to avoid further confusion 2012-01-23 14:55:00 +01:00
Marc Zinnschlag
16bc374921 animation updates were hooked up to the wrong update function 2012-01-23 14:33:06 +01:00
Jason Hooks
3a1d7b7864 Huge Water 2012-01-22 19:24:35 -05:00
Jason Hooks
e1aba44da6 Switching cells in exterior works 2012-01-22 16:38:10 -05:00
Jason Hooks
ec94ecacaf Zinis branch merge 2012-01-22 15:02:38 -05:00
Nikolay Kasyanov
1b1ce48502 Now terrain manager donesn't try to load terrain for interiors 2012-01-22 20:20:12 +04:00
Marc Zinnschlag
7439c83623 Added custom copy-constructor, assignment-operator and destructor for RefData 
Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.
 2012-01-22 11:22:12 +01:00
Marc Zinnschlag
6a88133178 Split refdata.hpp in a hpp and a cpp file 
Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.
 2012-01-22 11:00:40 +01:00
Jason Hooks
a0838369b2 Very basic exterior water 2012-01-21 20:05:08 -05:00
Jacob Essex
637302fc87 Added blended textures to the terrain 2012-01-21 17:59:12 +00:00
Jacob Essex
18108c02a7 Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered 2012-01-21 16:59:08 +00:00
Lukasz Gromanowski
406897aa64 Issue #168 - Configuration cleanup - WIP 
Sources update.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-01-21 17:58:49 +01:00
Lukasz Gromanowski
7c24ae9ac7 Issue #168 - Configuration cleanup - WIP 
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-01-21 01:31:20 +01:00
Jason Hooks
84f45b1972 underwater view 2012-01-20 17:59:56 -05:00
Jason Hooks
2aad3a0bd8 Correct water levels 2012-01-19 23:29:07 -05:00
Jason Hooks
ff2bbc9fc5 Transparent water 2012-01-18 22:42:07 -05:00
Jason Hooks
bcf3e45ff6 Proper buffer designation 2012-01-18 22:00:03 -05:00
Marc Zinnschlag
0c2de2c00c Merge branch 'animation2' 2012-01-17 15:37:51 +01:00
Marc Zinnschlag
9b910dda94 clean up 2012-01-17 15:10:53 +01:00
Marc Zinnschlag
e3631003e9 Merge remote branch 'yacoby/detailed_fps' 2012-01-17 14:04:00 +01:00
Marc Zinnschlag
f5a82931b6 some cleanup 2012-01-17 13:53:27 +01:00
Jacob Essex
e73640e720 Improved code, added labels to the counter 2012-01-17 11:58:06 +00:00
gugus
484b8a95f0 removed useless std::cout 2012-01-16 21:58:18 +01:00
Jacob Essex
3b15170d09 Cleaned up and simplified the code relating to the fps display 2012-01-16 18:16:33 +00:00
gugus
eb4dea3d87 Previous/Next button implemented 2012-01-16 17:46:25 +01:00
Jacob Essex
18e4b73a86 Added a more detailed fps counter displaying the triangle and batch count 2012-01-16 15:33:21 +00:00
Jason Hooks
8798f7dd40 Bringing in some of Azathoth's work 2012-01-14 18:34:14 -05:00
Jason Hooks
e35aee0f89 Disjointed free part fix 2012-01-13 02:19:28 -05:00
Jason Hooks
41769f202c Huge Performance Increase 2012-01-13 00:48:52 -05:00
Jason Hooks
d1793bc4bd Animation files in the correct directory 2012-01-12 20:09:55 -05:00
Jason Hooks
0712bba49b Changing a few things around with handleshapes 2012-01-12 16:03:07 -05:00
gugus
9031f62962 The journal is now in the center of the screen. 2012-01-11 12:58:39 +01:00
Jason Hooks
5e1cc07ee8 Fixed ancestor ghost crash 2012-01-10 02:00:04 -05:00
Jason Hooks
eab69f18ac File output switch 2012-01-10 00:34:29 -05:00
Jason Hooks
7fde576dd9 actor physics again 2012-01-07 23:21:19 -05:00
Jason Hooks
a615369189 Warning and different physics 2012-01-06 22:52:15 -05:00
Jason Hooks
295eb27c2d Better Text Indices; Better file output 2012-01-06 18:23:41 -05:00
Jason Hooks
859ac1153e Basic Text Indices Working 2012-01-06 02:27:10 -05:00
Jason Hooks
0715f9b6ab Preparing to use text indices 2012-01-06 00:55:02 -05:00
Jason Hooks
595d0b1192 Cleanup; warnings 2012-01-05 21:45:17 -05:00
Jason Hooks
c2fa82326d Animation with physics attempt 2012-01-04 23:48:25 -05:00
Jason Hooks
45c57721ff Turning off hardware skinning2 2012-01-04 20:30:06 -05:00
Jason Hooks
1d2e77d947 Turning off hardware skinning 2012-01-04 19:47:06 -05:00
Jason Hooks
762727308e Hardware skinning working (YESgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --all) 2012-01-02 23:06:10 -05:00
Jason Hooks
a4c6d948d4 Disabling normal updates 2012-01-01 20:51:26 -05:00
Jason Hooks
289b8f667e Various npc heights 2012-01-01 17:28:46 -05:00
Jason Hooks
f7d26b2695 Scaling for wood elves 2012-01-01 00:05:21 -05:00
Jason Hooks
497d994525 female argonian fix 2011-12-31 02:41:26 -05:00
gugus
428d0ce820 journal formating. Problems with french accents. 2011-12-30 11:39:17 +01:00
gugus
5cfac197d4 Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal 2011-12-29 17:59:21 +01:00
gugus
d59284a096 first attempt to read the journal 2011-12-29 17:58:58 +01:00
Marc Zinnschlag
33f8049a36 accessing topic index didn't work 2011-12-29 17:32:57 +01:00
Jason Hooks
42e7ff9b13 Introducing loops; SkipAnim; Skeleton reset bug fixed 2011-12-28 21:52:05 -05:00
Jason Hooks
c8cca06b40 unlocking change and stop change 2011-12-28 17:34:47 -05:00
Jason Hooks
8c3127367a Npc Optimization 2011-12-27 22:35:22 -05:00
Jason Hooks
cef2f5e927 Trying to get code to conform with older c++ 2011-12-27 19:19:45 -05:00
Jason Hooks
d855bb4fc6 physics reenabled 2011-12-27 17:52:17 -05:00
Jason Hooks
c399f4f210 Fixing a few things 2011-12-27 17:12:47 -05:00
Jason Hooks
1a90f4241b Npc Animation Working 2011-12-27 00:25:52 -05:00
Jason Hooks
a6b88b48ec A different way 2011-12-27 00:20:14 -05:00
Jason Hooks
653d999ac4 Animation creatures 2011-12-26 19:23:46 -05:00
Jason Hooks
88c427543b Deleting animations; Empty Functions/Planning 2011-12-25 22:37:26 -05:00
Jason Hooks
7eee54bcd7 More physics and managing of Animation objects 2011-12-25 01:52:57 -05:00
Jason Hooks
1b835d6702 Cell changing fixes 2011-12-24 21:53:12 -05:00
Jason Hooks
7cf3fc8991 handleAnimationTransforms 2011-12-18 03:18:26 -05:00
Jason Hooks
6d10c76b06 Unique Identifiers for Creatures and NPC Free Parts 2011-12-17 01:29:08 -05:00
Jason Hooks
93a4060346 Switching handleShapes to use sets instead of maps 2011-12-15 00:41:44 -05:00
Jason Hooks
d51dfebde1 NPCs fully rendered 2011-12-15 00:33:10 -05:00
Jason Hooks
47112ad7f9 Changing a lot of things 2011-12-13 23:49:03 -05:00
Jason Hooks
509009e5c1 Putting the actors in a list 2011-12-11 23:42:39 -05:00
Jason Hooks
0902a3db89 Filled out NpcAnimation and CreatureAnimation classes 2011-12-11 22:40:00 -05:00
gugus
dd14368f76 correct CMake 2011-12-11 11:24:25 +01:00
gugus
28bd9ce362 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal 2011-12-11 11:21:57 +01:00
gugus
7a3bc885d0 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal 
Conflicts:
	apps/openmw/CMakeLists.txt
 2011-12-11 11:21:48 +01:00
Jason Hooks
39338f4be1 NPC bounded parts 2011-12-09 15:20:35 -05:00
Jason Hooks
5c48d8fc1e more stuff 2011-12-09 03:02:09 -05:00
Jason Hooks
ee98a2af1a Empty npcs 2011-12-09 00:08:30 -05:00
gugus
4087ab3cda correct CMake and add some text formating attempt. 2011-12-01 13:44:34 +01:00
gugus
62946cc79d can now clear text. 2011-11-28 17:00:32 +01:00
gugus
bc51ba5a38 Add the journal window (J key). It's still not in the right position. 2011-11-28 16:51:11 +01:00
Jason Hooks
835c3f2603 Working towards npc rendering 2011-11-27 02:27:06 -05:00
Jason Hooks
7bd911b401 Problems with handles 2011-11-24 23:13:34 -05:00
Jason Hooks
16ff2a7a1b Changing to Actors;NPCAnimation;CreatureAnimation 2011-11-24 01:48:54 -05:00
Jason Hooks
0d3338f867 Some naming changes 2011-11-22 02:39:28 -05:00
Marc Zinnschlag
51d9c2c780 fixed argument type in ai related script instructions 2011-11-21 14:16:20 +01:00
Marc Zinnschlag
0f4adc39b3 added animation-related script instructions 2011-11-21 14:08:44 +01:00
Marc Zinnschlag
51d5c7cd59 Merge remote branch 'jhooks/mwrender' into mwrender 
Conflicts:
	apps/openmw/engine.cpp

- fixed code that did not compile
- removed tons of tabs
- more clean up
 2011-11-21 12:52:28 +01:00
Jason Hooks
7385948056 Yet another crash fix 2011-11-19 20:22:56 -05:00
Jason Hooks
d8367f4968 Activation fix 2011-11-19 17:45:05 -05:00
Jason Hooks
7319f7a8c6 Many bugs fixed related to changing cells 2011-11-19 01:01:19 -05:00
Jason Hooks
15fcdc8b72 Physics working 2011-11-17 19:38:52 -05:00
Jason Hooks
b3e1044699 Exterior cells 2011-11-17 18:08:48 -05:00
Jason Hooks
4dc59dfbdd Scenenode flip 2011-11-17 17:10:27 -05:00
Jason Hooks
a0947cd432 Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed 2011-11-16 21:15:49 -05:00
Jason Hooks
9b94074472 addObject 2011-11-16 16:22:13 -05:00
Jason Hooks
58f103a75c Adding new insertCellRefList;Collection switched to a set 2011-11-15 23:31:18 -05:00
Jason Hooks
bc06d13d30 Removing backups 2011-11-13 23:17:56 -05:00
Jason Hooks
dd46694059 Changing a lot of things in scene and world 2011-11-13 23:14:18 -05:00
Jason Hooks
db57f0a1a5 more corrections 2011-11-13 18:19:29 -05:00
Jason Hooks
bc58ef28cd Made corrections 2011-11-12 15:58:22 -05:00
Jason Hooks
0b3bb2719f Fixing some errors 2011-11-12 00:19:22 -05:00
Jason Hooks
c7dadec840 Updating the rest of mwclass 2011-11-11 23:01:12 -05:00
Jason Hooks
62d8d1add2 more recommended changes 2011-11-11 14:37:42 -05:00
Jacob Essex
746c3dc297 Added some minor documentation 2011-11-11 11:25:01 +00:00
Jason Hooks
f4e7bd6dfd Made some recommended changes 2011-11-11 00:20:53 -05:00
Jacob Essex
3779aaba62 Now no longer need to handle this exception here as it is handled by the dispatcher in the OpenEngine submodule 2011-11-09 23:12:10 +00:00
Jason Hooks
042bceb547 Changes to insertObjectRendering; Proposed insertObject 2011-11-09 18:06:55 -05:00
Jason Hooks
1faa07b279 insertObjectRendering proposed 2011-11-09 15:47:06 -05:00
Jason Hooks
a7652bcb0c Yacoby's changes on Objects 2011-11-09 13:53:29 -05:00
Jason Hooks
c25b49d2b6 refdata change 2011-11-08 22:59:39 -05:00
Jason Hooks
469086747e Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed 2011-11-07 23:35:39 -05:00
Jacob Essex
9aac625000 Changes to move the mutable ESM::Position data to RefData 2011-11-08 00:08:00 +00:00
Marc Zinnschlag
9794c4b928 Merge branch 'cmake' 2011-11-06 14:42:18 +01:00
Marc Zinnschlag
cb1373a4c7 rewrote cmake scripts for components 2011-11-06 09:30:15 +01:00
Jason Hooks
c11b3a57c1 Made buildStaticGeometry function 2011-11-05 14:57:33 -04:00
Jason Hooks
8edcd4d15b removing tabs 2011-11-04 21:57:39 -04:00
Jason Hooks
6c80e75deb More Objects functionality 2011-11-04 21:48:52 -04:00
Jason Hooks
e041006063 Adding light and fog functions 2011-11-03 23:47:15 -04:00
Jason Hooks
edf85b26f9 Insert Mesh, Insert Light, insertBegin improved 2011-11-03 19:40:37 -04:00
Jason Hooks
9ac627c931 Commenting out assert 2011-11-02 22:45:58 -04:00
Jason Hooks
d49a02abe5 new insertBegin() 2011-11-02 22:41:48 -04:00
Jacob Essex
0e3859385d Now ensures that the directory to the config file exists before Ogre tries to access it 2011-11-02 11:11:27 +00:00
Jason Hooks
c2181d2091 Dealing with scenenodes 2011-11-02 00:13:33 -04:00
Jason Hooks
5822221ae1 Made recommended changes 2011-11-01 13:47:36 -04:00
Jason Hooks
3d43a4cd33 Made recommended changes 2011-11-01 13:46:57 -04:00
Jason Hooks
f1bc5b0ab6 Objects started, RenderingInterface 2011-10-31 23:59:16 -04:00
Jason Hooks
3761271c59 Empty creature, objects, npc 2011-10-31 00:04:06 -04:00
Jason Hooks
86d3cec1aa Changing refdata3 2011-10-30 22:38:15 -04:00
Jason Hooks
15fae749ae Changing refdata2 2011-10-30 17:31:49 -04:00
Jason Hooks
e1558e8e14 Changing refdata 2011-10-30 16:59:40 -04:00
Jason Hooks
1083db5582 Hiding debugging 2011-10-30 00:25:29 -04:00
Jason Hooks
db73487623 Physics fix and cmake changes 2011-10-29 18:52:57 -04:00
Jason Hooks
ee923e1abe Testing 2011-10-29 18:43:16 -04:00
Marc Zinnschlag
2ee6be1a34 finished cmake cleanup for apps/openmw source files 2011-10-29 13:17:04 +02:00
Marc Zinnschlag
583e7221ef silenced a warning and removed some tabs 2011-10-29 09:55:22 +02:00
Marc Zinnschlag
33ecd8b66c fixed collision toggling bug 2011-10-29 09:50:11 +02:00
Jason Hooks
c3a492bf74 Debugging file renamed 2011-10-25 14:06:44 -04:00
Jason Hooks
d4f63443e6 Hiding the rendering manager; crash eliminated 2011-10-24 22:11:36 -04:00
Jason Hooks
965ff24597 Removing Object: 2011-10-24 13:57:12 -04:00
Jason Hooks
0c8aa7fae3 Removing Object: 2011-10-24 13:55:10 -04:00
Jason Hooks
6efc61b9df Removal of MWScene; Object listing fixed 2011-10-24 13:42:36 -04:00
Marc Zinnschlag
ad086312b8 testing: cmake script simplification 2011-10-22 13:55:06 +02:00
Jason Hooks
30ba9b74da Simple Debugging class 2011-10-22 00:15:15 -04:00
Jason Hooks
47593f3641 Removing old files 2011-10-20 19:35:49 -04:00
Jason Hooks
fcf404d27b GetFacedHandle in Physics. RenderingManager constructor code added 2011-10-20 18:15:30 -04:00