mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 20:53:53 +00:00
Code Issues Releases Wiki Activity
2938 commits 108 branches 66 tags 133 MiB
Commit graph

2938 commits

This branch
This branch
All branches
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
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
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
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
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
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
Marc Zinnschlag
f36c8733fa Merge remote branch 'scrawl/graphics' 2012-04-15 17:02:51 +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
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
Marc Zinnschlag
6674dabd5a Merge remote branch 'scrawl/logfix' 2012-04-13 21:36:58 +02:00
scrawl
52b0b28c78 fixed the mygui output on console 2012-04-13 19:20:59 +02:00
k1ll
8156e9e5c4 Fixed install search path for openmw.desktop. It's directly in the binary dir. 2012-04-13 18:23:15 +02:00
k1ll
2d6cd16296 Now Debian Packages install the configured openmw.desktop file. 2012-04-13 17:53:01 +02:00
k1ll
dc2751f4ec Moved Build options to the top. I need this for my tar.gz packages but i think this is a good idea in general. 2012-04-13 17:46:26 +02:00
k1ll
226f312163 Set the version in the openmw.desktop file via CMake 2012-04-13 17:36:31 +02: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
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
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
Marc Zinnschlag
477237d60a Merge remote branch 'scrawl/cursor_replace' 2012-04-12 18:36:17 +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
95f87a8abf more or less complete list for morrowind.bsa (thanks to artorius) 2012-04-12 16:33:36 +02:00
scrawl
2b8c81e779 removed test.skin file 2012-04-12 14:31:12 +02:00
scrawl
4a6a8e5420 don't write to disk 2012-04-12 14:28:35 +02:00