mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 06:56:38 +00:00
Code Issues Releases Wiki Activity
3993 commits 115 branches 76 tags 128 MiB
Commit graph

3993 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Marc Zinnschlag
344641e574 updated developer list in readme file 2012-04-11 13:38:17 +02:00
Chris Robinson
0b5b2e9260 Merge remote branch 'zini/master' into sound 2012-04-10 21:34:52 -07:00
scrawl
33f360f52f transparency fix 2012-04-09 15:36:51 +02:00
scrawl
944654f263 image rotating function 2012-04-09 15:20:57 +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