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

282 commits

Author SHA1 Message Date
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