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

1176 commits

Author SHA1 Message Date
Sebastian Wick
7b40e57ba1 Allow the 'Activate' key to close the countdialog window; cleanups 2013-07-29 18:27:00 +02:00
Sebastian Wick
1b310c5c5b use SDL resolutions in the ingame settings 2013-07-29 13:34:56 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
Marc Zinnschlag
ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2' 
Conflicts:
	apps/openmw/mwrender/animation.cpp
 2013-07-23 09:12:23 +02:00
Emanuel Guevel
48f0e64ec3 Fix health calculation at character creation 2013-07-21 11:02:03 +02:00
Emanuel Guevel
2a0644a7c3 Move some levelup logic from mwgui to mwmechanics 2013-07-20 22:14:10 +02:00
Chris Robinson
14e0c182f3 Allow specifying the sound type to playSound and playSound3D 2013-07-18 21:50:11 -07:00
scrawl
91e95e1404 Use the correct slash, chop or thrust animation 2013-07-16 23:32:41 +02:00
scrawl
8407e2b3aa Fixes the console sometimes receiving text after it was closed 2013-07-14 23:54:28 +02:00
scrawl
bbb5d2b98a Change tooltip positioning to resemble vanilla 2013-07-10 03:40:13 +02:00
scrawl
91f6d87126 Fix an uninitialized variable 2013-07-07 16:57:46 +02:00
scrawl
72600a16cf Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea 2013-07-06 17:02:40 +02:00
scrawl
58fce74620 Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders 2013-07-06 16:40:57 +02:00
Sebastian Wick
26bd2a5301 use the new scrollbar; range dependent step size; fix 2013-07-05 20:28:46 +02:00
Sebastian Wick
b43f41c2bd use a mygui controller for scrollbar repeat 2013-07-05 19:17:00 +02:00
Sebastian Wick
e3d8bdbafe autorepeat scrollbar 2013-07-02 17:29:47 +02:00
vorenon
4e8e048968 Added missing click sounds to dialogue 2013-06-19 01:46:38 +02:00
Marc Zinnschlag
b5926257f5 Merge remote-tracking branch 'scrawl/sdl_input2' 2013-06-16 21:23:35 +02:00
scrawl
b16bc69479 Removed the no longer needed --debug switch 2013-06-16 20:39:40 +02:00
Marc Zinnschlag
57ce87bf12 Merge remote-tracking branch 'scrawl/sdl_input2' 2013-06-16 20:37:15 +02:00
scrawl
4fd7891d2c Fix a message box issue 2013-06-16 20:26:27 +02:00
vorenon
76a2abcbe3 added missing line break in front of multiple choice questions 2013-06-16 19:46:55 +02:00
scrawl
b16c92c2f5 Better handle SDL_TEXTINPUT events 2013-06-16 19:43:59 +02:00
scrawl
03682184c6 Enable SDL_TEXTINPUT events only when a text input widget currently has key focus 2013-06-16 18:06:55 +02:00
Marc Zinnschlag
3e29506d5c Merge remote-tracking branch 'vorenon/dialogue' 2013-06-16 17:03:50 +02:00
vorenon
4c0086b54c Workaround for bug #820 2013-06-16 01:09:03 +02:00
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
scrawl
f1ff9b69b3 Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches 2013-06-15 15:33:47 +02:00
Rohit Nirmal
e5ddaaf676 Fix wrong indenting from my last commits. 2013-06-13 11:17:34 -05:00
Marc Zinnschlag
df016778be Merge remote-tracking branch 'rohitnirmal/journal-open-sound' 2013-06-13 18:04:38 +02:00
scrawl
0880805559 Minor cleanup 2013-06-13 12:13:40 +02:00
Rohit Nirmal
9d4ecc3e73 replace tabs with spaces. 2013-06-13 00:52:26 -05:00
Rohit Nirmal
aac3ada14b Use mousewheel to turn book pages. 2013-06-13 00:50:07 -05:00
scrawl
fcf35d3871 Removed the UI cursor sensitivity slider 2013-06-12 20:27:55 +02:00
scrawl
918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 2013-06-12 14:58:07 +02:00
scrawl
495aeb5d3b Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
 2013-06-12 12:34:33 +02:00
Marc Zinnschlag
bd08677a7f Merge branch 'openmw24' 2013-06-12 10:37:33 +02:00
Rohit Nirmal
fdeac21f22 Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound 2013-06-11 21:36:00 -05:00
Rohit Nirmal
b5caa25e5c Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu. 2013-06-10 19:42:38 -05:00
Rohit Nirmal
4eede86ce6 Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal. 2013-06-09 23:27:47 -05:00
fstp
a3b2a76e60 Added virtual destructors to classes LocalMapBase and EffectEditorBase. 2013-06-09 23:08:57 +02:00
scrawl
daab4f55a3 Use Morrowind's fonts 2013-06-06 22:26:06 +02:00
Miroslav Puda
dc17fa1636 Removal of duplicit enumeration and unnecessary conditions. 2013-05-29 00:01:18 +02:00
Marc Zinnschlag
bbec3680c6 Merge remote-tracking branch 'pakanek/enchanting-mechanics' 2013-05-28 10:02:03 +02:00
scrawl
9a43927078 Fix weapons not appearing in Enchantable filter 2013-05-28 03:15:13 +02:00
Miroslav Puda
b40e24c50c Refactorization 2013-05-27 20:23:04 +02:00
Miroslav Puda
4e17bc1499 Fix for display of cast cost decimal value 2013-05-27 20:16:57 +02:00
Miroslav Puda
9a9b075a02 Correct cast cost for enchantments. 2013-05-27 18:08:12 +02:00
Miroslav Puda
252a1d9223 Replacement of some magical constants 2013-05-27 15:50:47 +02:00
Miroslav Puda
9e1eb8b3b1 Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics 2013-05-27 14:45:22 +02:00
Miroslav Puda
4788b5e226 Better formula for enchantment cost and code refactorization. 2013-05-27 14:42:08 +02:00
Marc Zinnschlag
fa63ebce78 Merge remote-tracking branch 'scrawl/master' 2013-05-27 10:19:02 +02:00
scrawl
3a6e54c4f5 Sell owned items in the cell 2013-05-27 02:18:36 +02:00
riothamus
d9350be8da Console Object Selection Fix 2013-05-24 09:31:56 -04:00
scrawl
32e90bb733 Fix chargen statssheet 2013-05-23 17:28:45 +02:00
riothamus
7187f50c40 Bug 788 2013-05-23 09:13:21 -04:00
Edmondo Tommasina
f0482dd796 dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘" 
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:
In constructor ‘MWGui::DialogueWindow::DialogueWindow()’:
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44:
error: ‘bind’ is not a member of ‘boost’
 2013-05-20 23:51:01 +02:00
scrawl
7a2d1cd8ce Security skill 2013-05-19 18:40:37 +02:00
scrawl
3cadb5918f Fix containers showing random items from my commit earlier 2013-05-17 14:11:02 +02:00
Marc Zinnschlag
cc42b1ef48 Merge remote-tracking branch 'riothamus/riothamus-b752' 2013-05-16 20:07:48 +02:00
riothamus
d89dbde940 Bug 752, spacing fix 2013-05-16 14:05:22 -04:00
Marc Zinnschlag
9fe5ff46cd Merge remote-tracking branch 'riothamus/riothamus-b752' 2013-05-16 19:52:14 +02:00
riothamus
36f1197b51 Bug 752, cleanup 2013-05-16 13:51:54 -04:00
riothamus
db981a72fe Bug 752 2013-05-16 13:40:00 -04:00
Marc Zinnschlag
2c8a511179 Merge remote-tracking branch 'scrawl/persistence' 2013-05-16 19:37:41 +02:00
scrawl
8a3d3f954b NPC/creature persistence flag 2013-05-16 18:50:26 +02:00
Glorf
0539ca6a9c Bugfix #778 2013-05-16 13:35:28 +02:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
Marc Zinnschlag
9835c6df11 Merge remote-tracking branch 'scrawl/tradefix' 2013-05-12 12:58:32 +02:00
scrawl
b56d50287e Barter mechanic fix 2013-05-11 22:56:36 +02:00
Marc Zinnschlag
e14cb6853f Merge remote-tracking branch 'scrawl/containerui' 2013-05-11 19:23:02 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
kpp
24d619d6b4 Changes the logic of WindowManager::messageBox() 
Fixes removeItem
Fixes addItem
 2013-05-10 14:06:25 +04:00
scrawl
90b7df439f Fix image buttons 2013-05-08 13:55:15 +02:00
scrawl
007a3cf9bd rename IInterface to Interface 2013-05-06 16:05:56 +02:00
scrawl
b5071ced23 Removed using namespace 2013-05-06 16:04:28 +02:00
scrawl
c6edb0288a Remove unused file 2013-05-06 15:30:23 +02:00
scrawl
1315432322 Handle @# links in journal 2013-05-06 15:14:39 +02:00
scrawl
d43adbaa7c Topic link fixes for russian version, thanks to greye for testing 2013-05-06 13:13:14 +02:00
scrawl
166eac2e25 Cleanup 2013-05-06 11:31:34 +02:00
scrawl
38c399a698 Fix duplicate sounds 2013-05-05 10:51:17 +02:00
scrawl
0f2866dc15 Text replace fix 2013-05-04 18:49:51 +02:00
scrawl
48c5e33c79 Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly. 2013-05-04 17:40:00 +02:00
scrawl
a33e6b9c35 Fast forward to the last page in the journal when opening it 2013-05-04 16:06:48 +02:00
scrawl
d16bb26a48 Added text colors, goodbye, message 2013-05-04 15:15:44 +02:00
scrawl
f07497bbde Fix lockup 2013-05-04 14:18:13 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
scrawl
0bb51fd91d Retrieve the correct case for topics in the journal 2013-05-03 22:53:29 +02:00
scrawl
1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-03 18:17:27 +02:00
Marc Zinnschlag
2e6594f8f7 Merge remote-tracking branch 'glorf/bugfix-5' 2013-05-03 14:55:00 +02:00
Glorf
57f22c77c0 Bugfix #732 part 1 2013-05-03 12:44:27 +02:00
kpp
dcccfd9f22 Initialize values 2013-05-02 22:43:21 +04:00
kpp
28ef4d97da Fixes Bug #734 'Book empty line problem' 
Hides buttons 'Next' and 'Prev' at the last and at the first page
 2013-05-02 07:35:25 +04:00
scrawl
3c68c87923 Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries 2013-05-01 10:28:59 +02:00
scrawl
2a42556aa5 Merge branch 'master' into HEAD 2013-04-30 14:54:10 +02:00
Glorf
d283f8d85f Bugfix #748 2013-04-29 21:19:13 +02:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
Glorf
6222b3f52a Bugfix #744 2013-04-29 17:19:20 +02:00
scrawl
6c5ea1ea7a Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes 2013-04-29 12:05:10 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00