Commit Graph

3111 Commits (00a2de432ab6904e993eb7f86be2cb4848cb10d6)

Author SHA1 Message Date
gugus 5a611b66d7 traveling. 12 years ago
gugus 85d9357e3a Travel GUI 12 years ago
scrawl 025e820703 abstracted code and use it in enchanting window as well 12 years ago
scrawl 1c0dd3ccc5 some editing code 12 years ago
Marc Zinnschlag 332039da10 Issue #61: replaced 4 ingredient member variables with vector in alchemy GUI 12 years ago
Marc Zinnschlag 14833a4c3a Issue #61: More robust tools handling in alchemy window 12 years ago
Marc Zinnschlag 1cc2c2055f Issue #61: Implemented basic ingredient handling in Alchemy class 12 years ago
Marc Zinnschlag 6469933ce8 Merge branch 'master' into alchemy
Conflicts:
	apps/openmw/mwgui/alchemywindow.cpp
12 years ago
scrawl 21493c2dbd added magic effect flags from Research wiki page 12 years ago
scrawl 63fd8172d8 Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation 12 years ago
scrawl fa358ab196 change the inventory preview to "inventoryhandtohand" animation pose 12 years ago
scrawl ff2c2d2b96 Merge branch 'master' into spellcreation
Conflicts:
	apps/openmw/mwbase/windowmanager.hpp
12 years ago
Marc Zinnschlag d1c4559abe fixed GMST string handling in GUI 12 years ago
Marc Zinnschlag 35d7b5e5b0 Merge remote-tracking branch 'greye/record_saving' 12 years ago
Marc Zinnschlag 29633bd02f Merge remote-tracking branch 'greye/master' 12 years ago
greye f907a6a86f updateListener() every frame 12 years ago
Chris Robinson 6c5c9ce46e Avoid console spam when a sound can't play 12 years ago
Chris Robinson 6942fa97da Specify a proper up vector for the listener 12 years ago
Chris Robinson 991f942fba Merge remote-tracking branch 'zini/master' into sound
Conflicts:
	apps/openmw/mwsound/soundmanagerimp.cpp
	apps/openmw/mwsound/soundmanagerimp.hpp
12 years ago
greye 2fa4ac177a initial resolving 12 years ago
greye 721324c1db rm record inheritance, rework esmtool accordingly 12 years ago
Marc Zinnschlag 10c8360e07 Issue #61: Replaced apparatus handling in alchemy GUI with new implementation in Alchemy class 12 years ago
Marc Zinnschlag 42f02f3ccd Issue #61: Re-implemented tool selection in Alchemy class 12 years ago
Marc Zinnschlag 20a263738a Merge remote-tracking branch 'chris/animation' 12 years ago
Chris Robinson 41f80908d9 Simplify getting the stop time when playing all animation groups 12 years ago
Marc Zinnschlag 2ab96d0108 Merge remote-tracking branch 'scrawl/next' 12 years ago
Marc Zinnschlag c6fd864a76 Issue #61: Forgot to add some files 12 years ago
scrawl 0c6ad13364 WakeUpPc instruction 12 years ago
Chris Robinson cd8515396a Use a multimap to store the text keys 12 years ago
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
12 years ago
gugus 4d496c1188 correction1 12 years ago
scrawl 044ab3d2b6 fix error in framelistener with tcg enabled 12 years ago
gugus 1971ba66f1 destination name is now OK for every trave services 12 years ago
Marc Zinnschlag cd343c4fbd Issue #61: Basic alchemy class (doesn't do anything yet) 12 years ago
scrawl ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
Conflicts:
	apps/openmw/mwgui/dialogue.cpp
12 years ago
scrawl 9b0254a158 small map fix 12 years ago
Marc Zinnschlag bb6d9a329c Merge remote-tracking branch 'scrawl/book_skillgain' into next 12 years ago
gugus 3060fbee60 TravelGUI, not completly finished. 12 years ago
scrawl 71d04e16da fix the global map updating when pinned 12 years ago
scrawl caef570c8a fix the weather not changing when sleeping/waiting 12 years ago
scrawl 359824d614 oops 12 years ago
scrawl 4453459378 re-use the texture across preview instances 12 years ago
scrawl e2b1329620 fix the race selection escape crash 12 years ago
scrawl d163f8203c change books to RecListWithIDT 12 years ago
scrawl 853d62adba book skillgain 12 years ago
Marc Zinnschlag a34bdb9623 per NPC ID interaction tracking 12 years ago
scrawl b63d205c6e change the select attribute/skill dialogs to be reusable 12 years ago
Marc Zinnschlag 5bdc7bcacf Merge branch 'master' into next 12 years ago
scrawl d393f551ed edit effect dialog 12 years ago
scrawl 02e7b3df4f oops 12 years ago
scrawl f8a18d58a6 re-use the texture across preview instances 12 years ago
scrawl dd5c083124 fix the race selection escape crash 12 years ago
greye 1339787863 remove underscores from filenames in esm 12 years ago
scrawl 1cb1259e18 fixing some unrelated warnings 12 years ago
greye 807a56c9e4 fix dynamic potion id 12 years ago
scrawl 9d7c35ae48 and go 12 years ago
scrawl b4db339fd5 everything uses find now 12 years ago
scrawl 9f2668b45b Task #400 Review GMST access 12 years ago
scrawl f45a6b71a9 Merge branch 'master' into next 12 years ago
scrawl b471bef92a Merge branch 'master' into next 12 years ago
Marc Zinnschlag 39e21a6103 Merge remote-tracking branch 'scrawl/globalmap' into next 12 years ago
scrawl 78b2d51cfc fix a map crash 12 years ago
Marc Zinnschlag 8da00caaa4 Merge remote-tracking branch 'scrawl/globalmap' into next 12 years ago
scrawl 47d9fae89f don't use cache 12 years ago
Marc Zinnschlag 3560690660 Merge remote-tracking branch 'scrawl/sleep_wait' into next 12 years ago
scrawl b91d74d394 fix normalized encumbrance 12 years ago
scrawl 872fcf3e3d sleeping restoration of health, magicka, and fatigue 12 years ago
Marc Zinnschlag 28e2430f3a Merge remote-tracking branch 'scrawl/master' 12 years ago
scrawl f49401bb53 center map on the player, dynamic map size 12 years ago
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. 12 years ago
scrawl 9106e5307c moved global map from RenderingManager to gui and removed world method 12 years ago
greye 18cc435aa1 resolving conflicts 12 years ago
greye 2d5ddd104b Land::loadData rework 12 years ago
greye e69880f77e almost perfect byte copies, has redundant data 12 years ago
scrawl a161b34c67 remove useless member, fix map rendering crash 12 years ago
scrawl 98c1dc1151 ShowMap & FillMap commands, merged next 12 years ago
scrawl 8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 12 years ago
scrawl 451a9fd6ac don't update world arrow position in interior 12 years ago
scrawl e5e3d829d0 player arrow & markers 12 years ago
scrawl 5f014f7411 oops, left in a testing assertion 12 years ago
scrawl 86cfc91ef3 global map rendering 12 years ago
Marc Zinnschlag 87a9373a56 Merge remote-tracking branch 'scrawl/gamma' into next 12 years ago
scrawl b9a3f8e8d7 gamma slider 12 years ago
scrawl d9f6072f02 gamma correct rendering & adjustment setting 12 years ago
Marc Zinnschlag ede9a2b170 fixed an orientation problem 12 years ago
scrawl 32de090079 Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities 12 years ago
Marc Zinnschlag a3c680d20a Merge remote-tracking branch 'scrawl/sleep_wait' into next 12 years ago
scrawl be44810623 implemented GetPCSleep 12 years ago
scrawl bf5e30b24f everything done except health/mana restore 12 years ago
scrawl ab698bb401 date time label 12 years ago
scrawl 4d4ba6698a fix character preview destruction; don't allow empty names in name dialog 12 years ago
scrawl 0ba996f290 dialog layout 12 years ago
Marc Zinnschlag 4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 12 years ago
Marc Zinnschlag fcda3b6ca8 fixed some script argument types 12 years ago
Marc Zinnschlag ea8eab4f34 more cleanup 12 years ago
Marc Zinnschlag 408c5b8bd4 some cleanup 12 years ago
Marc Zinnschlag 4469976be9 Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
12 years ago
gugus 3c1a9061de Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly 12 years ago
gugus 032ff7c879 Clean-up. There is still a little bug. 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
Jason Hooks 192d634098 Movement keys; View angles 12 years ago
Marc Zinnschlag 2bb400eaa8 Merge remote-tracking branch 'pvdk/datalocalfix' 12 years ago
Marc Zinnschlag b041a511b6 Merge remote-tracking branch 'mmd/windowswarnings' 12 years ago
Jason Hooks 76f2a82884 More pmove stuff; Turned off broadphase, we could not fall in exteriors 12 years ago
Pieter van der Kloet 4bcc34f4f9 Re-enabled and fixed multiple data directory handling in the launcher 12 years ago
Pieter van der Kloet 97326ffdbf Fixed data-local directory handling in the launcher 12 years ago
Jason Hooks f586f53a42 positioning 12 years ago
scrawl 896428c129 enableRestMenu & enableLevelupMenu 12 years ago
scrawl 9cf1cbc89b remove book skill gain 12 years ago
scrawl 3e5ab069a6 remove the const cast 12 years ago
Jason Hooks 02bca98e9f Setrotate working 12 years ago
scrawl cf358fa79d >= instead of == 12 years ago
scrawl 0dc242c603 don't increase skill beyond 100 12 years ago
scrawl f5237ff1a6 skill gain from books 12 years ago
scrawl 234f8fa5d5 added the missing sound & notification for skill increase 12 years ago
scrawl b34b894d6a removed some debug stuff 12 years ago
scrawl 76b494100e finished? 12 years ago
scrawl 95f3a20e2c Merge branch 'master' into levelup 12 years ago
scrawl 3e794a6087 remove useless member and removed a warning 12 years ago
scrawl 2793096b50 Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
12 years ago
Marc Zinnschlag b7c9285b24 added support for out of world rendering 12 years ago
scrawl b76a28f69c beginnings of the gui 12 years ago
scrawl 35f7216f2f fixed some things 12 years ago
scrawl 7c59b83419 performance optimization 12 years ago
scrawl a308d2e38a fixed exception, fixed armor label obscuring the items 12 years ago
scrawl 1f7e044fad removed some debug stuff 12 years ago
scrawl 6ac2a12296 item selection working on the preview 12 years ago
scrawl eef750e6b0 race selection preview 12 years ago
scrawl 5155339cb6 character preview working 12 years ago
scrawl d90af9c524 Merge branch 'master' into characterpreview 12 years ago
Marc Zinnschlag 835c530e06 Merge branch 'ingredients' 12 years ago
Marc Zinnschlag 5706caa141 Issue #356: added ingredient eating sound effect 12 years ago
Marc Zinnschlag fe68a252d5 Issue #356: Implemented ingredient eating 12 years ago
Marc Zinnschlag 2ccd7a480d Issue #356: added a missing return 12 years ago
scrawl 7ad80e306b fixed the disappearing 12 years ago
Marc Zinnschlag 9de7b3bf90 Issue #356: Properly support ingredients effect in ActiveSpells (hopefully) 12 years ago
Marc Zinnschlag 0af0dc0d5d Issue #356: More CreatureStats cleanup 12 years ago
Marc Zinnschlag 2934987f78 Issue #356: Some CreatureStats cleanup 12 years ago
Marc Zinnschlag 9dcf8939e9 Issue #356: added function for fatigue term calculation 12 years ago
Marc Zinnschlag fca3b67507 Issue #356: basic support for ingredients in ActiveSpells (still using the wrong formula) 12 years ago
scrawl 4f3eb3c34a character preview WIP 12 years ago
Jason Hooks a1a7733730 Set scale implemented 12 years ago
scrawl 2f0b47fc38 test 12 years ago
scrawl a96ed6ac61 splash screens on startup 12 years ago
scrawl c3966a7c5a oops, I used a float texture for water reflection. this change should give a little performance boost. 12 years ago
Marc Zinnschlag e9e30c0fce fixed a memory leak 12 years ago
scrawl a8d9aa98b1 some fixes 12 years ago
scrawl d5a08e31e7 scene does not disappear anymore during load 12 years ago
scrawl 369db182de actual progress bar, performance optimization 12 years ago
scrawl 2b339f6c0f loading screen 12 years ago
Jason Hooks c5b25ef70b Very basic actor physics (no set scale/rotate functions) 12 years ago
scrawl 4977c33e4c fixed a stats window resizing problem that I introduced today 12 years ago
Marc Zinnschlag 6c03d7aec4 documentation fix 12 years ago
scrawl 9448ce5968 implemented "get<Control>Disabled" functions 12 years ago
scrawl 89ad2af1d9 key usage to open doors or containers
to test: player->additem, "key_arrile", 1 (door in arille's tradehouse)
player->additem, "key_alvur", 1 (chest in the back of beshara)
12 years ago
scrawl fdc2a7433c remove the wrong container open sound 12 years ago
scrawl d581ac426e useless cout message 12 years ago
scrawl 996e6280d8 more spell buying window cleanup 12 years ago
scrawl ba0acd4056 changed some text colors 12 years ago
scrawl fde69d0c87 Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing 12 years ago
scrawl bc6a1979b0 replaced everything with the new method 12 years ago
Marc Zinnschlag 61c8a627aa added a missing include 12 years ago
Marc Zinnschlag 273ac0a97f Merge branch 'spellbuying' 12 years ago
Marc Zinnschlag f17756712a fixed spell list handling 12 years ago
Marc Zinnschlag 6c928e93d3 added missing initialisation of NPC/creature spell lists from ESX records 12 years ago
scrawl b66c8099eb new system for dynamic sizing of buttons & text boxes 12 years ago
scrawl 35dd49f948 fixed some "using namespace" in headers 12 years ago
scrawl 56061474c4 another 3 unnecessary lines 12 years ago
scrawl bb267dddf6 some stats window cleanup 12 years ago
scrawl 432c089434 fix the spell tooltips to show the spell target 12 years ago
Marc Zinnschlag bcf3a81a6c and a tiny bit more of cleanup 12 years ago
Marc Zinnschlag 9c49ca1468 a bit more random cleanup 12 years ago
Marc Zinnschlag 06677a0fc8 fixed ID handling and some misc cleanup 12 years ago
Marc Zinnschlag 3fad1c0786 fixed a crash 12 years ago
Adam Hogan 08410b9062 Renamed SpellBuyingWindow, took some suggestions from scrawl 12 years ago
Adam Hogan 562df5388f Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
Adam Hogan ebf80943a9 Added spell buying window 12 years ago
Lukasz Gromanowski 99c46093dd Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests 12 years ago
Jason Hooks 23777033fd Starting to implement new PhysicActor 13 years ago
Marc Zinnschlag 0879abb948 Merge branch 'actiontarget' 13 years ago
Marc Zinnschlag da041f902f Issue #370: fixed item taking sound 13 years ago
Marc Zinnschlag 482874f99e Merge remote-tracking branch 'scrawl/cache' 13 years ago
Marc Zinnschlag 6813bafbfc added missing sound effect for chest opening; minor cleanup 13 years ago
Marc Zinnschlag fb8aae243d Issue #370: replaced custom target handling in talk action with base class implementation 13 years ago
Marc Zinnschlag 8ed8dd649a Issue #370: replaced custom target handling in take action with base class implementation 13 years ago
Marc Zinnschlag ea1c3fe1e4 Issue #370: replaced custom target handling in open action with base class implementation 13 years ago
Marc Zinnschlag 8c2b4f996c Issue #370: replaced custom target handling in equip action with base class implementation 13 years ago
Marc Zinnschlag b51c42146f Issue #370: replaced custom target handling in read action with base class implementation 13 years ago
Marc Zinnschlag 3f181f9a9d Issue #370: Support for targets in containers 13 years ago
Marc Zinnschlag cc55056adf Issue #370: replaced custom target handling in apply action with base class implementation 13 years ago
Marc Zinnschlag 733654d730 Issue #370: implemented target handling in action base class 13 years ago
Marc Zinnschlag 1cecab6e3d fixed RefData::getHandle 13 years ago
Marc Zinnschlag ead04e1cc3 Issue #389: added AI sequence to CreatureStats; execute AI packages during the regular actor update 13 years ago
Marc Zinnschlag 345eec1135 Issue #389: added AI package base class and AI packages management class 13 years ago
Marc Zinnschlag ef6f033dd1 Merge branch 'multidata' 13 years ago
Marc Zinnschlag 2284d76307 re-enabled local data directory support in launcher 13 years ago
Jason Hooks 2efceba1fc Tearing apart PhysicActor 13 years ago
gugus d261263824 oups forgot vmformat 13 years ago
scrawl c27ff546e4 shader cache 13 years ago
gugus 95c27723f7 fixed a bug (see commit reverted) 13 years ago