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

2088 commits

Author SHA1 Message Date
gugus
a6419c3596 Clicking on an item is now detected. 
Trying to have items follow the mouse position, but it doesn't work yet.
 2012-04-26 19:35:45 +02:00
Marc Zinnschlag
d5e52e46ea removing even more cout spam (thanks to scrawl for finding this one) 2012-04-24 09:19:41 +02:00
scrawl
1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
 2012-04-24 02:02:03 +02:00
scrawl
e443455612 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2012-04-24 00:54:35 +02:00
Marc Zinnschlag
f4428097f9 removing more cout spam 2012-04-23 15:37:38 +02:00
Marc Zinnschlag
7ac9523e0c Merge branch 'master' into next 2012-04-23 15:32:02 +02:00
Marc Zinnschlag
9f1199ee7e removing a using directive from a header file 2012-04-23 15:29:15 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
Marc Zinnschlag
7102a825c2 Issue 255: moved global scripts into script manager (simplifying the environment class) 2012-04-23 11:15:47 +02:00
Marc Zinnschlag
2bfd90f3f9 Issue #255: added new environment class (not in use yet) 2012-04-23 10:57:16 +02:00
scrawl
1b02b503a2 gcc compile fix 2012-04-22 21:06:08 +02:00
scrawl
2c89306306 Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 2012-04-22 00:33:37 +02:00
Jason Hooks
8ebae0b706 Solid trace 2012-04-21 16:57:46 -04:00
Jason Hooks
16855291a7 Implementing snapping 2012-04-21 16:21:30 -04:00
gugus
25432d97d2 trying to get selected item. Doesn't work. 2012-04-21 20:35:45 +02:00
gugus
d4e9b62436 oups forgot to modify CMake 2012-04-21 11:11:40 +02:00
gugus
93ba773d2e Merge branch 'inventoryGUI' of https://github.com/pchan3/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/mwgui/container.cpp
 2012-04-21 11:08:10 +02:00
gugus
33654535c1 The inventory window now display the inventory of the player 2012-04-21 11:05:30 +02:00
gugus
1e8d894e1c Starting inventory window 2012-04-21 10:51:01 +02:00
Marc Zinnschlag
cc86998281 removing some cout spam 2012-04-21 10:12:59 +02:00
scrawl
7400b7f313 fix underwater effect staying active when teleporting from underwater to a cell that doesn't have water 2012-04-19 23:25:58 +02:00
scrawl
c6da3872b4 light improvements 2012-04-19 20:59:57 +02:00
Marc Zinnschlag
5f09f2bfc6 Merge remote branch 'scrawl/topic_case' into next 2012-04-19 10:36:34 +02:00
scrawl
934caf7a2b removed --report-focus which is now useless 2012-04-19 01:16:41 +02:00
scrawl
fb0e649191 minor fix 2012-04-19 01:10:55 +02:00
scrawl
aa4a1b675f fixed the sky reflection issue 2012-04-19 01:08:26 +02:00
scrawl
4889902b98 magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects 2012-04-18 21:18:53 +02:00
scrawl
4949576984 disable some player controls in gui mode 2012-04-18 19:03:26 +02:00
scrawl
c7381d4491 adding widget MWEnchantment 2012-04-18 18:09:30 +02:00
scrawl
d568b27b92 spell widget i18n improvements (used e.g. in birth menu) 2012-04-18 16:53:56 +02:00
pchan3
215d4e1739 Made adjustments to keep container window within the viewscreen. 2012-04-18 23:09:13 +10:00
pchan3
f902c8fa6f Fixes on Namespace issue & more. 2012-04-18 22:35:35 +10:00
scrawl
75b336baea Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	apps/openmw/mwworld/player.cpp
	libs/openengine/bullet/physic.cpp
 2012-04-18 13:43:15 +02:00
Jason Hooks
4d07ae7fe0 Swimming working 2012-04-18 00:13:38 -04:00
Jason Hooks
5f9056c45d Better no clip 2012-04-17 20:31:36 -04:00
scrawl
046ef39c4a use camera-relative rendering to prevent precision artifacts when moving far from (0,0,0) 2012-04-18 01:10:00 +02:00
scrawl
51a76eda92 Merge branch 'master' into graphics 2012-04-18 01:09:55 +02:00
Jason Hooks
1ce759af06 Merging in master 2012-04-17 18:12:05 -04:00
scrawl
8231cab599 correct case for dialogue topics 2012-04-17 23:47:50 +02:00
scrawl
2e57cf5730 fixed the tooltip for doors leading to exteriors, fixed map window cell name 2012-04-17 18:47:51 +02:00
scrawl
94993b515c clean up and tooltip padding 2012-04-17 16:49:28 +02:00
scrawl
8eb0636344 restored gui-mode tooltips 2012-04-17 16:00:13 +02:00
scrawl
1de1b3e40e Merge branch 'master' into tooltips 2012-04-17 15:57:08 +02:00
scrawl
c2fdacc84f show the creature name for soul gems (if any) 2012-04-17 15:51:02 +02:00
scrawl
c044fadcc3 show weapon type & damage in the tooltip 2012-04-17 15:31:16 +02:00
scrawl
a11c4da16c vertex colour tweak 2012-04-17 14:22:03 +02:00
Marc Zinnschlag
14ddcc1204 Merge remote branch 'jhooks/clothingarmor' 2012-04-17 00:26:39 +02:00
Jason Hooks
950378ff65 Khajiit male foot fix 2012-04-16 17:25:55 -04:00
scrawl
cdd4d83d9e moved the tooltip info to the appropriate MWWorld::Class classes 2012-04-16 22:58:16 +02:00
scrawl
13b67faf2f adding more safety checks 2012-04-16 20:39:41 +02:00
scrawl
c4825cdb43 fixed gold pickup sound for international MW versions, fix npc tooltip 2012-04-16 20:20:18 +02:00
scrawl
282f37b1b7 fix compilation 2012-04-16 19:34:46 +02:00
scrawl
53b48196f9 add interface for tooltips to MWWorld::Class 2012-04-16 19:30:52 +02:00
scrawl
cfa37b0e77 fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text 2012-04-16 19:14:05 +02:00
scrawl
424a90aa92 back & ok button caption 2012-04-16 17:46:54 +02:00
scrawl
14377ba789 window caption fix 2012-04-16 17:30:57 +02:00
scrawl
b3dc1931a9 general GUI refactoring, part 1 2012-04-16 15:48:01 +02:00
scrawl
f5ab127a39 toggleFullHelp 2012-04-16 15:00:44 +02:00
Marc Zinnschlag
7483c78b4a Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-16 14:06:27 +02:00
scrawl
d1e298c2e1 Merge branch 'master' into tooltips 2012-04-16 13:15:50 +02:00
Jason Hooks
0c9c253778 Fix for some types of boots 2012-04-15 22:49:17 -04:00
scrawl
194ecf274c attribute tooltips 2012-04-16 00:16:35 +02:00
scrawl
0a223196e8 Merge branch 'master' into tooltips 2012-04-15 22:23:16 +02:00
scrawl
268b7cd6fc replaced typename checks 2012-04-15 22:05:33 +02:00
Marc Zinnschlag
afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-15 22:06:05 +02:00
scrawl
5d9648d645 fix const reference 2012-04-15 22:00:28 +02:00
Jason Hooks
65c9cf565c Skirt and robe part blanking 2012-04-15 15:16:48 -04:00
scrawl
688e79e6d1 Merge branch 'master' into tooltips 2012-04-15 21:14:39 +02:00
scrawl
705d4c6d54 mostly complete 2012-04-15 21:14:14 +02:00
gugus
489261a6ae Close button works. 2012-04-15 21:02:54 +02:00
gugus
58d05fa503 more clean-up. Container window shows up! But there is no working close button. 2012-04-15 20:56:45 +02:00
Jason Hooks
bc8bb9c57e Reserve; skirts 2012-04-15 14:22:55 -04:00
gugus
78c8a22cd1 more clean up. The container GUI shows up now 2012-04-15 19:32:41 +02:00
gugus
a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-04-15 17:54:13 +02:00
gugus
b309d245c5 cleaning up hircine work 2012-04-15 17:52:39 +02:00
scrawl
ab4e03f05f Merge branch 'master' into tooltips 2012-04-15 17:11:14 +02:00
scrawl
d37bc9cba8 basic mouse-over info for in-game objects 2012-04-15 17:10:08 +02:00
Marc Zinnschlag
b5d12d0723 fixed ForceGreeting 2012-04-15 17:08:22 +02:00
Marc Zinnschlag
585ba41557 Merge remote branch 'gus/Factions2' 2012-04-15 17:05:38 +02:00
gugus
c24a85848f forceGreeting script instruction 2012-04-15 15:56:36 +02:00
gugus
f68248e0d0 corrected a bug in getPCRank 2012-04-15 14:20:08 +02:00
gugus
45a5877b23 implement getPCRank. Does not work yet. 2012-04-15 12:05:46 +02:00
Jason Hooks
85ac658cac Adding tons of skin body parts 2012-04-14 22:52:05 -04:00
Jason Hooks
5e1ac0cca1 Gloves, Gauntlets, Boots, Shoes 2012-04-14 20:32:46 -04:00
Jason Hooks
940a90e3ba Pauldrons 2012-04-14 19:21:14 -04:00
Jason Hooks
e5becb1f50 Group add function;Greaves 2012-04-14 18:58:52 -04:00
Jason Hooks
5d4ad4cd81 Shirts and Cuirasses 2012-04-14 16:44:46 -04:00
scrawl
cac662ca98 basic tooltips 2012-04-14 17:47:44 +02:00
scrawl
4b0099fb5b npc visibility flags fix 2012-04-14 16:10:47 +02:00
scrawl
fa5a1432c9 map lighting tweak, default settings tweak 2012-04-14 15:58:58 +02:00
scrawl
e05faa184f Merge branch 'terrainshader' into graphics 2012-04-14 15:10:35 +02:00
scrawl
e04d127f30 terrain shader fixes 2012-04-14 15:10:26 +02:00
Jason Hooks
7551926afd Adding helmets 2012-04-13 23:25:15 -04:00
scrawl
d861b8e45e Merge branch 'master' into graphics 2012-04-13 16:16:09 +02:00
Alexander "Ace" Olofsson
0c6862e3e6 Undefining some windows defines 2012-04-13 15:09:38 +02:00
Marc Zinnschlag
3442ef17a8 fixed ModDisposition 2012-04-13 14:54:13 +02:00
Marc Zinnschlag
73df51695c Merge remote branch 'gus/Factions2' 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/statsextensions.cpp
 2012-04-13 14:49:37 +02:00
scrawl
f2fae770d4 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwworld/player.cpp
 2012-04-13 13:55:13 +02:00
scrawl
a33ae35e94 some fixes 2012-04-13 13:28:31 +02:00
Marc Zinnschlag
e16daeed23 added GetSpell script function 2012-04-13 13:17:57 +02:00
scrawl
e3486931ae F10 hotkey toggle FPS 2012-04-13 13:17:50 +02:00
Marc Zinnschlag
37f478b69a Merge branch 'spells' 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwmechanics/npcstats.hpp
 2012-04-13 11:32:33 +02:00
Marc Zinnschlag
b099e1baf5 added addspell and removespell script instructions 2012-04-13 11:12:53 +02:00
Marc Zinnschlag
52c7ee3b6a moved selected spell from NpcStats to Spells 2012-04-13 10:49:45 +02:00
Marc Zinnschlag
1e56acc3de Merge remote branch 'scrawl/graphics' 2012-04-13 10:12:07 +02:00
Jason Hooks
e869433b07 Add or replace individual parts 2012-04-12 22:16:02 -04:00
Jason Hooks
1f566fc93a Another remove function 2012-04-12 20:59:30 -04:00
Jason Hooks
a885f3e942 Remove part function 2012-04-12 20:40:11 -04:00
scrawl
fb78e853d4 removed 2 unneeded lines 2012-04-12 19:18:38 +02:00
Marc Zinnschlag
a4fb71a0fc Merge remote branch 'scrawl/graphics' 2012-04-12 18:46:02 +02:00
scrawl
e2ec889d10 fixed a warning "implicit cast to float3" 2012-04-12 17:40:26 +02:00
gugus
7edc5c733c corrected a bug about rank. 2012-04-12 17:29:05 +02:00
gugus
03d6d1fb82 NPC rank is correctly loaded now. Also corrected a potential bug (i think). 2012-04-12 17:08:57 +02:00
scrawl
a96ad7fb82 restored toggleWater 2012-04-12 16:46:56 +02:00
scrawl
800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 2012-04-12 14:26:21 +02:00
Jason Hooks
7fce57f335 Getting started with a new branch 2012-04-11 20:16:22 -04:00
scrawl
a727bcd4a4 override nif transparency settings (part 1) 2012-04-11 20:13:15 +02:00
Marc Zinnschlag
26a529111c removed old known spell list from NpcStats 2012-04-11 19:45:56 +02:00
Marc Zinnschlag
77065390d7 simplifying Spells class 2012-04-11 19:40:42 +02:00
Marc Zinnschlag
e04ccfced0 replaced old abilities container in CreatureStats with a Spells object 2012-04-11 19:03:36 +02:00
Marc Zinnschlag
750d79eaf0 added spell container class 2012-04-11 19:03:06 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
gugus
0553227ee1 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/player.cpp
	apps/openmw/mwworld/player.hpp
 2012-04-09 14:43:35 +02:00
gugus
dd9a88cee2 clean up 2012-04-09 14:32:07 +02:00
gugus
6ca212b9e9 script instruction: PCJoinFaction 2012-04-09 14:30:42 +02:00
gugus
aa8418634f add PCLowerRank script instruction 2012-04-09 14:26:53 +02:00
gugus
45d11eaf14 fixed a bug in the dialogue manager. 2012-04-09 14:23:12 +02:00
scrawl
75dd651205 Merge branch 'terraincollision' into physicsterrain 
Conflicts:
	apps/openmw/mwworld/physicssystem.cpp
 2012-04-09 13:56:09 +02:00
gugus
e5b1e27fa6 pcRaiseRank works. Player can now join factions. 2012-04-09 13:24:19 +02:00
Marc Zinnschlag
62908c9ef5 Merge remote branch 'scrawl/settingsfixes' 2012-04-09 10:47:13 +02:00
Jason Hooks
c0f52fef48 one more change 2012-04-09 00:51:10 -04:00
Jason Hooks
80afcb2eac small change 2012-04-08 20:44:44 -04:00
Jason Hooks
74deb5588d Post merge 2012-04-08 20:41:49 -04:00
scrawl
1df7be7fee - fixes to texture filtering setting 
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
 2012-04-09 00:10:42 +02:00
Marc Zinnschlag
0aecb0ed5c cmake fix 2012-04-08 23:44:40 +02:00
Marc Zinnschlag
5e9d209b21 Merge remote branch 'minty3/testbranch' 2012-04-08 23:40:48 +02:00
Jason Hooks
6bdfdf379b Trying iterators 2012-04-08 17:27:56 -04:00
Marc Zinnschlag
e17a09e710 Merge remote branch 'scrawl/water' 2012-04-08 23:21:46 +02:00
Aleksandar Jovanov
db928dcb2f put an opening bracket on a new line 2012-04-08 19:44:11 +02:00
Aleksandar Jovanov
9893e4b384 made player respect NpcStats for mDrawState 2012-04-08 19:43:04 +02:00
Marc Zinnschlag
9e3299cae8 Merge remote branch 'scrawl/water' 2012-04-08 18:40:19 +02:00
Alexander "Ace" Olofsson
00b8ce6b35 Fix linker error in windows. 2012-04-08 18:22:41 +02:00
scrawl
a5c6207fe7 add setting to disable the underwater effect 2012-04-08 17:44:00 +02:00
scrawl
9e1a9e5758 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	libs/openengine/bullet/physic.cpp
 2012-04-08 17:08:36 +02:00
scrawl
b1c84f28a9 Merge branch 'master' into water 
Conflicts:
	files/settings-default.cfg
 2012-04-08 16:11:16 +02:00
scrawl
113bbfa253 removed the now unneccesary SG for transparent objects 2012-04-08 14:37:36 +02:00
Aleksandar Jovanov
23cc1d17ca missing ; added 2012-04-08 13:28:34 +02:00
Aleksandar Jovanov
c589cbd4ff enum bug fix 2012-04-08 13:25:28 +02:00
Aleksandar Jovanov
15526d6110 only fists support lacks 2012-04-08 13:17:16 +02:00
Marc Zinnschlag
77604086e2 Merge branch 'autoequip' 2012-04-08 13:01:25 +02:00
Marc Zinnschlag
ab2a1297b0 exclude player from auto equip 2012-04-08 13:01:03 +02:00
Aleksandar Jovanov
c1afd534fc all stuff added 2012-04-08 12:37:59 +02:00
Aleksandar Jovanov
b4ee01e691 missing file 2012-04-08 12:26:59 +02:00
Marc Zinnschlag
dcab6737e5 consider skills when auto equipping 2012-04-08 12:26:21 +02:00
Aleksandar Jovanov
b1259ca15c added a 'backend' for NPC/Player draw state 2012-04-08 12:25:33 +02:00
Aleksandar Jovanov
d5b8d4ef49 Revert "test commit" 
This reverts commit 8c607870c0.

reverting the test commit in the test branch
 2012-04-08 11:30:17 +02:00
Aleksandar Jovanov
8c607870c0 test commit 2012-04-08 11:26:54 +02:00
Marc Zinnschlag
8e6c445111 Merge remote branch 'chris/sound' 2012-04-08 11:13:42 +02:00
Jason Hooks
ebab98a8a0 Restructuring things 2012-04-07 22:02:20 -04:00
Chris Robinson
59ccab0b2c Add sound volume settings 2012-04-07 16:00:30 -07:00
Chris Robinson
752e89a268 Add a setting to select the sound device name 2012-04-07 15:28:38 -07:00
Chris Robinson
b8be867e6e Work around a bug in the Windows OpenAL router 2012-04-07 14:58:52 -07:00
scrawl
c748252d33 weather fix again 2012-04-07 22:55:25 +02:00
scrawl
cdea19206c Revert "more accurate fog, TODO: apply this to the terrain" 
This reverts commit 96c37d3e7c.
 2012-04-07 22:47:39 +02:00
scrawl
96911ada95 restored render queue of transparent objects, they are now part of the mrt textures 
this fixes some issues with transparent objects not visible in the refraction
 2012-04-07 22:37:15 +02:00
Marc Zinnschlag
34a02fef45 consider item value when auto equipping 2012-04-07 20:09:09 +02:00
Marc Zinnschlag
d5a7d418dd added getValue function to Class hierarchy 2012-04-07 19:53:49 +02:00
Marc Zinnschlag
f52b9cc162 Merge branch 'autoequip' 2012-04-07 18:48:30 +02:00
Marc Zinnschlag
c94d683014 fill in initial spell list from NPC record 2012-04-07 18:48:02 +02:00
Marc Zinnschlag
12f7bae526 added known spells and selected spell to NpcStats 2012-04-07 18:37:41 +02:00
scrawl
044d649edd Merge branch 'master' into water 2012-04-07 17:16:35 +02:00
scrawl
96c37d3e7c more accurate fog, TODO: apply this to the terrain 2012-04-07 16:55:32 +02:00
scrawl
dbf7547003 fixed first weather transition being instant 2012-04-07 16:33:03 +02:00
Roman Melnik
bdbb8a8d84 Merge remote-tracking branch 'upstream/master' into windowsPinning 
Conflicts:
	apps/openmw/mwgui/window_manager.cpp (keep both changes)
 2012-04-07 17:30:20 +03:00
Roman Melnik
72b3f6121d Windows Pinning: add files to CMakeLists.txt 
Add new files (map_window and window_pinnable_base)
 2012-04-07 12:37:15 +03:00
Marc Zinnschlag
b7614dd0ce Merge remote branch 'chris/sound' 2012-04-06 22:09:34 +02:00
scrawl
dbde8405f7 Merge branch 'master' into water 2012-04-06 21:21:57 +02:00
scrawl
50702c5e84 Merge branch 'master' into water 2012-04-06 20:58:50 +02:00
Chris Robinson
87e8917c4d Don't try to play sounds when no sound output is initialized 2012-04-06 10:43:14 -07:00
scrawl
c49d5dd40b another sky tweak 2012-04-06 19:23:19 +02:00
scrawl
f008ca166b restored moons like they were 2012-04-06 19:21:28 +02:00
scrawl
c0f991ac0a underwater depth effect 2012-04-06 18:51:30 +02:00
scrawl
456eb95209 reversed sun and moon paths (sunrise at east) 2012-04-06 18:22:37 +02:00
scrawl
8316a4c2ec add mrt dummy output to sky shaders 2012-04-06 17:21:56 +02:00
scrawl
c169f9e171 underwater tweaks 2012-04-06 16:11:08 +02:00
scrawl
2976625b00 better underwater 2012-04-06 15:51:57 +02:00
scrawl
ec3fe1ef00 no sun glare in the reflection 2012-04-06 15:17:54 +02:00
scrawl
393530e671 more or less fixed the sky for normal viewing angles, still disappears at a certain height though 2012-04-06 15:05:17 +02:00
scrawl
a41eee9a72 specular lighting 2012-04-06 14:07:52 +02:00
Marc Zinnschlag
8bf9b371c7 removed remains of input framelistener 2012-04-06 10:39:55 +02:00
Roman Melnik
ef0a185e11 Pinnable windows: hide hud elements 
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.

Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
 2012-04-06 01:17:23 +03:00
scrawl
e718d4b6f0 another sky fix 2012-04-05 22:36:48 +02:00
scrawl
b36c0d95b8 night transition fix 2012-04-05 22:11:04 +02:00
scrawl
e492a69c8f Merge branch 'inputfix' into water 2012-04-05 21:27:59 +02:00
scrawl
a3151fe525 fixed input handling priority in the main loop 2012-04-05 21:16:51 +02:00
scrawl
8bfc81f398 Merge branch 'master' into water 2012-04-05 20:09:38 +02:00
scrawl
622fb568cf removed MRT setting and figure it out automatically 2012-04-05 19:27:54 +02:00
scrawl
b8a470efcd put transparent objects in a seperate render queue, in order to not mess up the mrt textures 2012-04-05 19:07:21 +02:00
Marc Zinnschlag
000cfad82d Merge remote branch 'scrawl/gamesettings' 2012-04-05 18:07:47 +02:00
scrawl
88c50c5171 Merge branch 'master' into water 2012-04-05 15:38:46 +02:00
scrawl
1b89a9e203 various fixes 2012-04-05 15:30:55 +02:00
Dmitry Marakasov
84b475130a Add missing include 2012-04-05 15:03:28 +02:00
scrawl
e1bde415f5 typo 2012-04-05 14:22:44 +02:00
scrawl
43fd0352f4 removed unneeded lines 2012-04-05 14:21:57 +02:00
scrawl
f49131e1b8 renamed setting, automatically disable MRT when unsupported 2012-04-05 13:09:59 +02:00
Marc Zinnschlag
1201c271b2 Merge remote branch 'swick/initocfg' 2012-04-05 12:43:00 +02:00
scrawl
f6342cfd60 fixed viewport background color, fixed indentation of some old functions 2012-04-05 11:52:06 +02:00
scrawl
5664d879a5 fixed some sky objects 2012-04-05 11:40:56 +02:00
scrawl
ab8b74dcac forgot adding a file 2012-04-05 08:58:21 +02:00
Jason Hooks
ca4de0606e Some planning 2012-04-04 23:23:24 -04:00
scrawl
3f05aba76d got MRT working, some minor quirks to solve (black viewport background) 2012-04-05 01:21:36 +02:00
Sebastian Wick
f7bfea5861 typo 2 -.- 2012-04-05 00:16:44 +02:00
Sebastian Wick
56c9992b29 typo 2012-04-04 23:52:42 +02:00
Sebastian Wick
8c84f68dab fix for older boost versions; unsigned warning 2012-04-04 23:51:22 +02:00
Marc Zinnschlag
6fd3d5c776 Merge remote branch 'lgro/master' 2012-04-04 23:19:30 +02:00
gugus
aaa5368fe9 added script instruction pcraiserank. Does not work yet. 2012-04-04 22:14:38 +02:00
gugus
2c7c945208 check playerfaction during dialogue 2012-04-04 22:13:57 +02:00
Lukasz Gromanowski
cd2789b15a Revert "Issue #225: Correction to commit ae98904." 
This reverts commit 0e5c90d3e7.
 2012-04-04 21:05:19 +02:00
Sebastian Wick
5dd65c11ee forgot to save the file 2012-04-04 21:04:52 +02:00
Sebastian Wick
57ae1bdc43 Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg 
Conflicts:
	apps/openmw/main.cpp
 2012-04-04 20:58:02 +02:00
scrawl
eb67afe552 added MRT output to terrain material 2012-04-04 20:18:08 +02:00
Sebastian Wick
d3a6484bbc set the default value for --fallback the right way 2012-04-04 19:59:46 +02:00
Sebastian Wick
a974d88cf1 Revert "set a default value for --fallback" 
This reverts commit 94a220dcdd.
 2012-04-04 19:58:04 +02:00
Sebastian Wick
94a220dcdd set a default value for --fallback 2012-04-04 19:52:07 +02:00
scrawl
6442d49e16 render queue groups, sky fix 2012-04-04 18:53:40 +02:00
Sebastian Wick
48b7b03453 typo; World::getFallback(std::string key, std::string def) 2012-04-04 16:15:15 +02:00
Sebastian Wick
16e7bf353a remove debug message 2012-04-04 16:08:46 +02:00
Sebastian Wick
de510d445b throw an error if the --fallback syntax is wrong 2012-04-04 15:23:14 +02:00
scrawl
cc4076d42a basic noise 2012-04-03 21:16:43 +02:00
scrawl
fe63f2b2aa first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering) 2012-04-03 19:10:02 +02:00
Marc Zinnschlag
e403c7158a Merge remote branch 'gus/DialogueSystem' 2012-04-03 18:27:36 +02:00
Marc Zinnschlag
cc9696cc2c Merge remote branch 'scrawl/minimap' 2012-04-03 18:26:20 +02:00
gugus
a268b89239 changed the way NPC faction is checked. Should be the same way for the player. 2012-04-03 17:31:41 +02:00
gugus
be4af711af NPC rank was not loaded. Not sure if it's the right way, but it seems to work. 2012-04-03 17:30:19 +02:00
gugus
07ea63c10c Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-03 17:29:00 +02:00
scrawl
6481cf87fc cleanup resources 2012-04-03 17:07:16 +02:00
scrawl
052cc47ee9 fixed waterAdded 2012-04-03 16:53:33 +02:00
scrawl
b3a186e729 simple water without shaders that uses original MW textures 2012-04-03 16:37:54 +02:00
scrawl
c1693a0c63 Merge branch 'minimap' into water 2012-04-03 15:37:11 +02:00
scrawl
51e33cc090 fixed map of some interiors 2012-04-03 15:34:13 +02:00
scrawl
8aea311797 added visibility flags for everything 2012-04-03 15:13:47 +02:00
scrawl
fd45208196 re-added code for reflection & refraction rendering 2012-04-03 14:23:23 +02:00
scrawl
d393f2dd4b Merge branch 'master' into water 2012-04-03 14:06:14 +02:00
Jason Hooks
57299571d5 Preparing for clothes/armor 2012-04-02 22:08:46 -04:00
Sebastian Wick
73705dadf6 parse fallback with boost program option custom validators 2012-04-03 02:14:39 +02:00
Sebastian Wick
d87dffa948 should work... but does not even compile 2012-04-03 01:47:43 +02:00
Marc Zinnschlag
26371a82a5 Merge remote branch 'scrawl/crashfix' 2012-04-02 23:53:07 +02:00
Lukasz Gromanowski
0e5c90d3e7 Issue #225: Correction to commit ae98904. 
Changed pointer to LandData struct to simple member variable.
 2012-04-02 23:50:53 +02:00
Sebastian Wick
ab9c430632 fallback in apps/openmw; fix for apps/mwiniimporter 2012-04-02 20:47:09 +02:00
scrawl
d4a2bdfa3d fix crash when hardware occlusion queries unsupporetd 2012-04-02 20:46:42 +02:00
scrawl
c0af3c7241 Merge branch 'master' into terraincollision 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-02 19:57:58 +02:00
scrawl
bd9e165e3f Merge branch 'master' into water 2012-04-02 19:44:25 +02:00
scrawl
16481b0594 Merge branch 'master' into minimap 2012-04-02 19:38:36 +02:00
scrawl
342464530d rotated map working 2012-04-02 19:37:24 +02:00
scrawl
ff15f28787 options for texture filtering and mipmaps 2012-04-02 18:01:49 +02:00
scrawl
39ee9e9ab8 setting for field of view 2012-04-02 17:51:51 +02:00
scrawl
5f2a674d93 fixed a typo 2012-04-02 16:14:39 +02:00
scrawl
00cc45c537 FPS is now a setting instead of commandline option 2012-04-02 16:10:54 +02:00
scrawl
fd662f937a add settings for viewing distance and fog 2012-04-02 15:51:48 +02:00
scrawl
e5cc9adbb0 added settings for rendering distance of small objects 2012-04-02 15:30:29 +02:00
scrawl
2b4b941192 Merge branch 'master' into gamesettings 2012-04-02 15:21:10 +02:00
scrawl
e0631dd9be Merge branch 'master' into minimap 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-02 14:38:02 +02:00
scrawl
b380e71832 fixed underwater wireframe mode 2012-04-02 14:32:21 +02:00
scrawl
1445ae992d adding a setting to disable static geometry 2012-04-02 14:24:16 +02:00
scrawl
5accca385c fix crash on exit when no user settings exist 2012-04-02 13:47:25 +02:00
Marc Zinnschlag
6022d3ab13 Merge remote branch 'corristo/pgrd-rendering' 
reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
 2012-04-02 12:04:47 +02:00
Marc Zinnschlag
fb44a5da10 Merge remote branch 'ace/win-fix' 2012-04-02 11:46:09 +02:00
Marc Zinnschlag
eccb983c44 Merge remote branch 'chris/sound' 2012-04-02 11:34:48 +02:00
Marc Zinnschlag
cdd0182912 Merge remote branch 'scrawl/occlusionquery' 
Reduced cout spam

Conflicts:
	apps/openmw/mwrender/occlusionquery.cpp
 2012-04-02 11:33:16 +02:00
Jason Hooks
07d0203a3c Merge remote-tracking branch 'upstream/master' 2012-04-02 00:08:12 -04:00
Chris Robinson
63e0e82049 Implement an Audiere-based decoder 2012-04-01 15:02:07 -07:00
Roman Melnik
91a377df86 Fix behaviour of the MapWindow 
The map now will track player's position/rotation when
pinned, and will not update if position/rotation didn't
change since last frame.
 2012-04-01 23:51:49 +03:00
Chris Robinson
2147210ad7 Don't set an underwater environment when there's no water 2012-04-01 12:46:49 -07:00
Lukasz Gromanowski
ae989040e5 Issue #225: Fix for memleak when loading terrain. 2012-04-01 21:29:49 +02:00
Alexander "Ace" Olofsson
cec9562282 Fixing an ambigous symbol 2012-04-01 20:29:00 +02:00
scrawl
0a5757791c Merge branch 'master' into minimap 2012-04-01 20:17:07 +02:00
scrawl
c2a82c3d89 Merge branch 'master' into gamesettings 2012-04-01 20:06:18 +02:00
Roman Melnik
911ca4be89 Move MapWindow to separate files 
Separate MapWindow from bunch of classes in layouts.cpp/hpp
Inherit it from WindowPinnableBase.

TODO: map arrow (player position) updates orientation only
when you open the inventory. When the map window is pinned,
the arrow direction is not updated.
 2012-04-01 20:39:53 +03:00
Roman Melnik
d09f0610ea Add basic windows pinning 
Create WindowPinnableBase class for windows which should be
allowed to be pinned.

Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).

Handle clicking on PinToggle button (pinning/unpinning a window).
 2012-04-01 20:36:57 +03:00
scrawl
7b3adb27a3 backend changes, terrain num lights setting 2012-04-01 18:48:37 +02:00
scrawl
f4bbcb48a6 settings-default.cfg 2012-04-01 17:14:49 +02:00
Marc Zinnschlag
de41e1118a Merge remote branch 'scrawl/weather' 2012-04-01 17:10:30 +02:00
scrawl
6091a0504d first settings test (config file has to be created manually) 2012-04-01 16:59:35 +02:00
Nikolay Kasyanov
30d6c880ff Feature #37 (In Progress) Render Path Grid 
tuned sized a bit
 2012-04-01 17:51:37 +04:00
Nikolay Kasyanov
cab412c225 Feature #37 (In Progress) Render Path Grid 
optimisation, now it takes only two batches per cell.
 2012-04-01 17:27:18 +04:00
scrawl
9a261a02aa changed the cloud movement direction like suggested on the forum 2012-04-01 15:14:43 +02:00
scrawl
ee754eda6c don't create sky until entering an exterior cell 2012-04-01 15:07:41 +02:00
scrawl
df8e0bbff2 player check 2012-04-01 14:53:41 +02:00
scrawl
80456778be fix for pickup up transparent objects, workaround for doors 2012-04-01 14:22:04 +02:00
scrawl
30407d3a2c Merge branch 'master' into occlusionquery 2012-04-01 14:16:25 +02:00
scrawl
4e63f89829 silence an error regarding faced handle 2012-04-01 13:09:30 +02:00
Jason Hooks
0021ccf862 Merge remote-tracking branch 'upstream/master' 2012-03-31 20:48:42 -04:00
Chris Robinson
9c06bfc8fc Merge remote branch 'zini/master' into sound 2012-03-31 14:26:21 -07:00
Marc Zinnschlag
40310f3663 Merge remote branch 'scrawl/occlusionquery' 2012-03-31 22:09:47 +02:00
Marc Zinnschlag
b5b40e2623 Merge remote branch 'lgro/master' 2012-03-31 21:45:15 +02:00
Lukasz Gromanowski
bdc4c79b4e Fix for segfault when doing 'coc "seyda neen"'. 
This is a fix for segfault:

==8683== Process terminating with default action of signal 11 (SIGSEGV)
==8683==  Access not within mapped region at address 0x0
==8683==    at 0x59DFE4: MWRender::Animation::handleShapes(std::vector<Nif::NiTriShapeCopy, std::allocator<Nif::NiTriShapeCopy> >*, Ogre::Entity*, Ogre::SkeletonInstance*) (animation.cpp:503)
==8683==    by 0x5A4ECE: MWRender::Actors::update(float) (actors.cpp:134)
==8683==    by 0x5937A9: MWRender::RenderingManager::update(float) (renderingmanager.cpp:168)
==8683==    by 0x629AD6: MWWorld::World::update(float) (world.cpp:705)
==8683==    by 0x68B022: OMW::Engine::frameRenderingQueued(Ogre::FrameEvent const&) (engine.cpp:157)
==8683==    by 0x51F9574: Ogre::Root::_fireFrameRenderingQueued(Ogre::FrameEvent&) (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F964F: Ogre::Root::_fireFrameRenderingQueued() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F9681: Ogre::Root::_updateAllRenderTargets() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F98CF: Ogre::Root::renderOneFrame() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F990C: Ogre::Root::startRendering() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x68A669: OMW::Engine::go() (engine.cpp:408)
==8683==    by 0x51CECB: main (main.cpp:254)
==8683==  If you believe this happened as a result of a stack
==8683==  overflow in your program's main thread (unlikely but
==8683==  possible), you can try to increase the size of the
==8683==  main thread stack using the --main-stacksize= flag.
==8683==  The main thread stack size used in this run was 8388608.

when doing 'coc "seyda neen"' when animations are enabled
(Animation::animate member variable is set to 1).
 2012-03-31 21:34:40 +02:00
Marc Zinnschlag
89fb3146ab Merge remote branch 'ace/win-fix' 2012-03-31 21:31:16 +02:00
Marc Zinnschlag
ca4ad74151 more cleanup 2012-03-31 21:29:46 +02:00
Alexander "Ace" Olofsson
64f792c01d Fix a value defined at the wrong place 2012-03-31 21:05:33 +02:00
Alexander "Ace" Olofsson
4ef921c43f Prevent internal classes from being marked dllimport 2012-03-31 20:50:22 +02:00
scrawl
13efe68fc3 disabled some debug output 2012-03-31 20:28:07 +02:00
scrawl
cfb194f1d1 fix 6 2012-03-31 20:18:20 +02:00
scrawl
5f78f6c723 change queue 2012-03-31 20:10:34 +02:00
scrawl
b018d00fd3 fix 5 2012-03-31 20:05:23 +02:00
Chris Robinson
e8e8d3fb1b Fully reset the music before starting the next track 2012-03-31 10:59:29 -07:00
Eli2
3cc81d74bc Cleanup, replaced if with switch 2012-03-31 19:50:21 +02:00
Chris Robinson
3a57746ee4 Remove an unneeded volume special-case 2012-03-31 10:43:55 -07:00
Chris Robinson
4944a29b21 Keep track of the sound pitch 2012-03-31 10:41:12 -07:00
scrawl
c9067249dd fix 4 2012-03-31 19:16:14 +02:00
scrawl
c08a2b2942 fix 3 2012-03-31 19:12:02 +02:00
scrawl
909abb480d fix 2 2012-03-31 19:09:36 +02:00
scrawl
f8d45eae52 fix #1 2012-03-31 19:08:05 +02:00
Chris Robinson
cbf6c0404a Implement a basic underwater sound environment 2012-03-31 10:06:12 -07:00
Marc Zinnschlag
751e7d2199 basic auto-equipping (picks the first matching item 2012-03-31 17:26:15 +02:00
Chris Robinson
575474ff69 Pass the mode flags to the sound output play methods 2012-03-31 08:14:39 -07:00
Chris Robinson
b2d7dca8c3 Merge remote branch 'zini/master' into sound 2012-03-31 07:46:56 -07:00
Chris Robinson
977e7ac9a3 Remove the Play_Single flag. It's not correct. 2012-03-31 07:41:26 -07:00
Chris Robinson
ae308b9b5f Use a set of flags instead of separate booleans 2012-03-31 07:31:55 -07:00
Chris Robinson
e48d125a84 Only allow one instance of a given tracked soundid 
The untracked flag should probably be broken up and combined with the loop
boolean into a set of flags.
 2012-03-31 05:57:03 -07:00
Nikolay Kasyanov
5e829362cb Feature #37 (In Progress) Render Path Grid 
more similar to vanilla path grid rendering
 2012-03-31 16:22:55 +04:00
Nikolay Kasyanov
006e1cde85 some updates after terrain merge 2012-03-31 14:56:54 +04:00
Nikolay Kasyanov
523648dbb1 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/debugging.cpp
 2012-03-31 14:56:18 +04:00
Chris Robinson
bfac946878 Finally "fix" --nosound 
Expect degraded performance with it. Looping sounds are constantly checked to
see if they're playing, and try to play it again when it's not.
 2012-03-31 03:31:41 -07:00
Chris Robinson
7541e08909 Don't reset the sound Output device if init fails 2012-03-31 02:48:14 -07:00
Nikolay Kasyanov
057c2f2e2a Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-31 13:42:13 +04:00
Marc Zinnschlag
509650d5f3 Merge remote branch 'ace/fs-fix' 2012-03-31 11:37:18 +02:00
Chris Robinson
28378c063b Minor OpenAL_SoundStream cleanups 2012-03-31 02:22:23 -07:00
Chris Robinson
4e908aa095 Add a method to set the sound's position 2012-03-31 01:34:26 -07:00
Chris Robinson
b01289128b Split OpenAL_Sound into separate classes for 2D and 3D sounds 2012-03-31 01:15:27 -07:00
Chris Robinson
5adeee20fd Mute sounds that go outside the max distance 2012-03-31 00:57:29 -07:00
Chris Robinson
fc167dbc83 Pass Ogre Vector3s to playSound3D and updateListener 2012-03-30 11:42:11 -07:00
Chris Robinson
fefc8f86ab Remove the unused streamSound3D method 2012-03-30 11:11:07 -07:00
Chris Robinson
c33349a774 Merge remote branch 'zini/master' into sound 2012-03-30 08:36:01 -07:00
Marc Zinnschlag
0892df0ad3 framework for gamemechanics-realted actor updated 2012-03-30 17:01:55 +02:00
Marc Zinnschlag
a1d3516e0a constness fix 2012-03-30 17:01:23 +02:00
scrawl
fc5cd703bb maps are now rendered with correct rotation, however for interiors the arrow is wrong 2012-03-30 16:34:36 +02:00
Chris Robinson
1ee8b963d0 Store the sound listener position as well 2012-03-30 07:30:17 -07:00
Marc Zinnschlag
d717b7b9dd factored out actor related game mechanics code into a separate class 2012-03-30 16:18:58 +02:00
Chris Robinson
fad27d99e6 Update the actual sound volume with the position 2012-03-30 07:10:34 -07:00
scrawl
a4576f043d fixed the physics debug rendering now activates/deactivates properly 2012-03-30 16:02:41 +02:00
Chris Robinson
479df78ea1 Update the actual sound position after the listener 2012-03-30 07:01:37 -07:00
Marc Zinnschlag
8d7bf34348 Merge branch 'terrain' 2012-03-30 15:52:27 +02:00
Marc Zinnschlag
557e97bab4 fixed a terrain-related Redemption crash 2012-03-30 15:52:09 +02:00
Chris Robinson
71d9d7e943 Store the current sound position with the Sound object 2012-03-30 06:41:06 -07:00
Marc Zinnschlag
46279a001b Merge remote branch 'scrawl/dialogue' 2012-03-30 15:39:56 +02:00
Marc Zinnschlag
2d2af4b28a Merge remote branch 'scrawl/terrain18' into terrain 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
 2012-03-30 15:38:14 +02:00
scrawl
521b9eec6c Merge branch 'master' into minimap 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/world.cpp
 2012-03-30 15:31:07 +02:00
Chris Robinson
de102cd274 Simplify broken OpenAL workaround 2012-03-30 06:28:40 -07:00
Chris Robinson
33a63d88a5 Merge remote branch 'zini/master' into sound 2012-03-30 06:22:19 -07:00
scrawl
30d27fa83f Merge branch 'master' into occlusionquery 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-30 15:00:04 +02:00