mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 05:49:56 +00:00
Code Issues Releases Wiki Activity
5091 commits 38 branches 54 tags 122 MiB
Commit graph

3194 commits

Author SHA1 Message Date
scrawl
e68dc19256 GetCurrentTime, HasSoulGem 2012-11-25 01:54:37 +01:00
scrawl
0db48b29c7 GetSpellEffects, GetRace 2012-11-25 01:26:29 +01:00
scrawl
4b830e5c7a Merge branch 'scripting' of github.com:scrawl/openmw into scripting 2012-11-25 00:44:38 +01:00
scrawl
70aa7459f5 GetWeaponDrawn 2012-11-24 03:04:26 +01:00
scrawl
be82d1452f HasItemEquipped 2012-11-24 02:59:44 +01:00
scrawl
600ed5f38a GetAttacked 2012-11-24 02:48:53 +01:00
scrawl
50baf6dac7 moved to controlextensions 2012-11-24 02:45:25 +01:00
scrawl
a596d23203 GetArmorType 2012-11-24 02:38:10 +01:00
scrawl
d7811624d5 GetEffect 2012-11-24 02:15:55 +01:00
scrawl
e8ef4dba1e getPcRunning, getPcSneaking, getForceRun, getForceSneak 2012-11-24 02:02:49 +01:00
scrawl
10329c780d GetLocked 2012-11-23 21:31:10 +01:00
Marc Zinnschlag
a6c7f16a7b Merge remote-tracking branch 'scrawl/reputation' 2012-11-23 21:26:44 +01:00
scrawl
d418e21371 <Mod|Get><Flee|Fight|Hello|Alarm> 2012-11-23 21:14:32 +01:00
scrawl
9c170af30c SameFaction 2012-11-23 20:57:08 +01:00
scrawl
d54ed557bf Equip 2012-11-23 20:48:59 +01:00
scrawl
064cb80c0a fix wait dialog fading 2012-11-23 20:48:53 +01:00
scrawl
0af869c816 GetReputation 2012-11-23 20:22:51 +01:00
scrawl
eb29b1593b ModReputation, SetReputation 2012-11-23 19:56:45 +01:00
scrawl
f218ef2675 fix separator 2012-11-23 19:21:13 +01:00
scrawl
1d7e92b6b3 dialogue fixes 2012-11-23 19:05:40 +01:00
Marc Zinnschlag
d7af9fbec6 various fixes 2012-11-22 17:24:28 +01:00
Marc Zinnschlag
9201baebf9 template fix 2012-11-22 10:19:11 +01:00
scrawl
c8562d8442 toggleCollisionBoxes actually does something useful now 2012-11-20 02:20:54 +01:00
Marc Zinnschlag
5d45bcd03a Merge remote-tracking branch 'trombonecot/master' 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-11-19 21:21:00 +01:00
eduard
4e4d15f8ac Failed action 2012-11-19 21:04:49 +01:00
scrawl
693eeabeca shiny: fix GLSL texture units when shaders were disabled 2012-11-19 13:55:26 +01:00
eduard
82ea547ce4 Failed action 2012-11-17 18:17:08 +01:00
scrawl
8ef3edd416 Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 2012-11-16 22:28:00 +01:00
scrawl
f5355e3e92 512x512 map, slightly faster 2012-11-16 22:26:00 +01:00
Marc Zinnschlag
a092deaee8 various fixes 2012-11-16 20:28:20 +01:00
Marc Zinnschlag
3dc013ceae Merge remote-tracking branch 'gohan/Gohan' 2012-11-16 20:15:58 +01:00
scrawl
dc67a547b0 global map explored overlay 2012-11-16 19:34:09 +01:00
marcin
51027c541e Feature #391 Dummy AI package classes 2012-11-16 18:38:15 +01:00
Marc Zinnschlag
9193f3b0ae implemented getCommon/BlightDisease script instructions 2012-11-16 13:32:40 +01:00
Marc Zinnschlag
89c7936534 fixed dialogue script error reporting 2012-11-16 12:47:09 +01:00
Marc Zinnschlag
fd5671e6db fixed argument lists for setpcfacrep and modpcfacrep 2012-11-16 12:45:07 +01:00
marcin
bed0280ba1 Feature #391 Dummy AI package classes 2012-11-15 22:33:50 +01:00
marcin
99ddc63e2c Feature #391 Dummy AI package classes 2012-11-15 22:32:15 +01:00
marcin
515419ae0b Feature #391 Dummy AI package classes 2012-11-15 22:22:44 +01:00
marcin
4b939c7521 Feature #391 Dummy AI package classes 2012-11-15 22:15:20 +01:00
Marc Zinnschlag
82d62eb95a Merge branch 'script' 2012-11-15 20:00:37 +01:00
Marc Zinnschlag
9669eed083 Issue #219: added last missing function filters 2012-11-15 20:00:27 +01:00
scrawl
aefde3f5bc Merge branch 'master' into globalmap 2012-11-15 13:21:24 +01:00
marcin
e6c8e1f0d7 Feature #391 Dummy AI package classes 2012-11-14 18:42:04 +01:00
marcin
698afbec3e Feature #391 Dummy AI package classes 2012-11-14 18:40:32 +01:00
scrawl
5f7d349126 several missing includes 2012-11-14 05:32:23 +01:00
Marc Zinnschlag
b046687f46 added PCFacRep script instructions 2012-11-13 16:11:03 +01:00
Marc Zinnschlag
2a1727d4c5 improved error reporting for dialogue scripts (enabled via --script-verbose) 2012-11-13 15:35:46 +01:00
Marc Zinnschlag
c621a9f7e4 added missing disposition script instructions 2012-11-13 14:29:00 +01:00
Marc Zinnschlag
8aa1fd921b fixed some stats related script instructions 2012-11-13 14:19:43 +01:00
Marc Zinnschlag
cbb0fd5792 Merge branch 'dialogue' 2012-11-13 10:04:08 +01:00
Marc Zinnschlag
409d15576b Merge remote-tracking branch 'greye/player-model' 2012-11-12 14:18:38 +01:00
Marc Zinnschlag
e2ccec99f0 Issue #219: added another missing PC stats filter 2012-11-12 14:02:49 +01:00
Marc Zinnschlag
586ac3f5c6 Issue #219: added some more stats filters; fixed two filters 2012-11-12 13:56:51 +01:00
Marc Zinnschlag
77ba8c5117 Issue #219: implemented rank requirement filter 2012-11-12 13:23:25 +01:00
scrawl
8e847fdc6e fix speechcraft skill increasing when persuade didn't succeed 2012-11-11 19:18:41 +01:00
scrawl
11a8d5d70a Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 2012-11-10 21:19:41 +01:00
scrawl
7c22690116 Merge branch 'next' into globalmap 2012-11-10 21:19:10 +01:00
greye
623e00531d fix reentering race selection 2012-11-10 21:54:43 +04:00
greye
0d33d005a5 head/hair selection 2012-11-10 21:30:16 +04:00
greye
50867e8d87 fix gender selection update, main model visibility and couple of crashes 2012-11-10 19:57:50 +04:00
Marc Zinnschlag
75f64aa38b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
 2012-11-10 15:44:44 +01:00
Marc Zinnschlag
7b1788b03b minor fix 2012-11-10 15:11:21 +01:00
Marc Zinnschlag
0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 2012-11-10 14:59:52 +01:00
Marc Zinnschlag
6dc2214502 Issue #219: more DialogueManager refactoring 2012-11-10 14:52:44 +01:00
Marc Zinnschlag
79706bf60f Issue #219: dialogue manager cleanup 2012-11-10 14:31:58 +01:00
Marc Zinnschlag
d24e3eec9f Issue #219: added filters for various player stats 2012-11-10 14:02:52 +01:00
Marc Zinnschlag
f8fcca64b6 Issue #219: Proper implementation of talked to PC filter 2012-11-10 13:31:10 +01:00
Marc Zinnschlag
7e8d4bb3c9 Issue #219: added various creature and NPC stats; implemented respective filters 2012-11-10 13:21:38 +01:00
Marc Zinnschlag
d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 2012-11-10 12:36:01 +01:00
Marc Zinnschlag
e97f3003ab Issue #219: added expelled status tracking; implemented expelled filter 2012-11-10 12:28:40 +01:00
Marc Zinnschlag
bd2c772dae Issue #219: implemented player skill and attribute filter 2012-11-10 12:08:04 +01:00
Marc Zinnschlag
d6961c0246 Issue #219: made all unimplemented filters return false 2012-11-10 11:42:03 +01:00
Marc Zinnschlag
ceaf1677ce Issue #219: rewrote AI settings and implemented AI settings filters 2012-11-10 11:38:37 +01:00
Marc Zinnschlag
eb4e72aaa7 Issue #219: implemented disease filters 2012-11-10 11:08:36 +01:00
Marc Zinnschlag
c425b3f4a3 Issue #219: fixed function decoding and moved choice function from DialogueManager to Filter 2012-11-10 09:48:20 +01:00
Marc Zinnschlag
a752536cea Issue #219: added function decoding and moved same faction function from DialogueManager to Filter 2012-11-10 09:35:50 +01:00
greye
235b565bb7 update main character model 2012-11-10 11:51:48 +04:00
greye
b1ef0026a9 race selection/inventory preview character model update 2012-11-10 11:41:12 +04:00
scrawl
92bba18218 removed useless member 2012-11-10 00:47:24 +01:00
scrawl
553ea08eae consider temporary disposition change when trading 2012-11-10 00:42:31 +01:00
scrawl
94aeb15220 bartering disposition change 2012-11-10 00:38:45 +01:00
scrawl
33b4b29fbc persuasion mechanics, added reputation 2012-11-10 00:29:36 +01:00
scrawl
ace9ee9c83 persuasion dialog 2012-11-09 20:18:38 +01:00
scrawl
f6a9029c4b bounty & disease disposition effect 2012-11-09 18:33:11 +01:00
Marc Zinnschlag
4994a253da Merge branch 'bountydisease' into dialogue 2012-11-09 18:17:14 +01:00
Marc Zinnschlag
be1334b202 disease tests 2012-11-09 18:16:29 +01:00
Marc Zinnschlag
0727d943b1 Merge branch 'next' into bountydisease 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2012-11-09 18:04:44 +01:00
scrawl
d53a7ade1e method names, disposition uint->int 2012-11-09 14:42:09 +01:00
Marc Zinnschlag
39ff2f06ce added bounty to NpcStats 2012-11-09 14:31:38 +01:00
scrawl
ae78eaeb28 fixed training, fixed todo comments 2012-11-08 23:21:03 +01:00
scrawl
b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2012-11-08 23:16:40 +01:00
scrawl
322faf13e4 cleanup 2012-11-08 22:37:59 +01:00
scrawl
bf4e855260 fixed creatures 2012-11-08 22:31:08 +01:00
Marc Zinnschlag
e6021a3fe3 Issue #219: moved checks for local and global variables from DialogueManager to Filter 2012-11-08 22:11:50 +01:00
gugus
4634227f1c notify the user when the merchant doesn't accept the offer 2012-11-08 21:50:56 +01:00
Marc Zinnschlag
e68bb3481e Issue #219: moved over the second batch of functions (boolean and one integer I forgot last time) 2012-11-08 21:48:17 +01:00
Marc Zinnschlag
91afef140b Issue #219: moved first batch of integer type functions from DialogueManager to Filter 2012-11-08 21:16:49 +01:00
greye
c3f0dc0dfb m prefix for NpcAnimation members 2012-11-08 23:11:43 +04:00
scrawl
3d7146cd50 don't allow opening a window multiple times, primarily the console 2012-11-08 19:34:54 +01:00
Marc Zinnschlag
2be60041f3 Merge remote-tracking branch 'greye/player-dynamics' into next 2012-11-08 18:32:25 +01:00
Marc Zinnschlag
e912b5bed2 Merge remote-tracking branch 'greye/next' into dialogue 2012-11-08 18:19:52 +01:00
greye
af5fb7916f fix searching in store 2012-11-08 21:07:14 +04:00
Marc Zinnschlag
235397dde8 Issue #219: added missing implemented for isInverted function 2012-11-08 17:29:10 +01:00
Marc Zinnschlag
f5972a3080 Issue #219: Support for boolean select structs 2012-11-08 17:04:44 +01:00
Marc Zinnschlag
b412ebd0af Issue #219: Supoort for inverted select structs 2012-11-08 17:01:26 +01:00
Marc Zinnschlag
4614d2bc8e Issue #219: added basic select struct analysis and type checking 2012-11-08 16:49:38 +01:00
greye
b5a59c3a07 minor doxygen comments update 2012-11-08 19:01:42 +04:00
greye
2a86432887 store birthsign in MWWorld::Player 2012-11-08 18:50:23 +04:00
Marc Zinnschlag
662054acf4 Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter 2012-11-08 14:55:31 +01:00
Marc Zinnschlag
1502b3f6f8 Issue #219: Begin of refactoring; added filter class (doesn't do anything yet) 2012-11-08 14:09:40 +01:00
Marc Zinnschlag
6c6c0dd1e3 Merge branch 'next' into dialogue 2012-11-08 13:45:20 +01:00
gugus
0a883f4492 The player can now barter with merchants 2012-11-08 13:38:20 +01:00
greye
83e758ee50 clean up interfaces 2012-11-08 16:37:57 +04:00
greye
2a06d72e32 remove unused custom character classes 2012-11-08 02:27:01 +04:00
greye
9dc9098fa7 update MWBase::World interface since records contains own id 2012-11-08 01:52:34 +04:00
greye
f818fa1ebf minor update since records contains own id 2012-11-08 01:39:24 +04:00
greye
5b9621bca5 store player record data in ESMStore 2012-11-08 01:36:43 +04:00
greye
9ab2c16055 store created character classes as dynamic records 2012-11-08 01:22:44 +04:00
greye
78740306db non-const access to Store<T> from ESMStore 2012-11-08 01:21:54 +04:00
Marc Zinnschlag
c5a6171aab cleanup 2012-11-07 19:43:42 +01:00
Marc Zinnschlag
918316168f Merge remote-tracking branch 'greye/store' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp
 2012-11-07 19:34:28 +01:00
greye
11c0e6382f make ESMStore setting up itself after loading 2012-11-07 15:41:59 +04:00
greye
bc218759e9 forgotten module 2012-11-07 15:38:25 +04:00
Marc Zinnschlag
0805301922 Merge remote-tracking branch 'bwrsandman/master' into next 2012-11-07 10:40:40 +01:00
bwrsandman
7911f08c53 Issue #438: set 0 a.m. to be 12 a.m. 2012-11-06 13:19:35 -05:00
Marc Zinnschlag
81a2c629d8 Merge remote-tracking branch 'scrawl/master' into next 2012-11-06 18:21:24 +01:00
scrawl
21e0cde914 changed OIS includes since OIS_INCLUDE_DIR is already an include directory 2012-11-06 15:26:51 +01:00
greye
58b7927a36 move 'player' record to dynamic 2012-11-06 18:17:32 +04:00
greye
83f5b1df81 change to static --> dynamic search order 2012-11-06 17:58:49 +04:00
greye
9f1733a415 move record insertion to ESMStore 2012-11-06 17:51:38 +04:00
gugus
bf98b95955 bugfix 2012-11-06 13:10:54 +01:00
Marc Zinnschlag
6d5333be05 some code cleanup 2012-11-06 13:08:25 +01:00
Marc Zinnschlag
d661d4f6d6 Merge remote-tracking branch 'emoose/bug-368' into next 2012-11-06 13:04:38 +01:00
greye
dccc157f4c setting up 2012-11-06 15:26:55 +04:00
greye
18bb5960e4 let's rescue linker 2012-11-06 15:10:57 +04:00
greye
620184a009 fix typos 2012-11-06 14:44:56 +04:00
greye
0fd22ce4b0 CellRefList<X>::find(CellRef &, Y &list) -> ::load(CellRef &, ESMStore &) 2012-11-06 14:23:21 +04:00
greye
242a9b5a59 various interface fixes, commented unused code 2012-11-06 14:03:36 +04:00
greye
b3ad872845 new interface in manualref, fix various typos 2012-11-06 13:43:48 +04:00
greye
e74b2c060d disable createRecord(), Land constness hack, various fixes with Store<T> interface 2012-11-06 13:14:03 +04:00
greye
ff8da265ed applying new interface vol.9, inconsistent 2012-11-06 12:36:21 +04:00
greye
932a9dc6f9 applying new interface vol.8, inconsistent 2012-11-06 11:53:00 +04:00
greye
a9c1ce412a applying new interface vol.7, inconsistent 2012-11-06 11:29:18 +04:00
gugus
2841d831a6 Disposition is now updated everyframe 2012-11-05 23:16:37 +01:00
Marc Zinnschlag
a7da929496 Merge remote-tracking branch 'scrawl/master' into next 2012-11-05 22:46:42 +01:00
emoose
3e5b396b56 Changed: world: cleanup 2012-11-05 21:10:04 +00:00
emoose
5c1b3fc043 Fixed: scene: adjust rotation/scale when creating objects 2012-11-05 20:45:04 +00:00
greye
4637503680 applying new interface vol.6, inconsistent 2012-11-06 00:34:11 +04:00
emoose
e8e3c211a4 Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation 2012-11-05 19:56:20 +00:00
scrawl
646e689239 clear name edits when opening alchemy / spell creation 2012-11-05 20:47:28 +01:00
greye
42aae566a7 applying new interface vol.5, inconsistent 2012-11-05 23:41:26 +04:00
emoose
7a7825577a Changed: use MWWorld::Ptr for PhysicsSystem arguments 2012-11-05 19:37:27 +00:00
gugus
9ebe9cb40c Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes 2012-11-05 19:55:06 +01:00
gugus
aaf1b66c7e BarterOffer is used in other trading services too 2012-11-05 19:53:55 +01:00
greye
11567663a7 applying new interface vol.4, inconsistent 2012-11-05 22:34:08 +04:00
greye
e628b23da6 applying new interface vol.3, inconsistent 2012-11-05 21:45:35 +04:00
greye
86ad7a96f4 applying new interface vol.2, inconsistent 2012-11-05 21:19:22 +04:00
Marc Zinnschlag
61942c9c4a Issue #440: Make day numbers start at 1 instead of 0 2012-11-05 18:01:50 +01:00
greye
bd1bb2e55d applying new interface vol.1, inconsistent 2012-11-05 18:39:42 +04:00
greye
7cf0b8a680 just replace esmstore, inconsistent 2012-11-05 18:09:58 +04:00
greye
d205723a17 resolving m prefix/ESMStore movement 2012-11-05 18:02:47 +04:00
greye
8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 2012-11-05 17:41:36 +04:00
greye
10ae5d3365 dynamic storage for cells 2012-11-05 17:18:02 +04:00
greye
0f524e4a60 dynamic storage for records with string id 2012-11-05 17:18:01 +04:00
greye
9995fd324d split record comparator from store 2012-11-05 17:18:01 +04:00
greye
558e0557d0 basic static esmstore 2012-11-05 17:18:01 +04:00
greye
dd8f5e1a91 stores for records indexed with int, basic resolving 2012-11-05 17:18:01 +04:00
greye
ce91c5636d load() method for records with string id 2012-11-05 17:18:01 +04:00
greye
5ac54d1fff alter ESM::Script for storing id as std::string 2012-11-05 17:18:01 +04:00
greye
f0ecbbb056 basic Pathgrid store 2012-11-05 17:18:01 +04:00
greye
3b86955d37 basic Cell store 2012-11-05 17:18:01 +04:00
greye
e1f2f190d4 base record containers 2012-11-05 17:18:01 +04:00
greye
2057f5619e move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f m prefix for mwworld/cellstore.hpp 2012-11-05 16:07:59 +04:00
gugus
f72f898bd9 implement barterOffer. It's used for travel only. 
I've started to implement disposition, but it's very basic for now.
 2012-11-05 11:07:43 +01:00
emoose
accf8b2f71 Updated Bug #430 fix so it only moves the player now 2012-11-04 23:26:26 +00:00
Marc Zinnschlag
6f7a621b6f disabled enchanting unfinished enchantment GUI for now 2012-11-04 23:15:20 +01:00
Marc Zinnschlag
aabb1b8f3f Issue #219: implemented death count filter 2012-11-04 13:26:04 +01:00
scrawl
38828acac9 transparent overlay 2012-11-04 12:13:04 +01:00
scrawl
b7aa7e4cef pause all animations 2012-11-04 11:57:51 +01:00
scrawl
ba2fc2d6f8 better fix for chargen button colors 2012-11-04 11:37:47 +01:00
emoose
cadc753216 Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell 
Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery
Bug #430 fix is only tested in interiors (ToddTest)
 2012-11-03 19:29:55 +00:00
emoose
c8cc6b6e65 Fixed: engine: Bug #437 Stop animations when paused; tooltips: capitalize first letter (eg paper -> Paper) 2012-11-03 16:39:32 +00:00
emoose
b70b8cc4bc Fixed: character creation: make OK button grayed out/disabled (loses the hoverover when it's re-enabled though...) 2012-11-03 06:02:33 +00:00
emoose
1c8e941f0d fix kdevelop indentation again... 2012-11-02 21:21:32 +00:00
emoose
96b56d9803 fixes: containers: key id case comparison 2012-11-02 21:18:37 +00:00
emoose
4a9821dc65 fix kdevelop indentation... 2012-11-02 20:43:07 +00:00
emoose
15f972cc62 fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit 
todo: going from CharacterCreation back to CreateClassDialog loses data
 2012-11-02 20:33:08 +00:00
Marc Zinnschlag
4bc4ca775c Issue #432: fixed MWWorld::ContainerStore::clear 2012-11-01 15:11:13 +01:00
scrawl
a04df37f83 implemented looting corpses 2012-10-28 16:04:33 +01:00
Marc Zinnschlag
d7add0b9e6 Issue #61: fixed alchemy skill 2012-10-28 14:07:36 +01:00
Marc Zinnschlag
c635447cea Merge branch 'death' 2012-10-27 13:34:20 +02:00
Marc Zinnschlag
ed3641b214 Issue #68: check for essential actors 2012-10-27 13:33:54 +02:00
Marc Zinnschlag
2e63ca5e0a Merge branch 'death' 2012-10-27 11:33:26 +02:00
Marc Zinnschlag
453f347ee8 Issue #68: added getdeadcount script function 2012-10-27 11:33:18 +02:00
Marc Zinnschlag
f72c35fc17 Issue #68: tally deaths 2012-10-27 11:15:52 +02:00
Marc Zinnschlag
6b09b3ad61 Issue #68: Play death animations 2012-10-27 10:36:42 +02:00
bwrsandman
5d45d328b8 Fixed uninitialized variable that caused a segfault when going to previous page. 2012-10-26 21:28:22 -04:00
greye
9f923e7963 fix crashing if /home/greye/.cache not exist 2012-10-25 15:14:34 +04:00
Marc Zinnschlag
21c24dedb6 Issue #68: Stop player from dying (temporary workaround) 2012-10-25 12:28:45 +02:00
Marc Zinnschlag
0ab432b074 Issue #68: fixed death detection 2012-10-25 12:22:48 +02:00
Marc Zinnschlag
9172c3ec4d Issue #68: stop NPCs from instantly dropping dead 2012-10-23 13:54:36 +02:00
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
dc33dee22e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
 2012-10-01 20:25:23 +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
05eb307bfb added video timing 2012-09-25 02:54:29 +02:00
scrawl
73c69e8eda video playback 2012-09-25 02:35:50 +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