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

2838 commits

Author SHA1 Message Date
scrawl
234716daa6 finished spell creation 2012-10-23 11:42:38 +02:00
scrawl
33361e6539 Merge branch 'master' into spellcreation 2012-10-23 10:38:53 +02:00
Marc Zinnschlag
0547f11564 Issue #68: Remove dead actors from actor list 2012-10-20 10:54:51 +02:00
Marc Zinnschlag
f2e25b8a47 Issue #68: Keep dead actors out of the actor list for the current scene 2012-10-20 10:49:48 +02:00
scrawl
59560e84eb small addition 2012-10-19 20:48:15 +02:00
scrawl
b2b9254718 improved the ingredient GUI code (this didnt fix anything, though) 2012-10-19 20:44:53 +02:00
scrawl
475163bd4a Merge branch 'master' of https://github.com/zinnschlag/openmw 2012-10-19 20:21:34 +02:00
scrawl
fbe3538f32 bug #412: sort birth signs 2012-10-19 20:13:37 +02:00
Marc Zinnschlag
3f6afb13f1 Merge remote-tracking branch 'scrawl/alchemy' 2012-10-19 20:09:45 +02:00
scrawl
8d7514e341 corrected chance 2012-10-19 19:48:54 +02:00
scrawl
d76522e7a4 searchPtrViaHandle 2012-10-19 19:48:02 +02:00
Marc Zinnschlag
7884a927c9 Issue #68: added dead flag to CreatureStats 2012-10-19 18:56:22 +02:00
Marc Zinnschlag
a8f294c9ae fixed types of dynamic stats script instructions 2012-10-19 18:01:45 +02:00
Marc Zinnschlag
bdca5aff87 Issue #68: simplified the dynamic stats interface 2012-10-19 13:10:06 +02:00
Marc Zinnschlag
3f833af46a Issue #407: Fortyfy attribute effects were ignored for the last 3 attributes 2012-10-19 10:07:27 +02:00
scrawl
28cc480ce1 fix some alchemy issues and make the gui use the new implementation 2012-10-18 22:21:39 +02:00
Marc Zinnschlag
18686614db Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 2012-10-18 15:46:43 +02:00
Marc Zinnschlag
1864dbe031 Issue #61: potion creation 2012-10-18 15:33:27 +02:00
Marc Zinnschlag
f5caf227b2 Issue #61: remove ingredients on potion creation 2012-10-18 14:47:23 +02:00
Marc Zinnschlag
3c71378fad Issue 61: improved ingredients handling in alchemy and documenation 2012-10-18 14:41:57 +02:00
Marc Zinnschlag
3fe0a73cf2 Issue #61: increase alchemy skill on successful potion creation 2012-10-18 14:38:38 +02:00
Marc Zinnschlag
510674aa5e Merge branch 'master' into alchemy 
Conflicts:
	components/esm/loadmgef.hpp
 2012-10-18 14:37:05 +02:00
Marc Zinnschlag
5fbca239dd Issue #61: potion creation (1st part; still missing some implementations) 2012-10-18 14:02:06 +02:00
scrawl
e80394c0b5 fix training limit 2012-10-17 18:48:29 +02:00
scrawl
125315ebe7 remove a cout 2012-10-17 18:21:24 +02:00
scrawl
c64eb96952 Merge branch 'Travel_Dialogue' into training_travel 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt
 2012-10-17 18:17:53 +02:00
scrawl
1a2034b4dd training window 2012-10-17 18:03:02 +02:00
scrawl
6be092e268 substr check 2012-10-17 12:41:24 +02:00
scrawl
84a4fd56c3 consider all files in Splash directory 2012-10-17 12:39:45 +02:00
scrawl
6acbea822b splash screen directory listing 2012-10-16 23:59:03 +02:00
scrawl
7d1e659960 fading, greying out destinations you cant afford, warning fix 2012-10-16 20:25:50 +02:00
gugus
9583a1b8e9 FadeOut/In, that's for you scrawl! 2012-10-16 19:59:53 +02:00
gugus
c9afe222be traveling now takes time 2012-10-16 19:34:29 +02:00
scrawl
c991f68a2d buying created spell 2012-10-15 21:54:19 +02:00
Marc Zinnschlag
e05e683da3 Merge remote-tracking branch 'scrawl/spellcreation' 2012-10-12 17:19:30 +02:00
scrawl
f154031e54 last bits of the gui 2012-10-11 18:26:29 +02:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
gugus
27a3487d78 right prices 2012-10-08 15:51:36 +02:00
gugus
5a611b66d7 traveling. 2012-10-08 11:14:22 +02:00
gugus
85d9357e3a Travel GUI 2012-10-06 17:52:46 +02:00
scrawl
025e820703 abstracted code and use it in enchanting window as well 2012-10-03 15:36:10 +02:00
scrawl
1c0dd3ccc5 some editing code 2012-10-03 15:06:54 +02:00
Marc Zinnschlag
332039da10 Issue #61: replaced 4 ingredient member variables with vector in alchemy GUI 2012-10-02 10:29:47 +02:00
Marc Zinnschlag
14833a4c3a Issue #61: More robust tools handling in alchemy window 2012-10-02 10:20:49 +02:00
Marc Zinnschlag
1cc2c2055f Issue #61: Implemented basic ingredient handling in Alchemy class 2012-10-02 10:20:26 +02:00
Marc Zinnschlag
6469933ce8 Merge branch 'master' into alchemy 
Conflicts:
	apps/openmw/mwgui/alchemywindow.cpp
 2012-10-02 09:30:49 +02:00
scrawl
21493c2dbd added magic effect flags from Research wiki page 2012-10-01 23:33:07 +02:00
scrawl
63fd8172d8 Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation 2012-10-01 23:09:03 +02:00
scrawl
fa358ab196 change the inventory preview to "inventoryhandtohand" animation pose 2012-10-01 18:04:21 +02:00
scrawl
ff2c2d2b96 Merge branch 'master' into spellcreation 
Conflicts:
	apps/openmw/mwbase/windowmanager.hpp
 2012-10-01 17:54:45 +02:00
Marc Zinnschlag
d1c4559abe fixed GMST string handling in GUI 2012-10-01 10:03:49 +02:00
Marc Zinnschlag
35d7b5e5b0 Merge remote-tracking branch 'greye/record_saving' 2012-10-01 09:50:20 +02:00
Marc Zinnschlag
29633bd02f Merge remote-tracking branch 'greye/master' 2012-10-01 09:46:20 +02:00
greye
f907a6a86f updateListener() every frame 2012-10-01 11:24:44 +04:00
Chris Robinson
6c5c9ce46e Avoid console spam when a sound can't play 2012-09-30 17:38:55 -07:00
Chris Robinson
6942fa97da Specify a proper up vector for the listener 2012-09-30 17:23:05 -07:00
Chris Robinson
991f942fba Merge remote-tracking branch 'zini/master' into sound 
Conflicts:
	apps/openmw/mwsound/soundmanagerimp.cpp
	apps/openmw/mwsound/soundmanagerimp.hpp
 2012-09-30 16:57:54 -07:00
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
greye
721324c1db rm record inheritance, rework esmtool accordingly 2012-09-30 23:34:53 +04:00
Marc Zinnschlag
10c8360e07 Issue #61: Replaced apparatus handling in alchemy GUI with new implementation in Alchemy class 2012-09-30 19:05:45 +02:00
Marc Zinnschlag
42f02f3ccd Issue #61: Re-implemented tool selection in Alchemy class 2012-09-30 18:54:20 +02:00
Marc Zinnschlag
20a263738a Merge remote-tracking branch 'chris/animation' 2012-09-29 12:39:56 +02:00
Chris Robinson
41f80908d9 Simplify getting the stop time when playing all animation groups 2012-09-29 01:10:49 -07:00
Marc Zinnschlag
2ab96d0108 Merge remote-tracking branch 'scrawl/next' 2012-09-29 10:03:52 +02:00
Marc Zinnschlag
c6fd864a76 Issue #61: Forgot to add some files 2012-09-29 10:02:46 +02:00
scrawl
0c6ad13364 WakeUpPc instruction 2012-09-29 09:41:34 +02:00
Chris Robinson
cd8515396a Use a multimap to store the text keys 2012-09-28 23:20:15 -07:00
gugus
4f5c4bf89a Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwgui/dialogue.hpp
	apps/openmw/mwgui/mode.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
 2012-09-28 17:09:15 +02:00
gugus
4d496c1188 correction1 2012-09-28 17:02:27 +02:00
scrawl
044ab3d2b6 fix error in framelistener with tcg enabled 2012-09-28 17:02:18 +02:00
gugus
1971ba66f1 destination name is now OK for every trave services 2012-09-27 13:08:38 +02:00
Marc Zinnschlag
cd343c4fbd Issue #61: Basic alchemy class (doesn't do anything yet) 2012-09-27 11:59:40 +02:00
scrawl
ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation 
Conflicts:
	apps/openmw/mwgui/dialogue.cpp
 2012-09-27 08:47:47 +02:00
scrawl
9b0254a158 small map fix 2012-09-26 23:34:35 +02:00
Marc Zinnschlag
bb6d9a329c Merge remote-tracking branch 'scrawl/book_skillgain' into next 2012-09-26 20:35:48 +02:00
gugus
3060fbee60 TravelGUI, not completly finished. 2012-09-26 18:30:47 +02:00
scrawl
71d04e16da fix the global map updating when pinned 2012-09-25 21:57:57 +02:00
scrawl
caef570c8a fix the weather not changing when sleeping/waiting 2012-09-25 21:49:34 +02:00
scrawl
359824d614 oops 2012-09-25 21:49:34 +02:00
scrawl
4453459378 re-use the texture across preview instances 2012-09-25 21:49:34 +02:00
scrawl
e2b1329620 fix the race selection escape crash 2012-09-25 21:49:34 +02:00
scrawl
d163f8203c change books to RecListWithIDT 2012-09-25 21:38:34 +02:00
scrawl
853d62adba book skillgain 2012-09-25 18:59:24 +02:00
Marc Zinnschlag
a34bdb9623 per NPC ID interaction tracking 2012-09-25 10:48:57 +02:00
scrawl
b63d205c6e change the select attribute/skill dialogs to be reusable 2012-09-24 22:09:38 +02:00
Marc Zinnschlag
5bdc7bcacf Merge branch 'master' into next 2012-09-24 10:14:09 +02:00
scrawl
d393f551ed edit effect dialog 2012-09-24 08:09:16 +02:00
scrawl
02e7b3df4f oops 2012-09-24 01:07:33 +02:00
scrawl
f8a18d58a6 re-use the texture across preview instances 2012-09-24 01:06:17 +02:00
scrawl
dd5c083124 fix the race selection escape crash 2012-09-24 00:42:05 +02:00
scrawl
1cb1259e18 fixing some unrelated warnings 2012-09-23 19:36:37 +02:00
greye
807a56c9e4 fix dynamic potion id 2012-09-23 19:29:00 +04:00
scrawl
9d7c35ae48 and go 2012-09-23 00:36:20 +02:00
scrawl
b4db339fd5 everything uses find now 2012-09-22 21:39:05 +02:00
scrawl
9f2668b45b Task #400 Review GMST access 2012-09-22 21:35:57 +02:00
scrawl
f45a6b71a9 Merge branch 'master' into next 2012-09-22 20:48:55 +02:00
scrawl
b471bef92a Merge branch 'master' into next 2012-09-22 20:48:22 +02:00
Marc Zinnschlag
39e21a6103 Merge remote-tracking branch 'scrawl/globalmap' into next 2012-09-22 18:27:42 +02:00
scrawl
78b2d51cfc fix a map crash 2012-09-22 16:52:31 +02:00
Marc Zinnschlag
8da00caaa4 Merge remote-tracking branch 'scrawl/globalmap' into next 2012-09-21 20:39:20 +02:00
scrawl
47d9fae89f don't use cache 2012-09-21 20:35:50 +02:00
Marc Zinnschlag
3560690660 Merge remote-tracking branch 'scrawl/sleep_wait' into next 2012-09-21 18:27:06 +02:00
scrawl
b91d74d394 fix normalized encumbrance 2012-09-21 17:56:15 +02:00
scrawl
872fcf3e3d sleeping restoration of health, magicka, and fatigue 2012-09-21 17:53:16 +02:00
Marc Zinnschlag
28e2430f3a Merge remote-tracking branch 'scrawl/master' 2012-09-21 17:47:27 +02:00
scrawl
f49401bb53 center map on the player, dynamic map size 2012-09-21 16:26:04 +02:00
scrawl
1d012d1680 don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore. 2012-09-21 15:24:26 +02:00
scrawl
9106e5307c moved global map from RenderingManager to gui and removed world method 2012-09-21 14:11:01 +02:00
greye
18cc435aa1 resolving conflicts 2012-09-21 13:13:11 +04:00
greye
2d5ddd104b Land::loadData rework 2012-09-21 12:12:16 +04:00
scrawl
a161b34c67 remove useless member, fix map rendering crash 2012-09-20 18:23:27 +02:00
scrawl
98c1dc1151 ShowMap & FillMap commands, merged next 2012-09-20 18:02:37 +02:00
scrawl
8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 2012-09-20 17:41:14 +02:00
scrawl
451a9fd6ac don't update world arrow position in interior 2012-09-20 17:35:30 +02:00
scrawl
e5e3d829d0 player arrow & markers 2012-09-20 17:30:09 +02:00
scrawl
5f014f7411 oops, left in a testing assertion 2012-09-20 14:04:29 +02:00
scrawl
86cfc91ef3 global map rendering 2012-09-20 13:56:37 +02:00
Marc Zinnschlag
87a9373a56 Merge remote-tracking branch 'scrawl/gamma' into next 2012-09-20 09:01:58 +02:00
scrawl
b9a3f8e8d7 gamma slider 2012-09-19 23:47:42 +02:00
scrawl
d9f6072f02 gamma correct rendering & adjustment setting 2012-09-19 23:25:07 +02:00
Marc Zinnschlag
ede9a2b170 fixed an orientation problem 2012-09-19 19:56:02 +02:00
scrawl
32de090079 Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities 2012-09-19 19:34:02 +02:00
Marc Zinnschlag
a3c680d20a Merge remote-tracking branch 'scrawl/sleep_wait' into next 2012-09-19 09:41:32 +02:00
scrawl
be44810623 implemented GetPCSleep 2012-09-19 03:11:23 +02:00
scrawl
bf5e30b24f everything done except health/mana restore 2012-09-19 02:53:06 +02:00
scrawl
ab698bb401 date time label 2012-09-18 20:53:32 +02:00
scrawl
4d4ba6698a fix character preview destruction; don't allow empty names in name dialog 2012-09-18 19:00:20 +02:00
scrawl
0ba996f290 dialog layout 2012-09-18 18:29:03 +02:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
Marc Zinnschlag
fcda3b6ca8 fixed some script argument types 2012-09-18 11:09:54 +02:00
Marc Zinnschlag
ea8eab4f34 more cleanup 2012-09-18 11:06:19 +02:00
Marc Zinnschlag
408c5b8bd4 some cleanup 2012-09-18 10:49:51 +02:00
Marc Zinnschlag
4469976be9 Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-09-18 10:44:25 +02:00
gugus
3c1a9061de Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly 2012-09-17 14:12:27 +02:00
gugus
032ff7c879 Clean-up. There is still a little bug. 2012-09-17 13:36:48 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
Jason Hooks
192d634098 Movement keys; View angles 2012-09-16 13:19:38 -04:00
Jason Hooks
76f2a82884 More pmove stuff; Turned off broadphase, we could not fall in exteriors 2012-09-15 22:48:24 -04:00
Jason Hooks
f586f53a42 positioning 2012-09-15 16:45:50 -04:00
scrawl
896428c129 enableRestMenu & enableLevelupMenu 2012-09-15 20:18:41 +02:00
scrawl
9cf1cbc89b remove book skill gain 2012-09-15 20:03:53 +02:00
scrawl
3e5ab069a6 remove the const cast 2012-09-15 19:52:18 +02:00
Jason Hooks
02bca98e9f Setrotate working 2012-09-15 13:23:49 -04:00
scrawl
cf358fa79d >= instead of == 2012-09-15 19:20:13 +02:00
scrawl
0dc242c603 don't increase skill beyond 100 2012-09-15 19:10:48 +02:00
scrawl
f5237ff1a6 skill gain from books 2012-09-15 19:06:56 +02:00
scrawl
234f8fa5d5 added the missing sound & notification for skill increase 2012-09-15 18:35:59 +02:00
scrawl
b34b894d6a removed some debug stuff 2012-09-15 17:20:47 +02:00
scrawl
76b494100e finished? 2012-09-15 17:12:42 +02:00
scrawl
95f3a20e2c Merge branch 'master' into levelup 2012-09-15 14:25:37 +02:00