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

19684 commits

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