teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
5407 commits 34 branches 0 tags 66 MiB
Commit graph

859 commits

Author SHA1 Message Date
scrawl
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
 2012-12-11 22:28:23 +01:00
Marc Zinnschlag
386eec51c1 some skill usage fixes 2012-12-07 11:36:38 +01:00
eduard
ea8ee11ff7 tradding skill use 2012-12-06 14:25:53 +01:00
eduard
5332546541 tradding skill use 2012-12-06 13:58:52 +01:00
scrawl
3db850a7d1 Don't crash if no loading screens are found 2012-12-03 05:45:04 +01:00
scrawl
ea2bbec76e better fix for bed activation 2012-12-03 05:32:12 +01:00
Tom Mason
a6fd369e4e Fixed wait window reappearing after sleeping 2012-12-02 22:10:47 +00:00
Marc Zinnschlag
b25f2e88ce Issue #492: fixed double alchemy ingredients removal 2012-12-02 15:07:22 +01:00
Marc Zinnschlag
556d737f65 Merge remote-tracking branch 'trombonecot/windowformatting' 2012-12-02 14:36:36 +01:00
eduard
30d0e93cf4 Fix window formatting on tool tip with too log titles 2012-12-02 14:12:18 +01:00
eduard
7e7e6e2bcb Fix window formatting on tool tip with too log titles 2012-12-02 14:08:22 +01:00
scrawl
c4facc233e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-12-01 11:30:51 +01:00
scrawl
8e857587d7 fix a text coloring bug 2012-11-28 02:36:33 +01:00
scrawl
1def60dbe1 PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank 2012-11-28 02:15:34 +01:00
Marc Zinnschlag
a6c7f16a7b Merge remote-tracking branch 'scrawl/reputation' 2012-11-23 21:26:44 +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
scrawl
693eeabeca shiny: fix GLSL texture units when shaders were disabled 2012-11-19 13:55:26 +01:00
scrawl
dc67a547b0 global map explored overlay 2012-11-16 19:34:09 +01:00
scrawl
aefde3f5bc Merge branch 'master' into globalmap 2012-11-15 13:21:24 +01:00
Marc Zinnschlag
409d15576b Merge remote-tracking branch 'greye/player-model' 2012-11-12 14:18:38 +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
0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 2012-11-10 14:59:52 +01:00
Marc Zinnschlag
d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 2012-11-10 12:36:01 +01: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
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
d53a7ade1e method names, disposition uint->int 2012-11-09 14:42:09 +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
bf4e855260 fixed creatures 2012-11-08 22:31:08 +01:00
gugus
4634227f1c notify the user when the merchant doesn't accept the offer 2012-11-08 21:50:56 +01:00
scrawl
3d7146cd50 don't allow opening a window multiple times, primarily the console 2012-11-08 19:34:54 +01:00
greye
2a86432887 store birthsign in MWWorld::Player 2012-11-08 18:50:23 +04: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
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
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
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
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
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
greye
4637503680 applying new interface vol.6, inconsistent 2012-11-06 00:34:11 +04: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
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
Marc Zinnschlag
61942c9c4a Issue #440: Make day numbers start at 1 instead of 0 2012-11-05 18:01:50 +01: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
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
Marc Zinnschlag
6f7a621b6f disabled enchanting unfinished enchantment GUI for now 2012-11-04 23:15:20 +01:00
scrawl
38828acac9 transparent overlay 2012-11-04 12:13:04 +01:00
scrawl
ba2fc2d6f8 better fix for chargen button colors 2012-11-04 11:37:47 +01: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
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
bwrsandman
5d45d328b8 Fixed uninitialized variable that caused a segfault when going to previous page. 2012-10-26 21:28:22 -04: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
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
d76522e7a4 searchPtrViaHandle 2012-10-19 19:48:02 +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
510674aa5e Merge branch 'master' into alchemy 
Conflicts:
	components/esm/loadmgef.hpp
 2012-10-18 14:37:05 +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
scrawl
f154031e54 last bits of the gui 2012-10-11 18:26:29 +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