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

117 commits

Author SHA1 Message Date
gugus
01fefca0a3 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-15 14:53:19 +02:00
scrawl
447158e9d6 shutdown crash fix 2012-06-09 19:15:11 +02:00
scrawl
42e44ac1b5 fixed some leaks 2012-06-06 21:08:20 +02:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
gugus
0012d7eb58 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-03 12:53:23 +02:00
Edmondo Tommasina
a9a582f858 renderer.cpp: fix std::runtime_error compile error 2012-05-30 23:18:59 +02:00
scrawl
c5a685d11f addition to last commit: show the selected weapon/spell names as inventory/spell window caption 2012-05-29 18:59:11 +02:00
gugus
a711a3ebe1 Various fixes 2012-05-29 16:45:43 +02:00
scrawl
5d03e86613 added field of view and texture filtering to settings window 2012-05-29 04:54:54 +02:00
scrawl
14f4f09f83 proper resolution switching (reposition GUI & adjust mouse clipping region) 2012-05-28 09:19:25 +02:00
scrawl
f6a6684685 when the resolution changes, adjust camera aspect ratio and recreate compositors 2012-05-27 21:39:18 +02:00
scrawl
656a8f1be9 working menu transparency slider 2012-05-23 01:32:36 +02:00
scrawl
343bbaf0fd integrated video settings in the settings file, the launcher is now useless 2012-05-22 03:36:03 +02:00
scrawl
a284bfb4d0 Merge branch 'master' into inventoryGUI 2012-05-19 15:07:37 +02:00
gugus
09ec1da0f6 fix the latest commit: objects activation works again. 2012-05-17 16:12:55 +02:00
scrawl
c5d685c780 added an assert 2012-05-16 14:28:57 +02:00
scrawl
78b06d0ebf inventory window pinning 2012-05-12 22:44:12 +02:00
scrawl
a4d6d1baff added a utility for creating texture atlas at runtime 2012-05-04 18:09:45 +02:00
scrawl
c4b63bdb2f .gitmodules 2012-05-02 23:27:56 +02:00
scrawl
04ead5eb42 make the no-clip mode move much faster 2012-05-01 21:22:15 +02:00
scrawl
6850f3945c disable those physics debug prints 2012-05-01 21:13:41 +02:00
scrawl
a13f542396 disable snapping underwater 2012-05-01 21:01:18 +02:00
scrawl
86b6184f43 pMove in a seperate loop with fixed timestep to prevent frame-dependent movement 2012-04-30 23:55:22 +02:00
scrawl
4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-30 18:46:51 +02:00
scrawl
50d79a8815 Merge branch 'next' into tooltips 2012-04-29 17:30:34 +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
Jason Hooks
00260a24ce Water corrections 2012-04-18 21:28:25 -04: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
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
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
10398723d8 use different image pixel format 2012-04-15 22:44:38 +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
52b0b28c78 fixed the mygui output on console 2012-04-13 19:20:59 +02:00
scrawl
f2fae770d4 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwworld/player.cpp
 2012-04-13 13:55:13 +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
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
scrawl
75dd651205 Merge branch 'terraincollision' into physicsterrain 
Conflicts:
	apps/openmw/mwworld/physicssystem.cpp
 2012-04-09 13:56:09 +02:00
Jason Hooks
74deb5588d Post merge 2012-04-08 20:41:49 -04:00
scrawl
bc636f036c made it compile 2012-04-08 18:25:50 +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
Jason Hooks
57299571d5 Preparing for clothes/armor 2012-04-02 22:08:46 -04:00
scrawl
c0af3c7241 Merge branch 'master' into terraincollision 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-02 19:57:58 +02:00