Chris Robinson
144d52cf49
Add voices to the chargen class questions
2012-05-01 20:30:31 -07:00
scrawl
bd132074af
some formatting tweaks
2012-04-30 22:37:23 +02:00
scrawl
48e3c43823
added the bloodmoon/tribunal spells
2012-04-30 21:36:45 +02:00
scrawl
6d21fe3115
fixed mygui leaking some stuff resulting in lower fps after looking at tooltips and low-quality text
2012-04-30 21:07:25 +02:00
scrawl
cc365c5bcb
Merge branch 'master' into tooltips
2012-04-30 18:23:27 +02:00
scrawl
fc06dc72c9
small fix
2012-04-30 18:20:44 +02:00
scrawl
ea275a8aa8
extended the list of spells with no magnitude / no duration
2012-04-30 18:11:34 +02:00
gugus
5f8c08b18b
some work for dropping objects.
2012-04-30 13:01:18 +02:00
Marc Zinnschlag
53e77d4196
Merge remote branch 'scrawl/tooltips' into next
2012-04-30 10:21:21 +02:00
scrawl
2f0a69160c
small fix
2012-04-30 02:10:55 +02:00
scrawl
22f524f8d5
potion effects in tooltip
2012-04-30 01:53:22 +02:00
scrawl
b82c39c8be
renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be
...
reused for potion effects
2012-04-30 01:08:10 +02:00
scrawl
f733382f74
tooltip now contains info about item enchantment
2012-04-30 00:57:41 +02:00
scrawl
eca18f3e1d
dialogue topic and choice sorting independent of case
2012-04-29 18:13:03 +02:00
gugus
5603cb312c
Objects can now be selected and follow mouse movements.
2012-04-27 20:54:39 +02:00
gugus
a6419c3596
Clicking on an item is now detected.
...
Trying to have items follow the mouse position, but it doesn't work yet.
2012-04-26 19:35:45 +02:00
scrawl
1b5bfc52a1
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
2012-04-24 02:02:03 +02:00
Marc Zinnschlag
9f1199ee7e
removing a using directive from a header file
2012-04-23 15:29:15 +02:00
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
2012-04-23 15:27:03 +02:00
scrawl
1b02b503a2
gcc compile fix
2012-04-22 21:06:08 +02:00
gugus
25432d97d2
trying to get selected item. Doesn't work.
2012-04-21 20:35:45 +02:00
gugus
93ba773d2e
Merge branch 'inventoryGUI' of https://github.com/pchan3/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/mwgui/container.cpp
2012-04-21 11:08:10 +02:00
gugus
33654535c1
The inventory window now display the inventory of the player
2012-04-21 11:05:30 +02:00
gugus
1e8d894e1c
Starting inventory window
2012-04-21 10:51:01 +02:00
scrawl
4889902b98
magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects
2012-04-18 21:18:53 +02:00
scrawl
c7381d4491
adding widget MWEnchantment
2012-04-18 18:09:30 +02:00
scrawl
d568b27b92
spell widget i18n improvements (used e.g. in birth menu)
2012-04-18 16:53:56 +02:00
pchan3
215d4e1739
Made adjustments to keep container window within the viewscreen.
2012-04-18 23:09:13 +10:00
pchan3
f902c8fa6f
Fixes on Namespace issue & more.
2012-04-18 22:35:35 +10:00
scrawl
8231cab599
correct case for dialogue topics
2012-04-17 23:47:50 +02:00
scrawl
2e57cf5730
fixed the tooltip for doors leading to exteriors, fixed map window cell name
2012-04-17 18:47:51 +02:00
scrawl
94993b515c
clean up and tooltip padding
2012-04-17 16:49:28 +02:00
scrawl
8eb0636344
restored gui-mode tooltips
2012-04-17 16:00:13 +02:00
scrawl
cdd4d83d9e
moved the tooltip info to the appropriate MWWorld::Class classes
2012-04-16 22:58:16 +02:00
scrawl
c4825cdb43
fixed gold pickup sound for international MW versions, fix npc tooltip
2012-04-16 20:20:18 +02:00
scrawl
cfa37b0e77
fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text
2012-04-16 19:14:05 +02:00
scrawl
424a90aa92
back & ok button caption
2012-04-16 17:46:54 +02:00
scrawl
14377ba789
window caption fix
2012-04-16 17:30:57 +02:00
scrawl
b3dc1931a9
general GUI refactoring, part 1
2012-04-16 15:48:01 +02:00
scrawl
f5ab127a39
toggleFullHelp
2012-04-16 15:00:44 +02:00
scrawl
194ecf274c
attribute tooltips
2012-04-16 00:16:35 +02:00
scrawl
5d9648d645
fix const reference
2012-04-15 22:00:28 +02:00
scrawl
705d4c6d54
mostly complete
2012-04-15 21:14:14 +02:00
gugus
489261a6ae
Close button works.
2012-04-15 21:02:54 +02:00
gugus
58d05fa503
more clean-up. Container window shows up! But there is no working close button.
2012-04-15 20:56:45 +02:00
gugus
78c8a22cd1
more clean up. The container GUI shows up now
2012-04-15 19:32:41 +02:00
gugus
a38db39e88
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-04-15 17:54:13 +02:00
gugus
b309d245c5
cleaning up hircine work
2012-04-15 17:52:39 +02:00
scrawl
d37bc9cba8
basic mouse-over info for in-game objects
2012-04-15 17:10:08 +02:00
scrawl
cac662ca98
basic tooltips
2012-04-14 17:47:44 +02:00
scrawl
e3486931ae
F10 hotkey toggle FPS
2012-04-13 13:17:50 +02:00
scrawl
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
2012-04-12 14:26:21 +02:00
Roman Melnik
bdbb8a8d84
Merge remote-tracking branch 'upstream/master' into windowsPinning
...
Conflicts:
apps/openmw/mwgui/window_manager.cpp (keep both changes)
2012-04-07 17:30:20 +03:00
Roman Melnik
ef0a185e11
Pinnable windows: hide hud elements
...
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.
Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
2012-04-06 01:17:23 +03:00
Roman Melnik
91a377df86
Fix behaviour of the MapWindow
...
The map now will track player's position/rotation when
pinned, and will not update if position/rotation didn't
change since last frame.
2012-04-01 23:51:49 +03:00
scrawl
0a5757791c
Merge branch 'master' into minimap
2012-04-01 20:17:07 +02:00
Roman Melnik
911ca4be89
Move MapWindow to separate files
...
Separate MapWindow from bunch of classes in layouts.cpp/hpp
Inherit it from WindowPinnableBase.
TODO: map arrow (player position) updates orientation only
when you open the inventory. When the map window is pinned,
the arrow direction is not updated.
2012-04-01 20:39:53 +03:00
Roman Melnik
d09f0610ea
Add basic windows pinning
...
Create WindowPinnableBase class for windows which should be
allowed to be pinned.
Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).
Handle clicking on PinToggle button (pinning/unpinning a window).
2012-04-01 20:36:57 +03:00
Marc Zinnschlag
ca4ad74151
more cleanup
2012-03-31 21:29:46 +02:00
Eli2
3cc81d74bc
Cleanup, replaced if with switch
2012-03-31 19:50:21 +02:00
scrawl
521b9eec6c
Merge branch 'master' into minimap
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/world.cpp
2012-03-30 15:31:07 +02:00
scrawl
4bbedeb3e7
made all dialogs semi transparent (like in morrowind)
2012-03-30 14:01:43 +02:00
scrawl
d3f31c3498
dialogue window enhancements
2012-03-30 13:53:35 +02:00
scrawl
8d224f009f
toggleFogOfWar script command
2012-03-29 19:45:19 +02:00
Marc Zinnschlag
a0c5ccf974
Merge remote branch 'lgro/valgrind'
2012-03-28 21:46:47 +02:00
Lukasz Gromanowski
f86d53636d
Issue #225 : Correction to commit fa4c4b8
.
...
Correction to commit fa4c4b8
- memeber mChanged should be
set to true, otherwise the map won't display if the game
is started in (0, 0) cell.
2012-03-28 21:36:38 +02:00
Lukasz Gromanowski
fa4c4b8f21
Issue #225 : Initialize members in class constructor.
2012-03-27 23:07:25 +02:00
Marc Zinnschlag
a996cfed71
Merge remote branch 'ace/win-fixes' into next
2012-03-27 20:11:46 +02:00
Alexander "Ace" Olofsson
55f1053b4f
Windows fixes for compiling and linking
2012-03-27 00:36:53 +02:00
Lukasz Gromanowski
5185a28b60
Issue #225 : Initialize all class members in constructor.
2012-03-26 19:09:55 +02:00
scrawl
f959a5cbeb
auto adjust size of map window title bar
2012-03-24 23:24:19 +01:00
scrawl
a6259a1b0d
bugfixes
2012-03-23 17:37:56 +01:00
scrawl
7a3034701f
functional HUD map
2012-03-23 16:51:56 +01:00
scrawl
a1f80e029e
abstracted some code to be reused for hud
2012-03-23 16:16:31 +01:00
scrawl
789fbb460f
move implementation to .cpp
2012-03-23 15:34:54 +01:00
scrawl
ce63d29d4a
rotate hud player arrow
2012-03-23 15:26:24 +01:00
scrawl
06fa310e29
player arrow rotated correctly
2012-03-23 15:00:48 +01:00
scrawl
770b0f2106
gui changes
2012-03-23 10:25:55 +01:00
scrawl
9c3e1f48f0
player arrow
2012-03-23 09:00:00 +01:00
scrawl
8e299bd25b
remove unuseful std::cout
2012-03-23 08:16:32 +01:00
scrawl
2dd329938a
automatically zoom in on the player while moving
2012-03-23 08:16:04 +01:00
scrawl
cf3515a898
it is now possible to drag the minimap with the mouse
2012-03-22 21:27:21 +01:00
scrawl
cc9f20a04f
MW_MapView skin
2012-03-22 20:25:41 +01:00
scrawl
ab9aa1ba74
Merge branch 'next' into minimap
...
Conflicts:
files/mygui/openmw_map_window_layout.xml
2012-03-22 19:36:37 +01:00
scrawl
d1508f5a59
List -> ListBox
2012-03-22 15:28:06 +01:00
scrawl
560e702973
fixed scroll bars
2012-03-22 15:23:23 +01:00
scrawl
26aae9d2ce
fix class name typo
2012-03-22 15:10:29 +01:00
scrawl
161d519206
fixed the dialogue history topic selection
2012-03-22 15:01:37 +01:00
scrawl
9b31b6272f
fixed the mouse cursors and fixed MWAttribute & MWSkill
2012-03-21 16:07:56 +01:00
scrawl
64212c0ee6
replaced all the StaticImage and StaticText in code
2012-03-21 14:54:02 +01:00
scrawl
b0b41a9199
should now compile warning free
2012-03-21 13:48:57 +01:00
scrawl
97ab48993e
more deprecated fixes
2012-03-21 13:32:32 +01:00
scrawl
deeb21a131
switched to the new multi-delegates system
2012-03-21 13:27:08 +01:00
scrawl
d451d7bb67
compile fixes for mygui 3.2
2012-03-20 20:24:36 +01:00
Marc Zinnschlag
4d0d941c2e
Merge remote branch 'kromgart/master'
2012-03-20 10:17:35 +01:00
Marc Zinnschlag
6a0474a977
removed some cout spam
2012-03-20 10:15:22 +01:00
Roman Melnik
88979577db
Change 'nullptr' to 'NULL' (after fixing bug#192 in previous commit)
2012-03-19 21:45:53 +02:00
Roman Melnik
a9759c3f33
Fix bug #192 : Remove the focus from the console when console is closed
...
(set current keyFocusWidget to nullptr)
2012-03-19 21:01:00 +02:00
Marc Zinnschlag
f2a47d421b
some cleanup
2012-03-19 19:21:08 +01:00
gugus
2707391535
fix for questions
2012-03-19 18:30:52 +01:00
gugus
7ca0503205
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-19 00:20:43 +01:00
gugus
f87bd65ae1
Merge branch 'DialogueSystem' of github.com:scrawl/openmw into DialogueSystem
2012-03-17 17:00:28 +01:00
gugus
846196d048
fixed a crash
2012-03-17 16:56:22 +01:00
scrawl
21143f006b
fix several warnings
2012-03-17 15:47:22 +01:00
Michael Papageorgiou
dbbf50a184
Journal sounds, close sound will be added later
2012-03-17 15:52:57 +02:00
scrawl
5e939e4818
map window now works for interiors
2012-03-17 13:59:51 +01:00
gugus
10321ff51a
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-16 17:58:23 +01:00
gugus
042d87f77f
a lot of clean up
2012-03-16 17:53:34 +01:00
gugus
56a84b6a1a
choices works. The only thing remaining is the script arguments problems.
...
Need a lot of clean up too.
2012-03-16 17:30:59 +01:00
scrawl
c885ec1bd1
Merge branch 'master' into minimap
2012-03-16 17:10:27 +01:00
scrawl
91d2031eb7
first attempt at map window
2012-03-16 17:09:31 +01:00
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
2012-03-15 16:01:41 +01:00
gugus
07d8d654cd
one step toward function filters and end choices.
2012-03-14 18:47:29 +01:00
scrawl
fa68be2b19
set map window cell name
2012-03-10 16:05:12 +01:00
gugus
6f7752633a
there was no extension in the compiler context. Corrected. But Choice doesn't work.
2012-03-07 18:44:09 +01:00
Marc Zinnschlag
65756db49e
Merge remote branch 'gus/DialogueSystem' into dialogue
2012-03-05 11:34:16 +01:00
Marc Zinnschlag
4bdfbb6d4f
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-03-05 11:34:06 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
gugus
232e478768
Fix for prefix/suffix stuff
2012-02-15 13:23:59 +01:00
gugus
bc72b2d535
fixed text color
2012-02-12 22:24:23 +01:00
Lukasz Gromanowski
8829d46bda
Clean up compilation warnings.
...
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-12 15:45:08 +01:00
Marc Zinnschlag
d9945a976d
Merge remote branch 'gus/DialogueSystem' into dialogue
2012-02-12 13:47:04 +01:00
gugus
4658ec276f
increased the max size of the text of the dialogue
2012-02-11 12:18:47 +01:00
gugus
94ab65f8bb
fixe a compiling error?
2012-02-10 16:21:04 +01:00
gugus
c65c160e7b
finished connecting the dialogue GUI and the dialogue manager
2012-02-05 12:25:23 +01:00
gugus
abe38e5f87
Started to weire the dialogue manager and the dialogue GUI
2012-02-05 10:54:56 +01:00
Marc Zinnschlag
52a6605f10
Merge remote branch 'mirc/refactor_wm' into refactor_wm
...
- changed the way dynamics stats are passed to the character creation object
- some more clean up
Conflicts:
.gitignore
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
2012-02-03 11:24:28 +01:00
Cris Mihalache
4bc7051741
Finished refactoring, brought CharacterCreation up to standards
2012-02-02 18:31:28 +02:00
Cris Mihalache
ed5892eb5c
Finished moving the bulk of character creation code
2012-01-30 21:53:17 +02:00
Cris Mihalache
d17ba6ce19
Forgot the CharacterCreation files
2012-01-30 19:27:49 +02:00
Cris Mihalache
4b758376be
Created a class for char gen, and starting moving code to it
2012-01-30 16:38:43 +02:00
Marc Zinnschlag
5a70f28f47
removed a warning
2012-01-29 20:29:02 +01:00
Cris Mihalache
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
2012-01-29 17:31:18 +02:00
gugus
5cbd256e1c
"full" question support. Now needs to be linked with the dialogue Manager.
2012-01-28 16:16:49 +01:00
gugus
debec44b51
better colors (not perfect yet), and some basic question support (not finished yet).
2012-01-28 16:08:22 +01:00
gugus
f7cf5f9bef
improved the dialogue GUI. Questions are still missing.
2012-01-27 14:50:13 +01:00
Marc Zinnschlag
e3631003e9
Merge remote branch 'yacoby/detailed_fps'
2012-01-17 14:04:00 +01:00
Marc Zinnschlag
f5a82931b6
some cleanup
2012-01-17 13:53:27 +01:00
Jacob Essex
e73640e720
Improved code, added labels to the counter
2012-01-17 11:58:06 +00:00
gugus
484b8a95f0
removed useless std::cout
2012-01-16 21:58:18 +01:00
Jacob Essex
3b15170d09
Cleaned up and simplified the code relating to the fps display
2012-01-16 18:16:33 +00:00
gugus
eb4dea3d87
Previous/Next button implemented
2012-01-16 17:46:25 +01:00
Jacob Essex
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
2012-01-16 15:33:21 +00:00
gugus
9031f62962
The journal is now in the center of the screen.
2012-01-11 12:58:39 +01:00
gugus
428d0ce820
journal formating. Problems with french accents.
2011-12-30 11:39:17 +01:00
gugus
d59284a096
first attempt to read the journal
2011-12-29 17:58:58 +01:00
gugus
28bd9ce362
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
2011-12-11 11:21:57 +01:00
gugus
4087ab3cda
correct CMake and add some text formating attempt.
2011-12-01 13:44:34 +01:00
gugus
62946cc79d
can now clear text.
2011-11-28 17:00:32 +01:00
gugus
bc51ba5a38
Add the journal window (J key). It's still not in the right position.
2011-11-28 16:51:11 +01:00