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

593 commits

Author SHA1 Message Date
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
Marc Zinnschlag
39af941d6f Issue #19: Moved code from Engine to WindowManager and ScriptManager 2011-10-09 12:05:13 +02:00
k1ll
0ece722ff3 Added handling of quotation marks and search for matches now ignores the case of input and keywords. When completing and there are matching or partly matching uppercase keywords the output will be upercase too. If this is a problem i'll change it. 2011-07-19 18:42:34 +02:00
k1ll
ac43d482c5 Basic tab-completition seems to be finished. It's working like requested in the old thread. 2011-07-18 18:49:38 +02:00
Sebastian Wick
317c920e03 everything works, also the readPressedButton function should do the job 2011-07-12 20:05:04 +02:00
Sebastian Wick
16ed02baeb all MessageBoxes look good; next: make them do something ;) 2011-07-12 19:17:07 +02:00
Sebastian Wick
0fc77dc1c3 everything looks good if buttons are on one line 2011-07-12 18:05:46 +02:00
Sebastian Wick
537b2bf963 set position on interactive MessageBox'es 2011-07-12 17:57:16 +02:00
Sebastian Wick
9c2bb76869 disigned the interactive messagebox. Have to center it and add button events 2011-06-19 22:56:51 +02:00
Sebastian Wick
23194a932f creating the buttons on the fly 2011-06-19 19:41:42 +02:00
Sebastian Wick
5db8e8c449 InterMessageBox game mode 2011-06-19 19:10:44 +02:00
Sebastian Wick
e77240dceb basics for InteractiveMessageBox 2011-06-18 15:50:41 +02:00
Sebastian Wick
d74f834735 make to boxes apear on the correct place even if the oldest is erased 2011-06-16 18:12:50 +02:00
Sebastian Wick
315f4078c6 make them behave like the MessageBox in the original game 2011-06-16 17:11:50 +02:00
Sebastian Wick
b72e9d3b2b non-interactive MessageBox is finished. Didn't find any bugs. 2011-06-16 13:02:49 +02:00
Sebastian Wick
4d1db13c8f MessageBoxmangerTimer is now working properly 2011-06-16 12:12:50 +02:00
Sebastian Wick
a4217f8fb8 Everything should work fine but deleting the existing MessageBox'es. 2011-06-15 22:53:05 +02:00
Sebastian Wick
94e010b790 delete all non-interactive MessageBox'es when creating an interactive MessageBox 2011-06-15 19:53:32 +02:00
Sebastian Wick
6dc35247da Word wrap for MessageBox 2011-06-15 19:42:20 +02:00
Sebastian Wick
9c56031ee2 rudimental implementation of non-interactive MessageBox 2011-06-15 13:58:57 +02:00
Sebastian Wick
fc25ccef4e MW_Dialog set ro right propertys 2011-06-14 22:11:36 +02:00
Sebastian Wick
56dc9ffcf3 now, realy deleted needless code. 2011-06-14 18:29:55 +02:00
Sebastian Wick
5bf5bde946 created new files, conncted MessageBoxManger with WindowManager 2011-06-14 16:41:30 +02:00
Marc Zinnschlag
80691250ec don't create a new virtual machine for each script and frame 2011-05-18 16:01:19 +02:00
Marc Zinnschlag
5b6ec405e3 Merge branch 'script' 2011-04-28 10:30:32 +02:00
Marc Zinnschlag
125319c441 splitting off console output from messageBox channel 2011-04-26 21:48:13 +02:00
Marc Zinnschlag
717b5e1784 fixed a constness problem 2011-04-21 10:49:45 +02:00
Marc Zinnschlag
a70e582ae2 removed debugging leftovers from the tab_complition branch 2011-03-23 23:03:41 +01:00
Marc Zinnschlag
d7226fc9c2 Merge branch 'tab_completion' 2011-03-23 17:08:52 +01:00
gugus
0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
 2011-03-15 13:36:25 +01:00
Jan-Peter Nilsson
0f2152903e Get rid of deprecated warning for eventWindowChangeCoord 2011-03-12 13:54:00 +01:00
Jan-Peter Nilsson
f83c5327f3 Move eventDone to WindowBase and make it tell which window is done 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
54fc64cb6a Decrease number of classes that need to know about other components 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
67b4243a7f Use one instead of five state variables to keep track of character creation progress 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
183ccad872 Move ClassPoint struct definition from source to header file 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
53b85eaaa9 Stat setValue, use the enum values all the way through instead of converting enum->string->same enum 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
0695e8d8b2 Move HUD implementation out of the header file 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
2a53afc2bf Move StatsWindow class to it's own file. 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
5342bd77f1 Use one event with a parameters instead of four events to tell with dialog we want to see 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
a0ee11c51b Don't care about the widget 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
03158f4b62 Change indentation to four spaces 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
6840e2c42f Fix mising of signed/unsigned types in WindowManager::showClassQuestionDialog 2011-03-07 19:13:24 +01:00
gugus
7386fd0442 solve error with min/max macro for windows 2011-02-19 19:21:32 +01:00
gugus
84dce2eb36 add physic and solve a problem with window.h macro min/max 2011-02-19 19:18:03 +01:00
sergoz
53ac8776ec added box for fps counter and changed font colour to white 2011-02-19 18:55:58 +03:00
sergoz
5132531f73 added fps counter 2011-02-18 17:46:24 +03:00
Marc Zinnschlag
d865c3cfc6 backend for tab completion: identifiers 2011-01-12 18:48:37 +01:00
Marc Zinnschlag
6848115c18 backend for tab completion: keywords 2011-01-12 18:24:00 +01:00
Marc Zinnschlag
bb2bc0b518 getting rid of the nullptr compatibility nonsense. Hopefully once and for all 2011-01-11 10:11:08 +01:00
athile
c459eb7c55 Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010. 2011-01-10 13:48:16 -07:00
Marc Zinnschlag
42ef7a61a0 Merge branch 'script' 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/world.cpp
	apps/openmw/mwworld/world.hpp
 2011-01-09 20:56:21 +01:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Marc Zinnschlag
4a12be11bf moved PlayerPos class from MWRender to MWWorld and renamed it to Player 2011-01-04 15:58:22 +01:00
Marc Zinnschlag
2628b5143c Merge remote branch 'jpn/dialouge' 2010-12-30 15:11:17 +01:00
Marc Zinnschlag
e404d71e4f fixes for class selection merge 2010-12-30 14:27:19 +01:00
Jan-Peter Nilsson
d9d626cc95 Make DialogueWindow use the new WindowBase 2010-11-06 11:47:46 +01:00
Jan-Peter Nilsson
180164b2f3 Remove unnecessary includes 2010-11-06 11:45:13 +01:00
Jan-Peter Nilsson
770b490539 Make CreateClassDialog use the new WindowBase 2010-11-06 11:44:02 +01:00
Jan-Peter Nilsson
6fc0e4d6d6 Make DescriptionDialog use the new WindowBase 2010-11-06 11:42:54 +01:00
Jan-Peter Nilsson
12dee62307 Make SelectSkillDialog use the new WindowBase 2010-11-06 11:41:41 +01:00
Jan-Peter Nilsson
8f334d1df2 Make SelectAttributeDialog use the new WindowBase 2010-11-06 11:40:41 +01:00
Jan-Peter Nilsson
037c1021e3 Make SelectSpecializationDialog use the new WindowBase 2010-11-06 11:39:38 +01:00
Jan-Peter Nilsson
4e8f55b630 Make PickClassDialog use the new WindowBase 2010-11-06 11:38:29 +01:00
Jan-Peter Nilsson
ed05c5752b Make GenerateClassResultDialog use the new WindowBase 2010-11-06 11:37:00 +01:00
Jan-Peter Nilsson
0d97200e18 Make InfoBoxDialog use the new WindowBase 2010-11-06 11:33:30 +01:00
Jan-Peter Nilsson
6c7f59725f Make StatsWindow use the new WindowBase 2010-11-06 11:29:49 +01:00
Jan-Peter Nilsson
2e7e79f596 Make ReviewDialog use the new WindowBase 2010-11-06 11:29:03 +01:00
Jan-Peter Nilsson
5db021e99b Make TextInputDialog use the new WindowBase 2010-11-06 11:27:53 +01:00
Jan-Peter Nilsson
e551c60e75 Make RaceDialog use the new WindowBase 2010-11-06 11:26:45 +01:00
Jan-Peter Nilsson
933af72d60 Make BirthDialog use the new WindowBase 2010-11-06 11:26:17 +01:00
Jan-Peter Nilsson
6bf10c93c8 Create a base class for dialog windows 2010-11-06 11:25:16 +01:00
Jan-Peter Nilsson
1ff81354eb Remove unused variables 2010-11-06 01:17:05 +01:00
Jan-Peter Nilsson
cb3fa7c3b2 Remove unused variables 2010-11-06 01:17:05 +01:00
Jan-Peter Nilsson
6f608f1400 Make loose functions part of the InfoBoxDialog class 2010-11-06 01:15:56 +01:00
Jan-Peter Nilsson
9d57b4f0d6 Do not store StaticTextPtr in WidgetPtr and use setTextColour 2010-11-06 01:14:29 +01:00
Jan-Peter Nilsson
bb212e20f4 Do not store StaticTextPtr in WidgetPtr and use setTextColour 2010-11-06 01:14:29 +01:00
Jan-Peter Nilsson
e5509ce7b1 Use arrays in CreateClassDialog 2010-11-06 01:13:34 +01:00
Jan-Peter Nilsson
528c39f1bd Use arrays in PickClassDialog 2010-11-06 01:13:34 +01:00
Jan-Peter Nilsson
ef54401407 Use arrays in SelectSkillDialog 2010-11-06 01:11:37 +01:00
Jan-Peter Nilsson
d7b76809ac Remove unnecessary member variables from SelectAttributeDialog 2010-11-06 01:10:33 +01:00
Jan-Peter Nilsson
be5562cb2c Added dialouge window 2010-11-06 01:09:37 +01:00
Jan-Peter Nilsson
700e379d56 Fix some compiler warnings 2010-11-06 01:07:48 +01:00
Jan Borsodi
f8b96703e6 Added all questions for the generate class dialogs and implemented calculation of class based on the answers given. There are some combinations which does not yield a class yet, will need to figure out the remaining combinations. 2010-10-24 00:45:21 +02:00
Jan Borsodi
cefd5fb338 Reputation and bounty was not initialized to 0. 2010-10-23 01:23:09 +02:00
Jan Borsodi
38b434771a Merge remote branch 'zini/master' into gui-windows 2010-10-23 01:13:11 +02:00
Jan Borsodi
81e83a0813 Player member variables in WindowManager are updated directly when a dialog finishes, needed for review dialog which is shown directly after another closes. 2010-10-23 01:09:33 +02:00
Jan Borsodi
cf9b90386c Do not set the birth sign ID if it is empty. 2010-10-23 01:01:03 +02:00
Jan Borsodi
a0447bcd95 Made sure review dialog is removed before going to previous dialogs. 2010-10-23 01:00:25 +02:00
Jan Borsodi
1c6b9a9b7b Activated buttons in review dialog to go to the respective dialogs. 2010-10-23 01:00:07 +02:00
Jan Borsodi
025af1717f Removed gameWindowSize parameter from all dialogs that had it, instead this is fetched via the environment variable. 2010-10-23 00:17:41 +02:00
Jan Borsodi
12fe9305a6 Further unification of dialog API, all dialogs now have an open() method which updates gui content and makes it visible. 2010-10-23 00:11:54 +02:00
Jan Borsodi
e39f700372 Removed unnecessary methods. 2010-10-23 00:04:00 +02:00
Jan Borsodi
2bf29c17f5 Made sure current player name is shown in name dialog. 2010-10-23 00:00:09 +02:00
Jan Borsodi
e6ad68b8d0 Avoid exception if class ID is not found, instead don't show any fields in the gui. 2010-10-22 23:52:24 +02:00
Jan Borsodi
aaa80d1eb0 Made sure race and class dialog shows the current player values. 2010-10-22 23:51:53 +02:00
Jan Borsodi
2affe7cf78 Removed earlier workaround code for dialog callbacks, no need to reset them anymore as the dialogs are cleaned up at a later point. 2010-10-22 23:38:36 +02:00
Jan Borsodi
06f226f2d8 Updated WindowManager to use the new removeDialog function. 2010-10-22 23:34:41 +02:00
Jan Borsodi
f756e171cc Made sure dialog garbage is also cleaned up on destruction. 2010-10-22 23:21:15 +02:00
Jan Borsodi
1f7659cb12 Only set the class and race IDs if they contain a non-empty string. 2010-10-22 23:18:57 +02:00
Jan Borsodi
6d71094f3b Updated description dialog (from create class) to use WindowManager::removeDialog. 2010-10-22 23:14:52 +02:00
Jan Borsodi
506f61d254 Added a method to remove a dialog safely, first hides the dialog then schedules for deletion in the garbage list. 2010-10-22 23:14:21 +02:00
Jan Borsodi
16aa13721a Updated all dialogs to use a garbage list for postponed cleanup, this list is cleared in update() which is called for each frame. 
Fixed incorrect code in onCreateClassDialogBack, should use set class from pickClassDialog.
Add private method setGuiMode() which calls the input manager, updated all gui-mode changes in WindowManager to use that.
 2010-10-22 22:54:15 +02:00
Marc Zinnschlag
493b1ff081 gcc compatibility fix 2010-10-22 10:21:42 +02:00
Jan Borsodi
3e5f278882 Fixed birthsign and skill list in review dialog, they were not properly set. 2010-10-21 09:47:34 +02:00
Jan Borsodi
970a7a3498 Removed hardcoded values from review dialog and added functionality for setting all fields in the dialog. Window manager keeps track of player values set from the outside and passes these to the review dialog. 2010-10-21 09:28:09 +02:00
Jan Borsodi
1c1d33e723 Initial work on the stat review dialog. 2010-10-20 21:40:32 +02:00
Jan Borsodi
c45811770a Added a custom widget for displaying dynamic stats (health, magicka, fatigue). Can show a title/label, graphical bar and detailed text. 2010-10-20 21:39:18 +02:00
Jan Borsodi
76ab7302b1 Fixed crash when entering the birth dialog two or more times. Array should not have been static. 2010-10-10 02:54:45 +02:00
Jan Borsodi
0cc8f84393 Finished handling of Create Class dialog, now a new class is created and set in the mechanics manager. 2010-10-10 02:43:44 +02:00
Jan Borsodi
232164bfb0 Implemented the final dialog for Generate Class which shows the class that was chosen by the game based on the players chosen questions. The class is currently hardcoded to Acrobat. 2010-10-10 01:52:08 +02:00
Jan Borsodi
b364d47b0b Implemented the Class Choice dialog which allows the player to choose between three ways to define a class. 
Added a generic infobox dialog which displays some text and a set of buttons (vertical only for now), this is used for the Class Choice dialogs and the dialogs which shows various questions the player must choose from. The questions are currently hardcoded.
Added more gui states to handle the extra class dialogs (Generate, Pick or Create).
 2010-10-10 01:50:19 +02:00
Jan Borsodi
3af1c66f8d Switched to correct GMST values in the Create Class dialog. 2010-09-28 12:06:42 +02:00
Jan Borsodi
8acf04fc08 Added dialog for editing description in custom class dialog. 2010-09-27 12:56:48 +02:00
Jan Borsodi
ee101440a2 Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations. 2010-09-24 15:28:14 +02:00
Jan Borsodi
d97dad7a86 Initial work on the Class Create dialog. 2010-09-22 20:59:13 +02:00
Jan Borsodi
404aacae1b Call setPlayerClass when the class has been chosen. 2010-09-21 15:44:48 +02:00
Jan Borsodi
cd3e976b7c Added birthsign dialog and spell effect widget. 2010-09-21 12:34:47 +02:00
Jan Borsodi
3e611b5d4c Added widget for spells, updated race dialog to use that. 2010-09-20 13:36:55 +02:00
Jan Borsodi
cd8b88dea1 Introduced custom widgets (skill and attribute) which should make it easier to make new windows. Changed race and class dialog to use the new skill and attribute widgets. 2010-09-20 13:17:02 +02:00
Jan Borsodi
eec34e9f0e Added dialog for picking class from a list. 2010-09-19 04:29:22 +02:00
Jan Borsodi
07b1b21b29 Fixed incorrect comparison with current race, should use the ID not the name. 2010-09-19 04:28:12 +02:00
Jan Borsodi
7bfae798e8 Changed indentation of stats window class from 2 spaces and to 4 spaces. 2010-09-18 21:36:16 +02:00
Jan Borsodi
4f296896e1 Moved code for the stats window from the header file and to the cpp file. 2010-09-18 21:34:49 +02:00
Jan Borsodi
001fc0c6e8 The content of the skill list in the stat window is now scrollable with a vertical scroller. 2010-09-18 21:24:05 +02:00
Jan Borsodi
573917f3e1 Removed the need to configure the misc skills, they are now automatically set to any skills not part of the major/minor group. 2010-09-18 19:26:45 +02:00
Jan Borsodi
9a0aea1718 Changed name of function use to set birth sign in stats window. 2010-09-18 18:44:20 +02:00
Jan Borsodi
ccdff570ad Factions now has a rank value in the stats window. 2010-09-18 18:31:13 +02:00
Jan Borsodi
6f1a41c1bd The skill values are now stored in the stats window instead of fetching the current player stats. Values can be set with setValue(). 2010-09-18 18:31:13 +02:00
Jan Borsodi
41ef0bc08f Added possibility to configure stat page to show factions, birth sign as well as reputation and bounty. 2010-09-18 02:24:42 +02:00
Jan Borsodi
9683a7094d Added faction, birth sign, reputation and bounty to stat screen. All values are currently hardcoded. 2010-09-18 01:53:54 +02:00
Jan Borsodi
46e828dbd9 Split code for generating skill list into reusable methods, this makes it easier to add other items to the list. 2010-09-18 01:44:40 +02:00
Jan Borsodi
0868e76ffb Added display of skills in stat window, the skills are configured with MWGui::WindowManager::configureSkills(). 2010-09-18 01:30:23 +02:00
Marc Zinnschlag
bd983717de fixed compile problem (gcc related?) 2010-09-15 22:22:27 +02:00
Marc Zinnschlag
8de9619579 Merge commit 'amos/gui-windows' into newchar 2010-09-15 22:20:00 +02:00
Jan Borsodi
ff6315a8a6 Improved parameter name for size sent to text input dialog. 2010-09-15 21:48:55 +02:00
Jan Borsodi
3cf8472ddc Centre race dialog on screen. 2010-09-15 21:48:10 +02:00
Jan Borsodi
31a728bf07 Made sure name and race dialog is properly reset when opening again. 2010-09-15 21:36:32 +02:00
Jan Borsodi
1d69689f77 Uppercase OK. 2010-09-15 19:55:09 +02:00
Jan Borsodi
dbc3a43f13 Adjusting y coord of ok button is wrong, should be width. 2010-09-15 19:50:11 +02:00
Jan Borsodi
8770e4bc92 Made sure text edit widget gets focus when dialog is reopened. 2010-09-15 19:48:37 +02:00
Jan Borsodi
84acab03ec Avoid delegates being called repeatedly when pressing enter in name dialog. 2010-09-15 19:44:53 +02:00
Jan Borsodi
07dd5e5631 Race and name dialog are now kept in memory after ok/next is clicked, this avoids a crash where MyGUI would call into the dialog widgets after being destroyed. 2010-09-15 19:37:06 +02:00
Jan Borsodi
5802930500 Text edit field now gets focus when the dialog is shown. 2010-09-15 16:12:36 +02:00
Marc Zinnschlag
2527fe92a7 implemented creature/NPC level 2010-09-15 15:32:35 +02:00
Marc Zinnschlag
de04ae0900 class name wasn't displayed correctly 2010-09-15 15:12:42 +02:00
Jan Borsodi
1907aeb6c6 The game mode is now properly restored once a dialog is finished. Previously the game mode was only set in the window manager but it has to go through the input manager firs to get correct input state. Also updated the gui script commands to also use the input manager and not the window manager. 
At some point the gui mode code should be moved to a class that handles all game mode (engine?).
 2010-09-15 14:48:19 +02:00
Marc Zinnschlag
fff4bc29f4 store results of character creation and update GUI 2010-09-15 14:33:02 +02:00
Jan Borsodi
30e0d713ed Changed list of skill names to contain the ID of the names instead, the actual names are then fetched from GMST. 2010-09-15 13:44:24 +02:00
Jan Borsodi
869bc4d084 Silence the compiler. 2010-09-15 13:16:54 +02:00
Jan Borsodi
b037780a7d Disable the invenory window for now, it's not complete and gives compiler warnings. 2010-09-15 13:15:58 +02:00
Jan Borsodi
3f1b90e732 When a dialog is done and no new is to be shown we return to Game mode. 2010-09-15 13:10:47 +02:00
Jan Borsodi
850b8eb6a7 Race dialog uses the ID of the race object instead of the name when referencing it. 2010-09-15 13:04:57 +02:00
Jan Borsodi
0dafd30dfc The race dialog now fetches strings from GMST. 2010-09-15 12:56:44 +02:00
Jan Borsodi
a676763aa6 Dialog now goes to next dialog if the "next" button is shown, this follows Morrowind's behavior. 2010-09-15 12:44:43 +02:00