Commit graph

59 commits

Author SHA1 Message Date
unknown
720d92fd0d Synch with rpgxEF Edition (Updated Makefiles)
- Added warning level var $WL
- Added missing linking against pthread on linux
2012-07-06 15:48:30 +02:00
Harry Young
c2cca2738c since this one isn't supposed for rpgxef i turnde the xtra-defines 0
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-06-05 23:13:36 +02:00
Walter Julius Hennecke
0e5dac2239 Updated Makefiles 2012-05-05 16:57:18 +02:00
Walter Julius Hennecke
d55b82fdc3 Revert of changes made by mistake 2012-05-05 16:53:56 +02:00
Walter Julius Hennecke
8bd25cb50b Makefile update and removed expat
- Updated all Makefiles
- Removed expat (might be replaced by libxml2)
2012-05-05 16:34:57 +02:00
Walter Julius Hennecke
c8f750721c Updated README.txt 2012-05-05 14:13:02 +02:00
Walter Julius Hennecke
0acb013a7a Renamed weapons in weapon_t ...
... to more common names WP_0 to WP_15.
2012-03-16 13:05:41 +01:00
Walter Julius Hennecke
5732476c65 Forgot to comit those changes
They are for the new rpgxEF version
2012-01-24 09:26:54 +01:00
Walter Julius Hennecke
03e1822a02 Added SVF_NOCLIENT to some entities
Most of them game logic entities such as target_boolean or target_warp.
2012-01-20 20:53:31 +01:00
Harry Young
614cb686bc fx_plasma
This should do bit it doesn't, lol

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-27 14:50:34 +01:00
Harry Young
19dc95e05d fx_borg_bolt
*basically finished it, but I need the current origin of my targets, not the original. Don't know how to get that.
*added a new folder 'testingstuff' for anything we generate for testing various things and put the folder 'maps in there'
*also in there is a test-version of borg2 with a hardcoded fx_borg_bolt at the binary lift (somehow lua will class it as noclass...)
*minor mod to game-makefile that prevented me from compiling

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-17 15:50:02 +01:00
Walter Julius Hennecke
0fef2e2732 Modified makefiles
Use SQL=1 do build with sql support.
Use DEBUG=1 do build with debugging symbols.
Example: make SQL=1 DEBUG=1 will build with sql support and debugging symbols.
2011-12-16 00:51:16 +01:00
Walter Julius Hennecke
3c3dcc5795 func_stasis_door
Had to split up opening phase and closing phase so events get send to client correctly.
2011-12-14 13:27:16 +01:00
Walter Julius Hennecke
1236ad50b4 func_stasis_door
Worked on func_stasis_door ... as it is now it'll crash the game :P
2011-12-13 13:05:06 +01:00
Harry Young
ac334633df Manual revert to make sure things are level here.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-12 21:52:43 +01:00
Walter Julius Hennecke
d3685e16d2 Critical and minor bugfixes
- Fixed critical error in G_ParseField
- Made other minor bugfix

BIG ISSUES: RPG-X is now crashing to desktop without error when loading maps.
I have no clue whats the problem ...
2011-12-12 18:30:56 +01:00
Harry Young
5721a7820a Readded cooking_steam and added toggle-functionality to fire, particlefire and electricfire
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-12 13:27:05 +01:00
Harry Young
de20d8ba89 *Reintegrated the schimmery thing and prepped for some other fx.
--There's a warning (other that '/*') in cgame that I dont know how to resolve
*added floder maps for mapping resources
-- first in is a map for testing all the fx in all their functionality (fxtest)
2011-12-12 00:36:04 +01:00
Walter Julius Hennecke
db4eedafe1 Did some more work on func_stasis_door 2011-12-10 00:42:24 +01:00
Walter Julius Hennecke
046c6a4e8e Critical bugfixes ...
- Fixed errors preventing any map from beeing loaded
- Fix for func_stasis_door ... so they don't crash the game anymore when loading maps containing them.
2011-12-08 19:30:38 +01:00
Walter Julius Hennecke
c9624b4ff5 Added more functions to lua_refent 2011-12-08 13:51:43 +01:00
Walter Julius Hennecke
8441147b55 . 2011-12-07 12:56:34 +01:00
Walter Julius Hennecke
613bc7a1c3 . 2011-12-07 12:50:10 +01:00
Walter Julius Hennecke
25e0ba4d64 Added lua library for refentities (not finished yet) 2011-12-07 12:47:40 +01:00
Walter Julius Hennecke
e47dd4b792 . 2011-12-07 12:10:26 +01:00
Harry Young
3fd27395e8 Defined FX_AddLine3 and other minor things
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-07 00:12:33 +01:00
Walter Julius Hennecke
268f6dcc74 Some cgame lua things 2011-12-06 14:15:21 +01:00
Walter Julius Hennecke
b45d86b603 Continued work on client lua support 2011-12-06 00:36:06 +01:00
Harry Young
f69ff3a240 Begin of fx-conversion and a minor change to the laser turret
Going to open an issue here.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-05 23:07:12 +01:00
Harry Young
5931f48e12 Removed FX_DetailLevel
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-05 20:07:18 +01:00
Harry Young
0d3b6ad490 Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 2011-12-05 19:47:50 +01:00
Harry Young
90125906cb Fixes for misc_laser.
Still need float to transfer alpha-channel from game to cgame

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-05 19:47:42 +01:00
Walter Julius Hennecke
d3e0d7be93 forgot some more files lol 2011-12-05 19:22:14 +01:00
Walter Julius Hennecke
a25e243a03 started adding cgame lua support ... forgot to add two files 2011-12-05 19:20:02 +01:00
Walter Julius Hennecke
25f31e0255 started adding cgame lua support 2011-12-05 19:19:16 +01:00
Walter Julius Hennecke
252a52afdc ... 2011-12-05 17:44:24 +01:00
Walter Julius Hennecke
27c653a790 Merge branch 'master' of https://github.com/UberGames/RPG-X2 2011-12-05 17:22:08 +01:00
Walter Julius Hennecke
48b671fade cgame/Makefile update 2011-12-05 17:21:37 +01:00
Harry Young
61947264f6 Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 2011-12-05 17:13:11 +01:00
Harry Young
1fbd9796e2 Buggy fixes for misc_laser-turret
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-05 17:12:23 +01:00
Walter Julius Hennecke
b63fa5482f even more fixes 2011-12-05 16:37:03 +01:00
Walter Julius Hennecke
dd6c3b228d more fixes 2011-12-05 12:37:32 +01:00
Walter Julius Hennecke
c7785d73fa more fixes 2011-12-05 12:13:38 +01:00
Walter Julius Hennecke
f4b86b4576 more fixes as result of code analysis 2011-12-05 11:56:52 +01:00
Walter Julius Hennecke
12851350a9 Fixes resulting from static code analysis 2011-12-05 10:50:05 +01:00
Walter Julius Hennecke
958501a9e3 Added ToDo.txt files to cgame, game, and ui. 2011-12-05 10:33:40 +01:00
Walter Julius Hennecke
2116049ae7 forgot to commit those 2011-12-05 10:18:05 +01:00
Walter Julius Hennecke
28e548969f same as last commit 2011-12-05 10:15:56 +01:00
Walter Julius Hennecke
31bc452408 Removed even more unused things 2011-12-05 10:06:14 +01:00
Walter Julius Hennecke
12ed3c567a Removed more unsued stuff, renamed more files 2011-12-05 09:58:30 +01:00