Jan Borsodi
|
cf20233d7e
|
Merge remote branch 'zini/newchar' into gui-windows
|
15 years ago |
Jan Borsodi
|
ccdff570ad
|
Factions now has a rank value in the stats window.
|
15 years ago |
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().
|
15 years ago |
Marc Zinnschlag
|
7cd40fc7e4
|
made engine framelistener more crash-resistant
|
15 years ago |
Jan Borsodi
|
41ef0bc08f
|
Added possibility to configure stat page to show factions, birth sign as well as reputation and bounty.
|
15 years ago |
Jan Borsodi
|
9683a7094d
|
Added faction, birth sign, reputation and bounty to stat screen. All values are currently hardcoded.
|
15 years ago |
Jan Borsodi
|
46e828dbd9
|
Split code for generating skill list into reusable methods, this makes it easier to add other items to the list.
|
15 years ago |
Jan Borsodi
|
0868e76ffb
|
Added display of skills in stat window, the skills are configured with MWGui::WindowManager::configureSkills().
|
15 years ago |
Marc Zinnschlag
|
be8f852663
|
implemented skill value handling during character creation (untested)
|
15 years ago |
Nicolay Korslund
|
3e170002e2
|
Merge remote branch 'zinnschlag/cell'
|
15 years ago |
Marc Zinnschlag
|
bd983717de
|
fixed compile problem (gcc related?)
|
15 years ago |
Marc Zinnschlag
|
8de9619579
|
Merge commit 'amos/gui-windows' into newchar
|
15 years ago |
Jan Borsodi
|
ff6315a8a6
|
Improved parameter name for size sent to text input dialog.
|
15 years ago |
Jan Borsodi
|
3cf8472ddc
|
Centre race dialog on screen.
|
15 years ago |
Jan Borsodi
|
31a728bf07
|
Made sure name and race dialog is properly reset when opening again.
|
15 years ago |
Jan Borsodi
|
1d69689f77
|
Uppercase OK.
|
15 years ago |
Jan Borsodi
|
dbc3a43f13
|
Adjusting y coord of ok button is wrong, should be width.
|
15 years ago |
Jan Borsodi
|
8770e4bc92
|
Made sure text edit widget gets focus when dialog is reopened.
|
15 years ago |
Jan Borsodi
|
84acab03ec
|
Avoid delegates being called repeatedly when pressing enter in name dialog.
|
15 years ago |
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.
|
15 years ago |
Jan Borsodi
|
5802930500
|
Text edit field now gets focus when the dialog is shown.
|
15 years ago |
Marc Zinnschlag
|
2527fe92a7
|
implemented creature/NPC level
|
15 years ago |
Marc Zinnschlag
|
d910baebe6
|
adjust player's attributes according to class boni
|
15 years ago |
Marc Zinnschlag
|
de04ae0900
|
class name wasn't displayed correctly
|
15 years ago |
Marc Zinnschlag
|
243c9712a6
|
set player attributes according to race and gender
|
15 years ago |
Marc Zinnschlag
|
53df82e293
|
fixed race name (was using internal ID as display name)
|
15 years ago |
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?).
|
15 years ago |
Marc Zinnschlag
|
fff4bc29f4
|
store results of character creation and update GUI
|
15 years ago |
Jan Borsodi
|
30e0d713ed
|
Changed list of skill names to contain the ID of the names instead, the actual names are then fetched from GMST.
|
15 years ago |
Marc Zinnschlag
|
5b0cb097cf
|
calculate dynamic stats during character creation
|
15 years ago |
Marc Zinnschlag
|
c0b9424bcf
|
added framework for character creation
|
15 years ago |
Jan Borsodi
|
869bc4d084
|
Silence the compiler.
|
15 years ago |
Jan Borsodi
|
b037780a7d
|
Disable the invenory window for now, it's not complete and gives compiler warnings.
|
15 years ago |
Jan Borsodi
|
3f1b90e732
|
When a dialog is done and no new is to be shown we return to Game mode.
|
15 years ago |
Jan Borsodi
|
850b8eb6a7
|
Race dialog uses the ID of the race object instead of the name when referencing it.
|
15 years ago |
Jan Borsodi
|
0dafd30dfc
|
The race dialog now fetches strings from GMST.
|
15 years ago |
Jan Borsodi
|
a676763aa6
|
Dialog now goes to next dialog if the "next" button is shown, this follows Morrowind's behavior.
|
15 years ago |
Jan Borsodi
|
3cc57a058a
|
The label for the name dialog is now fetched from the GMST store.
|
15 years ago |
Marc Zinnschlag
|
9dffa75a15
|
handle name change during character creation
|
15 years ago |
Jan Borsodi
|
edb2df7d27
|
Merge remote branch 'zini/newchar' into gui-windows
|
15 years ago |
Jan Borsodi
|
e47568ea2e
|
Merge branch 'master' into gui-windows
|
15 years ago |
Jan Borsodi
|
481734ee20
|
Implemented a general text input dialog which can be used to get text input from the player. Used the text input dialog to implement the name dialog for the character creation.
|
15 years ago |
Jan Borsodi
|
85ded0edc3
|
Update description of the race dialog file.
|
15 years ago |
Jan Borsodi
|
cd9bb37f1f
|
Change name of ifdef guard to reflect new filename.
|
15 years ago |
Jan Borsodi
|
18cdb3cccc
|
Removed prefix from mw_layout.hpp.
|
15 years ago |
Jan Borsodi
|
4675402e0b
|
Updated code to use the new name for the race dialog.
|
15 years ago |
Jan Borsodi
|
93608ca892
|
Removed prefix from filename and changed name as only the race dialog will be placed in it.
|
15 years ago |
Jan Borsodi
|
415426c30b
|
Convert tabs to spaces.
|
15 years ago |
Jan Borsodi
|
7c17e27be4
|
Set mode back to GM_Game when mode was not handled.
|
15 years ago |
Jan Borsodi
|
fb0f8d9386
|
Removed race dialog activation from the inventory mode for real this time.
|
15 years ago |
Jan Borsodi
|
ae4d5291b2
|
Change text for ok button to next when showNext is true, also adjust position/sizes.
|
15 years ago |
Jan Borsodi
|
de554dffd2
|
Race dialog is now triggered by setMode(GM_Race) and not part of the inventory mode anymore. Initial implementation of the dialog management of back/ok/next buttons.
|
15 years ago |
Jan Borsodi
|
a59a53882f
|
Added events for ok/back buttons on race dialog, this is now hooked to functions in the window manager. For now they simple hide the window.
|
15 years ago |
Jan Borsodi
|
670174004a
|
Extra check in case of invalid index values.
|
15 years ago |
Jan Borsodi
|
b1451c4349
|
Only show playable races.
|
15 years ago |
Jan Borsodi
|
cb98bd1a79
|
Spellpower list is now fetched from the ESM store.
|
15 years ago |
Jan Borsodi
|
8f6d24bea4
|
Race dialog now gets the list of races and skills from the ESM store.
|
15 years ago |
Nicolay Korslund
|
004541f5cf
|
Tested and applied Chris' sound patch.
|
15 years ago |
Marc Zinnschlag
|
a077e2cb2c
|
changed character creation interface to enforce a Redemption-compatible implementation
|
15 years ago |
Marc Zinnschlag
|
e411c6e833
|
added callback-interface for character creation
|
15 years ago |
Jan Borsodi
|
e88f67bb3c
|
Merged public functions for controlling gender, face and hair with the event function, no need to have both.
|
15 years ago |
Jan Borsodi
|
e60b1f88d2
|
Added unique names for skill/power sub-widgets.
|
15 years ago |
Jan Borsodi
|
4d36cf2b55
|
Changed some variable names to follow Morrowind naming.
|
15 years ago |
Jan Borsodi
|
beee17b36f
|
Implemented race dialog for character creation, it currently only contains hardcoded values.
|
15 years ago |
Jan Borsodi
|
0e1a761167
|
Added initial implementation of inventory window, contains basic layout with hardcoded values.
|
15 years ago |
Marc Zinnschlag
|
814d721e33
|
build external cell names from name of region instead of from internal region id
|
15 years ago |
Marc Zinnschlag
|
db2b238328
|
adjusted coordinates for coc/coe for exteriors (place player in the middle of the cell instead of at the border)
|
15 years ago |
Marc Zinnschlag
|
5f84b680af
|
implemented exterior coc
|
15 years ago |
Marc Zinnschlag
|
7ea6a75a26
|
another merge fix
|
15 years ago |
Marc Zinnschlag
|
1dc805d0d4
|
Merge branch 'master' into exterior
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
15 years ago |
Nicolay Korslund
|
93ef530c93
|
Minor fix on the last commit
|
15 years ago |
athile
|
11022f1520
|
Fix crash at shutdown. updater() is still referenced by OGRE after it is deleted, since the SoundImpl is deleted by ~Engine before mRoot is deleted.
|
15 years ago |
Nicolay Korslund
|
c5d3a40fde
|
Fixed ESM bug (quest records).
|
15 years ago |
Nicolay Korslund
|
d911653846
|
Merge with athile's WIP windows build
|
15 years ago |
Marc Zinnschlag
|
6c4c90ef2d
|
Merge branch 'script'
|
15 years ago |
Marc Zinnschlag
|
147dd57162
|
added Lock and Unlock instructions
|
15 years ago |
athile
|
336fb1636c
|
Windows fixes
|
15 years ago |
Marc Zinnschlag
|
61c4fa0630
|
blocked using of locked doors (keys are not considered yet)
|
15 years ago |
Marc Zinnschlag
|
459dd82896
|
implemented locking/unlocking for doors (can not be invoked by user interaction yet)
|
15 years ago |
athile
|
9e2129c4b3
|
WIP Windows build
|
15 years ago |
athile
|
d955a0efc4
|
WIP Windows build
|
15 years ago |
Marc Zinnschlag
|
a899a290c0
|
modified code to avoid a warning on MSVC
|
15 years ago |
Marc Zinnschlag
|
d4bf916f18
|
fixed uninitialized variable in engine
|
15 years ago |
Marc Zinnschlag
|
07c06acc08
|
implemented loading of 3x3 exterior cell grid
|
15 years ago |
Marc Zinnschlag
|
7bb2041418
|
made rendering more robust (no more crashes, even if Ogre throws an exception)
|
15 years ago |
Marc Zinnschlag
|
bdb5749b57
|
temporarily removed statics from raycast test (makes object activation easier by removing inactive obstacles, that overlap the AABB of the object)
|
15 years ago |
Marc Zinnschlag
|
9e8251e6b4
|
finally got rid of the nasty coordinates bug
|
15 years ago |
Marc Zinnschlag
|
15878b12fd
|
Merge branch 'master' into exterior
|
15 years ago |
Marc Zinnschlag
|
0fce360908
|
more refactoring
|
15 years ago |
Marc Zinnschlag
|
f3bf46f1a9
|
fixed AiTravel and changed GetAiPackageDone to return 0 (returning one would interfere with character creation testing at this point)
|
15 years ago |
Marc Zinnschlag
|
68a788b2c8
|
added instructions for enabling/disabling player controls (they don't do anything yet)
|
15 years ago |
Marc Zinnschlag
|
14cf007a3f
|
added first batch of AI-related instructions and functions (they don't do anything at this point)
|
15 years ago |
Marc Zinnschlag
|
b3cc3073a3
|
changed encoding of segment 3 opcodes (increasing the number of opcodes, while reducing the width of the argument)
|
15 years ago |
Marc Zinnschlag
|
08d2b80434
|
message box fix
|
15 years ago |
Marc Zinnschlag
|
17135a6403
|
routed message box output through window manager
|
15 years ago |
Marc Zinnschlag
|
09a258253c
|
removed custom messageBox implementation for console
|
15 years ago |
Marc Zinnschlag
|
276a9db6f7
|
added missing button implementation for MessageBox
|
15 years ago |
Marc Zinnschlag
|
033c771be8
|
load/unload cells while player is moving around in the exteriors
|
15 years ago |
Marc Zinnschlag
|
0d20719158
|
re-routed player movement through MWWorld::World
|
15 years ago |
Marc Zinnschlag
|
fe3b6230fc
|
refactored cell unloading
|
15 years ago |
Marc Zinnschlag
|
b8fee8f1ee
|
removed stray debugging output
|
15 years ago |
Marc Zinnschlag
|
c6f4bcbf68
|
another coordinate system fix; still not working properly
|
15 years ago |
Marc Zinnschlag
|
1f077a5d5f
|
partial coordinates fix (slightly better results when changing cells, but still not completely correct)
|
15 years ago |
Marc Zinnschlag
|
978c73add5
|
fixed sound removal on cell change
|
15 years ago |
Marc Zinnschlag
|
bdd5e2f064
|
modified teleport action to support exteriors; coordinates are wrong here too
|
15 years ago |
Marc Zinnschlag
|
13409b546f
|
Merge commit 'upstream/master'
|
15 years ago |
Nicolay Korslund
|
2ad9850070
|
Added .wav -> .mp3 sound file lookup
|
15 years ago |
Marc Zinnschlag
|
f98012d143
|
Merge commit 'upstream/master'
|
15 years ago |
Marc Zinnschlag
|
0111631ee9
|
very early implementation of exterior rendering
|
15 years ago |
Nicolay Korslund
|
3127602c57
|
Added file_finder component. Used by sound system.
|
15 years ago |
Marc Zinnschlag
|
de6e8b4cad
|
Merge commit 'upstream/master'
|
15 years ago |
Nicolay Korslund
|
104f3fdd50
|
Added path conversion for say() sounds
|
15 years ago |
Marc Zinnschlag
|
b15c917c01
|
Merge commit 'upstream/master'
|
15 years ago |
Nicolay Korslund
|
064bc4b6c9
|
Finished sound system
|
15 years ago |
Marc Zinnschlag
|
67a067e49c
|
changed name of teleport doors to the name of the destination cell
|
15 years ago |
Marc Zinnschlag
|
6e46ddae33
|
more detailed report of unhandled info record fields
|
15 years ago |
Marc Zinnschlag
|
3b49d6c826
|
added NPC stats
|
15 years ago |
Nicolay Korslund
|
38ad2d98f9
|
Fixed windows issues + one minor optimization on to_utf8
|
15 years ago |
Nicolay Korslund
|
358e1ca5a5
|
Added custom UTF8 converter. Removed iconv dependency.
|
15 years ago |
Nicolay Korslund
|
9a5e7816eb
|
Renabled music. WILL CRASH WITH MPG123 v1.12.1.
|
15 years ago |
Nicolay Korslund
|
65c2070086
|
Temporarily disabled music
|
15 years ago |
Nicolay Korslund
|
9300e60514
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
15 years ago |
Nicolay Korslund
|
31017447eb
|
Added --nosound switch
|
15 years ago |
Marc Zinnschlag
|
4f3f174016
|
fixed a dialogue bug
|
15 years ago |
Nicolay Korslund
|
304692dc8e
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
15 years ago |
Marc Zinnschlag
|
6258654383
|
fixed a very sloppy merge
|
15 years ago |
Marc Zinnschlag
|
2cfe5f0697
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
|
15 years ago |
Marc Zinnschlag
|
e42f1bbc11
|
open dialogue window, if a matching greetings info record is found
|
15 years ago |
Nicolay Korslund
|
6cdb0f1152
|
Enabled music streaming
|
15 years ago |
Nicolay Korslund
|
88f10eb222
|
Merge branch 'sound_system'
|
15 years ago |
Nicolay Korslund
|
f2b2fe560f
|
Mangle update: Implemented streaming, fixed various bugs.
|
15 years ago |
Nicolay Korslund
|
80383fe60e
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
15 years ago |
Marc Zinnschlag
|
05382f206e
|
Merge commit 'upstream/master'
|
15 years ago |
Nicolay Korslund
|
08289158d7
|
Added support for WAV files with libsndfile
|
15 years ago |
Marc Zinnschlag
|
5543c84586
|
bug-fixes: actors were registered twice at cell change; disabled references were rendered at cell change
|
15 years ago |
Nicolay Korslund
|
dbd42386da
|
temporary try/catch around sound loading
|
15 years ago |
Nicolay Korslund
|
9875d74abf
|
Implemented 3D sound placement. Sound management / lookup system not
done yet.
|
15 years ago |
Marc Zinnschlag
|
6f28bd9adf
|
handle sounds when enabling/disabling
|
15 years ago |
Marc Zinnschlag
|
d57c984517
|
added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived
|
15 years ago |
Marc Zinnschlag
|
967f85875d
|
reimplemented class-dependend rendering code in MWClass
|
15 years ago |
Marc Zinnschlag
|
4649d7fa41
|
stop sounds on cell change
|
15 years ago |
Marc Zinnschlag
|
a6858b0cc4
|
Merge branch 'master' into class2
|
15 years ago |
Marc Zinnschlag
|
0a8d0fed40
|
added cell-wide stopSound function
|
15 years ago |
Marc Zinnschlag
|
de2eeb4cde
|
integrated insertObject function into class hierarchy
|
15 years ago |
Marc Zinnschlag
|
1d91ac9d9e
|
sound manager interface enhancement
|
15 years ago |
Nicolay Korslund
|
05b3140740
|
Enabled crosshairs
|
15 years ago |
Nicolay Korslund
|
912c8b1f2d
|
Added mpg123 file reader
|
15 years ago |
Nicolay Korslund
|
cad9712411
|
Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file.
|
15 years ago |
Nicolay Korslund
|
cf4185faef
|
Added sound test (remember to git submodule update)
|
15 years ago |
Marc Zinnschlag
|
b94e09e030
|
fixed a bug that prevented local scripts from running
|
15 years ago |
Nicolay Korslund
|
7516e4ca53
|
Added music playing as a test
|
15 years ago |
Nicolay Korslund
|
8067d62800
|
Decoupled SoundManager from Interpreter::Context
|
15 years ago |
Nicolay Korslund
|
34572f0b19
|
Compiled and linked in sound system (not yet functional)
|
15 years ago |
Marc Zinnschlag
|
19c5ace602
|
added test for actor faction
|
15 years ago |
Marc Zinnschlag
|
594d3cef4f
|
added test for actor class
|
15 years ago |
Marc Zinnschlag
|
11bc131417
|
added test for global variables
|
15 years ago |
Marc Zinnschlag
|
fbe11956a6
|
added dummy test for select type '1' (Function); always yields false for now
|
15 years ago |
Marc Zinnschlag
|
c7fab9aad6
|
added test for actor race
|
15 years ago |
Marc Zinnschlag
|
2acfe22975
|
added test for actor ID
|
15 years ago |
Marc Zinnschlag
|
8086933282
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
15 years ago |
Marc Zinnschlag
|
8d85211fa1
|
modified Npc and Creature class to let them store a copy of their own ID
|
15 years ago |
Marc Zinnschlag
|
8f4359db08
|
added test for select type '3' (Local)
|
15 years ago |
Marc Zinnschlag
|
a25c7bb2c0
|
added test for cell name
|
15 years ago |
Marc Zinnschlag
|
9d25e74a05
|
on dialogue start run through the info records of dialogue record 'hello'; currently no testing done -> the first info recrod will match
|
15 years ago |
Marc Zinnschlag
|
7afc8ffd2e
|
Merge branch 'container'
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
15 years ago |
Marc Zinnschlag
|
2eee3d32f1
|
fixed World::disable function
|
15 years ago |
Marc Zinnschlag
|
a7fe28ecbe
|
implemented take action
|
15 years ago |
Marc Zinnschlag
|
aa637cb9d4
|
added RemoveItem
|
15 years ago |
Marc Zinnschlag
|
db24a55e36
|
added sanity check for AddItem arguments
|
15 years ago |
Marc Zinnschlag
|
589f8b5ede
|
added GetItemCount
|
15 years ago |
Marc Zinnschlag
|
3ea85b4619
|
added AddItem instruction
|
15 years ago |
Marc Zinnschlag
|
0a60bde834
|
added insertIntoContainer function to class hierarchy
|
15 years ago |
Marc Zinnschlag
|
b5d59edd44
|
re-routed talk action from gui to dialogue manager (master branch should not incooperate this change, because the dialogue window implementer will need the original code for testing)
|
15 years ago |
Marc Zinnschlag
|
d42747e85b
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
15 years ago |
Marc Zinnschlag
|
c806415f08
|
changed namespace, class and function names to ensure consistent spelling
|
15 years ago |
Marc Zinnschlag
|
d6541d4f3c
|
changed file names to ensure consistent spelling
|
15 years ago |
Marc Zinnschlag
|
09c42589cc
|
implemented npc/creature activation (enters dialog gui mode for now)
|
15 years ago |
Marc Zinnschlag
|
8045320ac9
|
added dialog manager
|
15 years ago |
Marc Zinnschlag
|
10a63b10b5
|
Merge branch 'master' into container
Conflicts:
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/container.hpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
|
15 years ago |
Marc Zinnschlag
|
8e6a765603
|
fixed a stats bug (reducing modified stats via setModified didn't work correctly
|
15 years ago |
Marc Zinnschlag
|
c883921af3
|
minor cell change fix
|
15 years ago |
Marc Zinnschlag
|
1902dfb7b2
|
added activate instruction
|
15 years ago |
Marc Zinnschlag
|
15124601aa
|
stop local scripts from being run twice in case of activation
|
15 years ago |
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
15 years ago |
Marc Zinnschlag
|
f630157bf8
|
implemented basic object activation
|
15 years ago |
Marc Zinnschlag
|
2d695cc806
|
routed activate signal from input sub-system to engine-class
|
15 years ago |
Marc Zinnschlag
|
87c84e6fcd
|
limited activation range according to GMST settings
|
15 years ago |
Marc Zinnschlag
|
ee7570f7e7
|
added containerstore
|
15 years ago |
Marc Zinnschlag
|
e0a3b1b1db
|
implemented item count
|
15 years ago |
Marc Zinnschlag
|
7ba6bdb56c
|
prepared InterpreterContext for activation implementation
|
15 years ago |
Marc Zinnschlag
|
052d049a6c
|
integrated name-lookup into ape's code; added missing implementation of a function
|
15 years ago |
Marc Zinnschlag
|
5827591d05
|
Merge commit 'ape/master'
Conflicts:
apps/openmw/mwworld/world.hpp
|
15 years ago |
Marc Zinnschlag
|
69ea00455f
|
Merge branch 'poly'
Conflicts:
apps/openmw/mwworld/world.cpp
|
15 years ago |
Armin Preiml
|
adc209d135
|
Implemented the faced handle method to the engine. Faced handles will
be written to stdout every 10th frame.
|
15 years ago |
Armin Preiml
|
c000bfb43d
|
moved object focus code to mwscene
|
15 years ago |
Marc Zinnschlag
|
d1c000313f
|
added getPtr function that works via Ogre handle
|
15 years ago |
Marc Zinnschlag
|
002345270b
|
implemented teleport doors (only for the player for now)
|
15 years ago |
Marc Zinnschlag
|
7e5ddae3b3
|
modified action interface to allow other actors besides the player
|
15 years ago |
Marc Zinnschlag
|
c38b02bd5c
|
added action interface
|
15 years ago |
Marc Zinnschlag
|
239498bcd4
|
added getName function
|
15 years ago |
Armin Preiml
|
b50c7e0788
|
Some experimental implementation of a RaySceneQuery.
|
15 years ago |
Marc Zinnschlag
|
f50ced4616
|
added missing record classes
|
15 years ago |
Marc Zinnschlag
|
0851044fa6
|
removed superfluous includes
|
15 years ago |
Marc Zinnschlag
|
bfc282779b
|
added item health interface
|
15 years ago |
Marc Zinnschlag
|
93754b2851
|
moved some includes around
|
15 years ago |
Marc Zinnschlag
|
33b6a0b800
|
moved concrete record classes to separate sub-system (mwclass)
|
15 years ago |
Marc Zinnschlag
|
9d6e658e05
|
previous commit was missing some files
|
15 years ago |
Marc Zinnschlag
|
ca842d1b4d
|
reimplemented access to creature stats via new class interface
|
15 years ago |
Marc Zinnschlag
|
a70c3876a2
|
added foundation for esm record class hierarchy
|
15 years ago |
Nicolay Korslund
|
69cc88bcaf
|
Merge branch 'master' of http://github.com/apreiml/openmw
|
15 years ago |
Armin Preiml
|
389a28a836
|
Added const reference to esmstore to some methods down to CellRenderImp.
Body part mesh names will be now obtained by the bodypart id.
|
15 years ago |
Armin Preiml
|
fb3bf91dfb
|
Added inserting of NPC meshes. Only heads and bodys and not well placed for now.
|
15 years ago |
Marc Zinnschlag
|
b584215680
|
moved stats label <-> GMST text mapping from mwmechanics to mwgui; added missing stats window labels
|
15 years ago |
Marc Zinnschlag
|
9fafac1ef8
|
removed encoding workaround for attribute names
|
15 years ago |
Marc Zinnschlag
|
00c0a50f7f
|
Merge commit 'ape/master'
|
15 years ago |
Armin Preiml
|
f3ee9ced5c
|
Added cmake file for the iconv library and extended relevant
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
|
15 years ago |
Marc Zinnschlag
|
ebedef49c9
|
removed a special case, that wasn't a special case (MW Scripting for Dummies seems to be wrong here)
|
15 years ago |
Marc Zinnschlag
|
6e3fdc5816
|
added special case implementation for GetHealth (max weapon and armor health)
|
15 years ago |
Marc Zinnschlag
|
913d55a44e
|
added GetHealthGetRatio
|
15 years ago |
Marc Zinnschlag
|
a542ca22fd
|
added ModCurrentHealth, ModCurrentMagicka, ModCurrentFatigue
|
15 years ago |
Marc Zinnschlag
|
3b6b343c9b
|
added GUI update for health, magicka and fatigue
|
15 years ago |
Marc Zinnschlag
|
455bcf3b01
|
added get, set and mod instructions for health, magicka and fatigue
|
15 years ago |
Marc Zinnschlag
|
63f686ffab
|
update attribute values in stats window
|
15 years ago |
Marc Zinnschlag
|
335425bb12
|
added MechanicsManager::update function (doesn't update anything yet)
|
15 years ago |
Marc Zinnschlag
|
1d9df6cf40
|
implemented handling of disabled actors
|
15 years ago |
Marc Zinnschlag
|
3d987f1b7a
|
register actors in active cells with MechanicsManager
|
15 years ago |
Marc Zinnschlag
|
8bbcbc05d5
|
removed duplicate code from World class
|
15 years ago |
Marc Zinnschlag
|
5d40055b44
|
added comparison operators for Ptr class
|
15 years ago |
Marc Zinnschlag
|
77a0215d53
|
added get-, set- and mod-instructions for attributes
|
15 years ago |
Marc Zinnschlag
|
aa4e79c0de
|
fixed a reclist bug induced a couple of commits ago
|
15 years ago |
Marc Zinnschlag
|
e43b475ade
|
changed PlayerPos::getPlayer return type from CellRef to Ptr
|
15 years ago |
Marc Zinnschlag
|
fa50bbc77b
|
added a CellStore pointer to PlayerPos
|
15 years ago |
Marc Zinnschlag
|
04b86f7e1e
|
added first set of character and creature stats (attributes)
|
15 years ago |
Marc Zinnschlag
|
ecd05fd15e
|
fixed an include guard
|
15 years ago |
Marc Zinnschlag
|
61d09c4768
|
read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues)
|
15 years ago |
Nicolay Korslund
|
532ccbd1f8
|
Killed clientconsole, mwcompiler, mwinterpreter and command server
|
15 years ago |
Marc Zinnschlag
|
f693a2942e
|
fixed handling of cell changes during local and global script execution
|
15 years ago |
Marc Zinnschlag
|
0e641f1246
|
implemented coc instruction
|
15 years ago |
Marc Zinnschlag
|
2d8fbc6e55
|
implemented month variable and fixed some day/gamehour bugs
|
15 years ago |
Nicolay Korslund
|
ff64c1fbf0
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
15 years ago |
Marc Zinnschlag
|
77e03f0f31
|
fixed global variable search to properly handle injected variables (DaysPassed)
|
15 years ago |
Marc Zinnschlag
|
e670753497
|
fixed handling of global variables of type short
|
15 years ago |
Marc Zinnschlag
|
74f3eb6ad4
|
stop time while GUI is up
|
15 years ago |
Marc Zinnschlag
|
c8a18b7d70
|
use global variable timescale instead of fixed factor
|
15 years ago |
Nicolay Korslund
|
f87810ce7a
|
Moved esmtool to apps/
|
15 years ago |
Marc Zinnschlag
|
cf7150e585
|
implemented naked expressions in lineparser (used in console; result is send through messagebox interface)
|
15 years ago |
Marc Zinnschlag
|
a87175446c
|
disable windows on startup when --new-game is used
|
15 years ago |
Marc Zinnschlag
|
6e3aacca08
|
CMakeLists fix
|
15 years ago |
Marc Zinnschlag
|
281f2d1136
|
added script interpreter for console
|
15 years ago |
Marc Zinnschlag
|
d72ed19460
|
implemented script compiler for console
|
15 years ago |
Nicolay Korslund
|
5ff9344a87
|
Finished console GUI window
|
15 years ago |
Nicolay Korslund
|
c61212202b
|
Moved mwgui/ back to apps/openmw/. Fixed mouse position bug.
|
15 years ago |
Marc Zinnschlag
|
a9825f92ee
|
moved installOpcodes function from scriptmanager to extensions
|
15 years ago |
Marc Zinnschlag
|
f3b70e05a9
|
added sky-related script functions and instructions
|
15 years ago |
Marc Zinnschlag
|
d27c548710
|
implemented passing of time
|
15 years ago |
Marc Zinnschlag
|
083b11c740
|
moved global variable handling into a separate class
|
15 years ago |
Nicolay Korslund
|
608ddd0a58
|
Splitt inputmanager into hpp/cpp
|
15 years ago |
Nicolay Korslund
|
5472a8c760
|
Killed mygui_dev
|
15 years ago |
Nicolay Korslund
|
c84672a560
|
Added MyGUI to OpenMW, fully working (with events and script hooks)
|
15 years ago |
Nicolay Korslund
|
4d74f85ae0
|
Moved mwgui manager to components, ready for testing
|
15 years ago |
Nicolay Korslund
|
4eb2863db4
|
Added input to apps/mygui_dev/
|
15 years ago |
Nicolay Korslund
|
13d3f9c87e
|
Integrated OpenEngine, replaces entire components/engine/ directory.
|
15 years ago |
Nicolay Korslund
|
186bf8c1a1
|
Merge branch 'master' into oengine
|
15 years ago |
Nicolay Korslund
|
259908013e
|
Started integrating OE (NO-COMPILE)
|
15 years ago |
Marc Zinnschlag
|
c9a6335918
|
replaced flat Type_Data stack with a union
|
15 years ago |
Marc Zinnschlag
|
8134c5b760
|
integrated CellStore pointer into Ptr class
|
15 years ago |
Nicolay Korslund
|
064e3e2e23
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
15 years ago |
Marc Zinnschlag
|
7f48c64efe
|
implemented sound related script instructions and functions with explicit references
|
15 years ago |
Marc Zinnschlag
|
31b4d83fac
|
moved sound extensions from mwsound to mwscript (reduces coupling between openmw components)
|
15 years ago |
Marc Zinnschlag
|
d8c99c6ce3
|
Merge commit 'upstream/master'
|
15 years ago |
Marc Zinnschlag
|
69e607e140
|
implemented getdistance with explicit references
|
15 years ago |
Marc Zinnschlag
|
c37b007be0
|
added verification for explicit references (check if the given ID exists)
|
15 years ago |
Marc Zinnschlag
|
d4ac3b506e
|
implemented enable, disable and getdisabled with explicit references
|
15 years ago |
Marc Zinnschlag
|
592fa84e2d
|
added Enable, Disable, GetDisabled
|
15 years ago |
Nicolay Korslund
|
6966c66091
|
Gave apps/openmw/ its own CMakeLists.txt
|
15 years ago |
Nicolay Korslund
|
9c839e220e
|
Moved GUI stuff into components
|
15 years ago |
Nicolay Korslund
|
b2d54a619e
|
Implemented all MW window layouts
|
15 years ago |
Nicolay Korslund
|
3896fd218a
|
Added stand-alone GUI test, compiles and runs
|
15 years ago |
Nicolay Korslund
|
4f170b14ea
|
Applied clientconsole build fix from GWater
|
15 years ago |
Marc Zinnschlag
|
6b3ff8a516
|
constness fixes
|
15 years ago |
Marc Zinnschlag
|
0efe4742a6
|
added script-gui interface and gui-related script instructions
|
15 years ago |
Marc Zinnschlag
|
2c63d67ceb
|
added gui manager skeleton and a cmake fix
|
15 years ago |
Nicolay Korslund
|
b97def39b3
|
Minor fixes to Mac stuff
|
15 years ago |
Nicolay Korslund
|
97ad6592ea
|
Fixed innocent compiler warning in engine.cpp
|
15 years ago |
Nicolay Korslund
|
2ec96ed7de
|
Merge branch 'master' of http://github.com/ardekantur/openmw
|
15 years ago |
Nicolay Korslund
|
359f2903d7
|
Merged athile and zinnschlag
|
15 years ago |
athile
|
a638c330ec
|
Add one more command server fix so it still works correctly on Windows and reeanble the command server by default.
|
15 years ago |
Marc Zinnschlag
|
9d73718ec1
|
added GetSecondsPassed
|
15 years ago |
Marc Zinnschlag
|
f5a70abd4b
|
added OnActivate
|
15 years ago |
Marc Zinnschlag
|
b2731c5e26
|
fix uninitialised variables
|
15 years ago |
Marc Zinnschlag
|
3df5d377f2
|
added xbox function
|
15 years ago |
Marc Zinnschlag
|
34b824cb70
|
implemented GetDistance function
|
15 years ago |
Marc Zinnschlag
|
cc0c21cf35
|
added function to retrieve a live cell ref via name
|
15 years ago |
athile
|
5fe4313b95
|
Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux.
|
15 years ago |
Ardekantur
|
ee6c933156
|
Merge branch 'master' of git://github.com/korslund/openmw
Conflicts:
CMakeLists.txt
apps/openmw/main.cpp
game/engine.cpp
|
15 years ago |
Marc Zinnschlag
|
a61b2c39f0
|
added scriptrunning/startscript/stopscript; sorted out more case problems
|
15 years ago |
Marc Zinnschlag
|
185f8bd56d
|
added random function; global variable fix
|
15 years ago |
Marc Zinnschlag
|
df8f8a315c
|
added missing part of global variable implementation (storage and interpreter context)
|
15 years ago |
Marc Zinnschlag
|
d57e67e722
|
added global variable handling to compiler context (not working yet because of case problems)
|
15 years ago |
Marc Zinnschlag
|
f9c1548f80
|
added menumode script function; added global variable handling in compiler and interpreter (openmw context still ignores global variables)
|
15 years ago |
Marc Zinnschlag
|
cdcc244fc5
|
automatically start start scripts at startup
|
15 years ago |
Marc Zinnschlag
|
4482884eb5
|
implemented global script execution
|
15 years ago |
Marc Zinnschlag
|
530caac39b
|
merged CompilerScriptContext into base class
|
15 years ago |
Marc Zinnschlag
|
5174679864
|
another bug-fix and missing documentation added
|
15 years ago |
Marc Zinnschlag
|
5d46fc869c
|
added missing sound script functionality; various script-related bug-fixes
|
15 years ago |
Marc Zinnschlag
|
eeeb9b09f8
|
identify LiveCellRefs by ptr instead of render handle
|
15 years ago |
Marc Zinnschlag
|
3fae68b403
|
added unifying LiveCellRef pointer class
|
15 years ago |
Marc Zinnschlag
|
d51e6fb7c4
|
second part of refactoring
|
15 years ago |
Marc Zinnschlag
|
f8cb4c2502
|
moved sound manager from world to engine (first step of another round of refactoring)
|
15 years ago |
Marc Zinnschlag
|
c12752df4d
|
added sound manager skeleton and sound script functions
|
15 years ago |
Marc Zinnschlag
|
f0c492ae22
|
added CellChanged script function
|
15 years ago |
Marc Zinnschlag
|
474b412b47
|
implemented local script execution
|
15 years ago |
Marc Zinnschlag
|
8e2732c60e
|
local scripts are now run every frame (running scripts itself is not implemented yet)
|
15 years ago |
Marc Zinnschlag
|
076b01559f
|
added local script compiling
|
15 years ago |
Marc Zinnschlag
|
2064c43d89
|
added script manager (doesn't do anything yet); local scriptes for active cells are passed on to the script manager
|
15 years ago |
Marc Zinnschlag
|
a06b84ac86
|
added local variables to ref data
|
15 years ago |
Marc Zinnschlag
|
5c91ba74b8
|
store ogre handle in ref data
|
15 years ago |
Marc Zinnschlag
|
def0a773bd
|
replaced void * entry in cell store with a generic type
|
15 years ago |
Marc Zinnschlag
|
c7f76f51fb
|
added --debug option and finally cleaned up the merge mess
|
15 years ago |
Marc Zinnschlag
|
417df63302
|
partial fix for merge problems
|
15 years ago |
Nicolay Korslund
|
4a3f6b0ff1
|
Various fixes to get openmw to compile and run properly
|
15 years ago |
Nicolay Korslund
|
0de4bb9d6c
|
Merged athile's work
|
15 years ago |
Marc Zinnschlag
|
f8a1a0ab8c
|
improved cell handling; added world.* files (should have been added a few commits ago)
|
15 years ago |
Marc Zinnschlag
|
ea6d342a24
|
split CellRender into CellRender and CellRenderImp
|
15 years ago |
athile
|
450542b4b9
|
Fix Windows line feeds and chdmod
|
15 years ago |
Marc Zinnschlag
|
ce37666dbc
|
factored world class out of main engine class
|
15 years ago |
athile
|
9b2fa58b88
|
Add separate CMakeLists.txt files for mwcompiler and mwinterpreter
|
15 years ago |
athile
|
7cc27d9b66
|
Add command output string and client/server response.
|
15 years ago |
athile
|
056194baa2
|
Merge upstream
|
15 years ago |
athile
|
7357ea2102
|
Add simple external console server/client
|
15 years ago |
Marc Zinnschlag
|
1ad9b234f0
|
Merge branch 'mwscript'
Conflicts:
CMakeLists.txt
|
15 years ago |
athile
|
de7087caf4
|
Move prepareMaster logic into addMaster. Having these separate only introduces the possibility for a bug.
|
15 years ago |
Marc Zinnschlag
|
fac8fb8fcb
|
added return and messagebox statements (messagebox does neither formating nor buttons yet)
|
15 years ago |
Marc Zinnschlag
|
c6a37b2e18
|
added first batch of opcodes
|
15 years ago |
athile
|
59a2e8dcf7
|
Merge upstream
|
15 years ago |
Marc Zinnschlag
|
770eb14d95
|
added context for standalone interpreter
|
15 years ago |
Marc Zinnschlag
|
487a70388f
|
added interpreter framework
|
15 years ago |
Marc Zinnschlag
|
ba847ae9d8
|
write local variable declarations into a separate file
|
15 years ago |
Marc Zinnschlag
|
a3ad61b4d0
|
write code file after successfull parsing
|
15 years ago |
Marc Zinnschlag
|
bff0855af0
|
added parsing for local variable declarations
|
15 years ago |
athile
|
819c146ad1
|
Project clean-up: move 'misc' into the platform lib, update CMake to build 'platform' as a lib, and various fixes for Visual Studio compiler warnings
|
15 years ago |
athile
|
82bbc69453
|
Only push the far clip plane out if the sky is enabled
|
15 years ago |
athile
|
7db274f1c5
|
Sky rendering clean-up and correct resource configuration
|
15 years ago |
Marc Zinnschlag
|
de8a651df4
|
improved error handling
|
15 years ago |
Marc Zinnschlag
|
a068ca78d7
|
replaced dummy parser with top level file parser
|
15 years ago |
Marc Zinnschlag
|
d02257ca88
|
read file to be compiled from command line arguments
|
15 years ago |
athile
|
d67f0c74b0
|
Merge remote branch 'upstream/master'
|
15 years ago |
Marc Zinnschlag
|
ddcbc8cd62
|
added tokenizing of MW scripts
|
15 years ago |
Marc Zinnschlag
|
31e22186ef
|
added mwscript compiler standalone-executable (doesn't do anything yet)
|
15 years ago |
Marc Zinnschlag
|
e4f85cb3e6
|
directory structure reorganisation (still missing the mangle stuff)
|
15 years ago |