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

318 commits

Author SHA1 Message Date
Marc Zinnschlag
125319c441 splitting off console output from messageBox channel 2011-04-26 21:48:13 +02:00
Jason Hooks
2ac1cc8aee Trying to animate creatures 2011-04-13 20:16:46 -04:00
Jason Hooks
d035441876 Reintroducing animation 2011-04-11 20:56:06 -04:00
Nikolay Kasyanov
79911b16d0 Fixed enum formatting in components/esm headers 2011-04-08 22:26:27 +04:00
Marc Zinnschlag
7c506301b7 Merge remote branch 'corristo/header-refactoring' into header-refactoring 
Conflicts:
	CMakeLists.txt
 2011-04-08 19:24:21 +02:00
Nikolay Kasyanov
1e5768170f Refactored remaining headers in components/esm except defs.hpp. 
Removed obsolete *.cpp files.
 2011-04-08 17:58:21 +04:00
Nikolay Kasyanov
a2c42ab5a2 components/esm header refactoring in progress. Refactored: 
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
 2011-04-06 20:11:08 +04:00
Jan-Peter Nilsson
a94de76801 Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 2011-04-03 13:20:42 +02:00
Pieter van der Kloet
833a61dd82 Fixed Boost errors with 1.46 caused by the deprecated name file_string() 2011-03-28 17:36:05 +02:00
Marc Zinnschlag
c571148bef Merge branch 'collision' 2011-03-23 22:57:56 +01:00
gugus
3ad2b9986e fix actors not beeing deleted. Need the latest OEngine. 2011-03-23 19:16:51 +01:00
Marc Zinnschlag
d7226fc9c2 Merge branch 'tab_completion' 2011-03-23 17:08:52 +01:00
gugus
b2194398a4 fixed a bug in loading. Every collision mesh is correctly loaded now. 2011-03-23 13:42:28 +01:00
gugus
9d4cda6510 OEngine doesn't rely on OpenMW anymore 2011-03-18 13:22:09 +01:00
gugus
0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
 2011-03-15 13:36:25 +01:00
Jan-Peter Nilsson
229a91a625 Remove unused code/dependencies 2011-03-12 13:20:28 +01:00
Nikolay Kasyanov
3552ad045d Removed obsolete macBundlePath function from fileops.cpp. Using Ogre::macBundlePath 2011-03-09 21:54:01 +03:00
Marc Zinnschlag
ecfe57caf2 platform check fix 2011-03-09 18:50:24 +01:00
Nikolay Kasyanov
3d75eea377 Merge remote-tracking branch 'upstream/master' 2011-03-08 19:03:20 +03:00
Jan-Peter Nilsson
4dd76ff36e Remove no longer needed local .gitignore 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
f65f210149 An unsigned integer can not be smaller than 0 so there's no point in checking 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
d68141d203 Remove unused variables 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
9ee83caaa2 Avoid crash when no bones are available 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
696861349e Rename skel to mSkel 2011-03-07 19:13:24 +01:00
Nikolay Kasyanov
4028600768 Builds on OS X now 2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
26b780d1ac Remove unused variables and fix signed/unsigned comparison to make the compiler happy 2011-02-27 00:48:49 +01:00
Marc Zinnschlag
1e9dc4b435 de-Windownizing and some build-fixes 2011-02-26 16:37:47 +01:00
gugus
86ded891d9 modified the nif loader for shapes used for raycasting only. 2011-02-22 20:53:58 +01:00
gugus
d3c1640723 add physic support 2011-02-22 14:11:53 +01:00
gugus
1dc452ec91 Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions 2011-02-11 13:33:45 +01:00
Marc Zinnschlag
6a14ea8ec3 handle physics during player changing cells 2011-01-29 16:57:33 +01:00
gugus
a8ade56c80 Add a bullet Shape Loader 2011-01-13 17:51:50 +01:00
Marc Zinnschlag
d865c3cfc6 backend for tab completion: identifiers 2011-01-12 18:48:37 +01:00
Marc Zinnschlag
6848115c18 backend for tab completion: keywords 2011-01-12 18:24:00 +01:00
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
Yuri Krupenin
b791a8f6be Merge remote branch 'zini/master' 2011-01-08 16:24:26 +03:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Yuri Krupenin
6b6ee5440e Minimal set of fixes to build with MinGW. 2011-01-03 17:00:53 +03:00
Jason Hooks
11406ae6f3 cleanupandupdate 2011-01-01 11:45:11 -05:00
Marc Zinnschlag
5336b90149 music player and NPC rendering branch 2010-12-30 14:50:35 +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
13d8ea09b0 Cell case insensitivity, exterior and interior cells 2010-10-27 23:22:01 -04:00
Jason Hooks
ffaaad188a using theirs 2010-10-27 12:32:50 -04:00
Marc Zinnschlag
38ab9f7a3d Merge branch 'newchar' 
Conflicts:
	components/esm_store/store.hpp
 2010-10-22 10:27:32 +02:00
Marc Zinnschlag
cc86fe54d5 Merge remote branch 'amos/gui-windows' into newchar 2010-10-22 10:12:39 +02:00
Nicolay Korslund
30f2d4fdd4 Added LAND and LTEX to esm_store 2010-10-03 12:41:35 +02:00
Marc Zinnschlag
770276281b changed numeric char type defs from char to signed char 2010-09-30 13:56:22 +02:00
Nicolay Korslund
d36fa3deda Merge branch 'master' of http://github.com/zinnschlag/openmw 2010-09-27 18:00:25 +02:00
Nicolay Korslund
255b0d03a9 Started early work on terrain code (no rendering yet.) 2010-09-27 17:59:47 +02:00
Marc Zinnschlag
c16f79afc6 fixed a bug in esm loader, that made all doors and chests locked by default 2010-09-27 17:11:16 +02:00
Marc Zinnschlag
e39caef261 second set of additional doxygen comments 2010-09-25 20:15:05 +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
cd3e976b7c Added birthsign dialog and spell effect widget. 2010-09-21 12:34:47 +02:00
Jan Borsodi
eec34e9f0e Added dialog for picking class from a list. 2010-09-19 04:29:22 +02:00
Jan Borsodi
54996684aa Merge branch 'master' into gui-windows 2010-09-19 02:04:36 +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
Nicolay Korslund
3e170002e2 Merge remote branch 'zinnschlag/cell' 2010-09-16 10:25:11 +02:00
Nicolay Korslund
71e5a15298 Minor improvement to to_utf8 2010-09-16 10:24:45 +02:00
Jan Borsodi
30e0d713ed Changed list of skill names to contain the ID of the names instead, the actual names are then fetched from GMST. 2010-09-15 13:44:24 +02:00
Jan Borsodi
edb2df7d27 Merge remote branch 'zini/newchar' into gui-windows 2010-09-14 23:27:43 +02:00
Jan Borsodi
415426c30b Convert tabs to spaces. 2010-09-14 23:26:32 +02:00
Jan Borsodi
1c79a62957 Added a static list of skill names to ESM::Skill. 2010-09-14 23:26:29 +02:00
Marc Zinnschlag
9a2f128f58 improved record searching 2010-09-12 09:44:12 +02:00
Marc Zinnschlag
0414d7f862 load skill and magic effect records 2010-09-12 09:34:45 +02:00
Nicolay Korslund
6a12ce313e Fixed uninit var in loadland.hpp 2010-09-11 15:52:20 +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
5f84b680af implemented exterior coc 2010-09-11 11:55:28 +02:00
Nicolay Korslund
0eae9d1504 Removed -Werror again 2010-09-10 19:34:38 +02:00
Nicolay Korslund
91e8590288 Merge branch 'master' of http://github.com/zinnschlag/openmw 2010-09-10 12:07:15 +02:00
Nicolay Korslund
f55362cbdc Some Windows-help to cmake/FindAudiere.cmake + non-important changes. 2010-09-10 10:45:16 +02:00
Marc Zinnschlag
058f2d0cce fixed a problem with previous merge 2010-09-08 15:42:49 +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
5552c44753 Cleaned up strnlen in esm_reader. Added -Werror switch to g++. 2010-09-07 10:40:00 +02:00
Nicolay Korslund
e30306f7c3 Removed redundant custom exception class 2010-09-02 22:30:39 +02:00
Nicolay Korslund
c5d3a40fde Fixed ESM bug (quest records). 2010-09-02 14:57:26 +02:00
Nicolay Korslund
d32563063b Alternative fix to mesh crash bug 2010-09-02 14:12:48 +02:00
Marc Zinnschlag
044bf0ab48 fixed parsing explicit references in the body of control structures 2010-08-30 14:44:23 +02:00
Marc Zinnschlag
15878b12fd Merge branch 'master' into exterior 2010-08-22 21:12:16 +02:00
Marc Zinnschlag
c18e83d7c0 extended scripting extensions to code segment 3 (instructions and functions with optional arguments) 2010-08-22 14:00:30 +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
f4e79a48f0 implemented optional arguments 2010-08-22 12:47:56 +02:00
Marc Zinnschlag
276a9db6f7 added missing button implementation for MessageBox 2010-08-22 11:14:14 +02:00
Marc Zinnschlag
72cc0a3983 fixed typo in documentation 2010-08-22 09:17:05 +02:00
Marc Zinnschlag
9a7c72cdbe Merge commit 'ape/master' 2010-08-21 20:23:40 +02:00
Armin Preiml
27166b4ee4 added bone assignment, skeleton is disabled for meshes 
Skeleton isn't assigned to the meshes for now, because it crashes on some.
 2010-08-21 19:40:08 +02:00
Nicolay Korslund
2ad9850070 Added .wav -> .mp3 sound file lookup 2010-08-20 14:20:05 +02:00
Marc Zinnschlag
6583b66e82 added load function for exteriors to cell sstore 2010-08-20 13:06:01 +02:00
Nicolay Korslund
3127602c57 Added file_finder component. Used by sound system. 2010-08-20 12:56:46 +02:00
Marc Zinnschlag
d52e2f68cd added searchExt function to cell RecList 2010-08-20 12:52:51 +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
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
Armin Preiml
47a28fe02b If nif has a skeleton vertices are placed on the right position. 2010-08-17 19:02:22 +02:00
Armin Preiml
6a936100a7 Merge remote branch 'upstream/master' 2010-08-16 20:11:38 +02:00
Armin Preiml
d8f8bd12d3 Disabled loading skins.nif. NifLoader builds now a skeleton (if available) 2010-08-16 19:31:59 +02:00
Nicolay Korslund
5d4dba981f Fixed mistake in NPC record struct 2010-08-13 15:51:42 +02:00
Marc Zinnschlag
0d4f2ab3ef disabled escape sequences in script strings (doesn't work with Windows paths) 2010-08-12 19:41:40 +02:00
Armin Preiml
181b538e4a restructured ogre nif code (struct -> class with singleton), formated code 2010-08-08 17:20:55 +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
Armin Preiml
305563e595 disabled char encoding method for windows, although you'll need to add the iconv libs 2010-08-08 10:07:02 +02:00
Marc Zinnschlag
7611572065 cleanup 2010-08-06 15:25:54 +02:00
Marc Zinnschlag
6b1b3b20fd store info records in dialogue records 2010-08-06 15:23:13 +02:00
Marc Zinnschlag
d47de55ce9 read info records 2010-08-06 15:19:39 +02:00
Marc Zinnschlag
69ea00455f Merge branch 'poly' 
Conflicts:
	apps/openmw/mwworld/world.cpp
 2010-08-03 21:43:05 +02:00
Marc Zinnschlag
f50ced4616 added missing record classes 2010-08-03 15:24:44 +02:00
Armin Preiml
986325b3b2 Changed decoding code page from ISO-8859-1 to WINDOWS-1252 2010-08-02 13:22:50 +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
80000866fe split reclists find function into find and search functions (search can be used to check if an object does not exist, while find would see this as an error situation and would throw an exception) 2010-07-26 11:40:03 +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
Nicolay Korslund
ff64c1fbf0 Merge branch 'master' of http://github.com/zinnschlag/openmw 2010-07-21 16:20:38 +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
01edd8deb5 compiler exception class fixes 2010-07-21 10:57:21 +02:00
Nicolay Korslund
c61212202b Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. 2010-07-20 20:23:37 +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
13d3f9c87e Integrated OpenEngine, replaces entire components/engine/ directory. 2010-07-16 14:56:14 +02:00
Marc Zinnschlag
c9a6335918 replaced flat Type_Data stack with a union 2010-07-14 15:28:55 +02:00
Marc Zinnschlag
0f742ce7f9 even better error checking for extensions with explicit references 2010-07-10 12:31:00 +02:00
Marc Zinnschlag
211b723137 better error checking for extensions with explicit references 2010-07-10 12:16:45 +02:00
Marc Zinnschlag
d8c99c6ce3 Merge commit 'upstream/master' 2010-07-09 22:01:35 +02:00
Marc Zinnschlag
71c710f9f6 enhanced compiler extenion system to support new instructions and functions with explicit references 2010-07-09 22:01:24 +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
ce74ee8618 removed an outdated log message 2010-07-09 18:27:31 +02:00
Marc Zinnschlag
5a1dd4fedd fixed fileparser bug (empty line before the initial begin statement were not handled correctly 2010-07-09 18:21:16 +02:00
Marc Zinnschlag
592fa84e2d added Enable, Disable, GetDisabled 2010-07-09 16:07:03 +02:00
Nicolay Korslund
9c839e220e Moved GUI stuff into components 2010-07-08 22:34:35 +02:00
Nicolay Korslund
3896fd218a Added stand-alone GUI test, compiles and runs 2010-07-08 11:53:59 +02:00
Marc Zinnschlag
6b3ff8a516 constness fixes 2010-07-07 20:14:50 +02:00
Nicolay Korslund
505a972faa changed assert to a softer warning message in cell_store.hpp 2010-07-07 17:39:23 +02:00
Nicolay Korslund
b97def39b3 Minor fixes to Mac stuff 2010-07-07 10:07:15 +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
athile
57de436db4 Command server Linux fix for open client connections. 2010-07-06 10:21:18 -07:00
athile
22c1314738 Potential fix for inability to cancel Boost.Asio blocking accept on Linux 2010-07-06 10:03:49 -07:00
Marc Zinnschlag
9d73718ec1 added GetSecondsPassed 2010-07-06 12:06:50 +02:00
Marc Zinnschlag
eff931b464 fixed broken getdistance function 2010-07-05 14:59:22 +02:00
Marc Zinnschlag
85cd744f44 fixed a stringparser bug 2010-07-05 13:33:17 +02:00
Marc Zinnschlag
b28a6fd7b8 modified parser to skip over button arguments in an messagebox instruction 2010-07-05 13:21:08 +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