1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 20:15:32 +00:00
Commit graph

510 commits

Author SHA1 Message Date
Star-Demon
3ab4a4487f Sneak State, Bound Sneak and AutoMove, began outlining AutoMove 2011-01-12 12:19:33 -05:00
Star-Demon
d4dccc0b54 Merge remote branch 'zinnschlag/master' 2011-01-12 12:19:25 -05:00
Jan-Peter Nilsson
851385d989 Allow override of OpenMW user configuration path with OPENMW_HOME environment variable 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
8cb8481b37 Use a local plugins.cfg if available (allow us to run without installing) 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
4221824681 Build debian package using cpack if dpkg is available
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
0b1f18cc12 plugins.cfg is global config 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
429775d485 Store configuration in /etc/openmw/ and ~/.openmw/ on linux
Requires new openengine version.
2011-01-12 18:18:06 +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
27f69d0f5b Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp. 2011-01-10 16:13:32 -07:00
athile
75f77e9659 Add 'm' prefix to member variables in ExteriorCell 2011-01-10 15:26:13 -07: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
Star-Demon
43c33ee85f Merge remote branch 'zinnschlag/master' 2011-01-09 16:43:33 -05:00
Star-Demon
e98eef8cd3 corrected grammar for merge 2011-01-09 16:42:38 -05:00
Marc Zinnschlag
46a8ccc2ff changed collision mode instruction from enable/disable to toggle 2011-01-09 21:07:27 +01: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
Marc Zinnschlag
bb34f6e7fc added Enable/DisableCollision instructions 2011-01-09 20:44:17 +01:00
Marc Zinnschlag
0a832f2d23 Merge branch 'playerpos' into script 2011-01-09 19:22:27 +01:00
Marc Zinnschlag
f01a3d5e35 split Player class into a MWWorld and a MWRender component 2011-01-08 15:11:37 +01:00
Marc Zinnschlag
4f51391003 general player class cleanup 2011-01-06 10:07:01 +01:00
Marc Zinnschlag
4dd8616f87 Merge remote branch 'pvdk/master'
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwsound/soundmanager.cpp
2011-01-06 09:45:14 +01:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Jan-Peter Nilsson
ba18dc46ef Don't try to play random tunes when sound is disabled 2011-01-05 02:12:43 +01:00
Jan-Peter Nilsson
d38f2f0a00 See if we have an instance of mData before trying to use it otherwise we get a crash when starting with --nosound 2011-01-05 02:12:13 +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
Star-Demon
fec90122c3 Added enumerated States to inputmanager to handle future standard actions. 2011-01-02 11:55:00 -05:00
Jason Hooks
f3ae1ea737 NPC leg appearance changed 2011-01-01 13:00:58 -05:00
Jason Hooks
ba168b22e9 cleanupandupdate 2011-01-01 11:47:12 -05:00
Jason Hooks
11406ae6f3 cleanupandupdate 2011-01-01 11:45:11 -05:00
Marc Zinnschlag
2ffe1206a6 merged opcode classes that came in explicit and implicit variants 2010-12-31 19:09:25 +01:00
Marc Zinnschlag
67a745cdf6 workaround for NPC activation crash 2010-12-31 15:50:54 +01:00
Marc Zinnschlag
2628b5143c Merge remote branch 'jpn/dialouge' 2010-12-30 15:11:17 +01:00
Marc Zinnschlag
5336b90149 music player and NPC rendering branch 2010-12-30 14:50:35 +01:00
Marc Zinnschlag
e404d71e4f fixes for class selection merge 2010-12-30 14:27:19 +01:00
Jason Hooks
60601682cd Beast races fixed 2010-12-21 21:45:54 -05:00
Jason Hooks
1896a6a2e8 Preliminary npcs4 2010-12-13 16:01:52 -05:00
Jason Hooks
467988455c Preliminary npcs3 2010-12-12 22:05:47 -05:00
Jason Hooks
dfe20033ea Preliminary npcs2 2010-11-25 18:36:25 -05:00
Jason Hooks
6aaedff86a Preliminary NPCs 2010-11-25 15:44:56 -05:00
Jason Hooks
a9892161af MP3 functions moved to soundmanager 2010-11-11 19:47:26 -05:00
Jason Hooks
be1582a88f Regional Sounds 2010-11-08 18:01:33 -05:00
Jason Hooks
a038c67e5a Preliminary region sound framework2 2010-11-07 12:51:59 -05:00
Jason Hooks
cab2341259 Preliminary region sound framework 2010-11-06 13:11:09 -04: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
54319b0117 Use the input manager to enable the dialog 2010-11-06 01:09:05 +01:00
Jan-Peter Nilsson
700e379d56 Fix some compiler warnings 2010-11-06 01:07:48 +01:00
Jason Hooks
a7c3a29ffd Music Player with directory mp3 lookup 2010-11-01 17:06:13 -04:00
Jason Hooks
74aba13053 Music Player 2010-10-31 12:23:03 -04:00
Jason Hooks
ffaaad188a using theirs 2010-10-27 12:32:50 -04: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
51f26e059a Make sure player is updated after birthsign is set. 2010-10-23 01:28:30 +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
38ab9f7a3d Merge branch 'newchar'
Conflicts:
	components/esm_store/store.hpp
2010-10-22 10:27:32 +02:00
Marc Zinnschlag
493b1ff081 gcc compatibility fix 2010-10-22 10:21:42 +02:00
Marc Zinnschlag
cc86fe54d5 Merge remote branch 'amos/gui-windows' into newchar 2010-10-22 10:12:39 +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