ubergames/rpg-x2
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2.git synced 2024-11-24 21:32:36 +00:00
Code Issues Projects Releases Packages Wiki Activity
121 commits 1 branch 0 tags 16 MiB
Commit graph

82 commits

Author SHA1 Message Date
Harry Young
c9372420c6 Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 
Conflicts:
	game/bg_public.h
 2011-12-12 19:40:09 +01:00
Walter Julius Hennecke
836078764e Critical bugfix 
- Fixed a critical bug in g_spawn.c G_ParseField
 2011-12-12 19:34:23 +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
Walter Julius Hennecke
cf63b37933 Updated version macro 2011-12-12 17:56:22 +01:00
Walter Julius Hennecke
b940920c32 Merge branch 'master' of https://github.com/UberGames/RPG-X2 2011-12-12 17:47:03 +01:00
Walter Julius Hennecke
4f7dc8a382 Removed an unused rpgxEF only var from entitystate_s 2011-12-12 17:46:18 +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
Harry Young
f8b8a8179d Fixed crash when trying to kickvote an invalid client 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 22:10:31 +01:00
Harry Young
0d1033212e Minor glitch but this one is verified to work ^^ (I simply trashed and reloaded everything to get it running again) 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 20:30:19 +01:00
Harry Young
6354e2ee50 had an idea about map_restart, don't know if this works tough... 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 20:11:40 +01:00
Harry Young
7125194664 Removals were my mistake. Tought they were redundant with game-lib and mover-lib whereas they actually are not. 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 13:08:03 +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
166aa1db94 Have rewritten the spawn function of func_stasis_door. 
Changed the complete setup so areaportal states can be adjusted now.
This entity still needs a lot of work but we are on a good way now.
You don't mind if I work a bit more on this entity do you Harry?
 2011-12-10 00:03:03 +01:00
Harry Young
43d044fe4f Finished the update as good as I could. 
Removed something from entity that is already in game.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-09 15:52:19 +01:00
Harry Young
aee590c176 Added/Updated Lua-descriptions for mover and cinematic (guesstimate) 
will do the rest once I'm back home.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-09 10:41:49 +01:00
Harry Young
77f9f9e147 Added/Updated Lua-descriptions (some are guesstimates, tbc) 
Minor fix in g_spawn.c

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-09 01:58:06 +01:00
Walter Julius Hennecke
65f4ec4f0f A minor fix for func_stasis_door 2011-12-08 19:51:35 +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
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
0c24562b07 Fixed a bug in g_main.c where an entity was passed to an function insetead of its entity number. 2011-12-06 00:13:56 +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
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
252a52afdc ... 2011-12-05 17:44:24 +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
5c82193457 changes not worth mentioning 2011-12-05 17:04:34 +01:00
Walter Julius Hennecke
b63fa5482f even more fixes 2011-12-05 16:37:03 +01:00
Walter Julius Hennecke
18b101c4b6 Added entity fields startRGBA and endRGBA, minor bugfixes 2011-12-05 11:07:34 +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
28e548969f same as last commit 2011-12-05 10:15:56 +01:00
Walter Julius Hennecke
70fec391d2 Added missing , in bg_public.h 2011-12-05 09:42:23 +01:00
Harry Young
428e4d1c0b Prep for some additional SP-FX I'm going to try and port. 
Also I reintegrated the damage-support for fx_steam and made some 'Means of Death' more fitting.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-04 22:44:54 +01:00
Harry Young
f7a4f7443c Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 2011-12-03 16:02:18 +01:00
Harry Young
71435c116d Added Disruptor-Effect to fx_phaser 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-03 15:59:57 +01:00
Walter Hennecke
f34221f03b Code cleanup 
Code clean up and C99 to ANSIC comments of game/bg_misc.c
 2011-11-24 13:54:54 +01:00
Walter Hennecke
f4ceb2f558 Started work on adding Mac support (non rpgxEF) 
Maybe even for rpgxEF if I manage to get rpgxEF compiled for it.
 2011-11-22 11:52:50 +01:00
Harry Young
03f2bdfbd0 *Fixes to the Exit-Screen-Strings (Pretty cheap, I know ^^) Needs to be put in the .pak3 
*new g_turrets.c with what I've done so far with the Laser. Need sth to get the color done...

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-11-16 22:08:30 +01:00
Harry Young
166804ef93 *added Getter and Setter for 'wait' 
*updated Borg1 to new Setters and made use of the hooks where possible


Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-11-14 23:27:35 +01:00
Harry Young
6e8bfa7963 Okay, here's some: 
*fixed the Lua-Hooks so they finally give Entities (g_local.h and g_lua.c)
*excluded a dummy that was causing a compile warning (lua_entity.c)
*Fixed CenterPrint and ClientPrint so they give the Text instead of the Clientnumber

Next I'll try to reactivate the dn1-Laser-Minigame and maybe fix the turrets.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-11-14 13:33:07 +01:00
Harry Young
1ffa454382 uploaded a new folder with a not working 'fix' for the lua-hooks. I really have no idea what is causing the crash here. 
also readded 1 line of code I accidently removed.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-11-09 19:27:26 +01:00
Harry Young
03f3b522cc removed clientnumber frum lua_prints and slimmed them 
found the issue that was likely causing the error on the stasis-door (trap_LinkEntity) but now it causes a signal caught.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-11-09 00:07:13 +01:00
Harry Young
b81b1875ab Buggy version of a restructured and partly rewritten func_stasis_door 
somehow the trigger won't either spawn as anticipated or will not call it's touch-function
i put some debug-notes in the code for orientation

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-11-04 20:05:17 +01:00
Harry Young
ffd4e606e8 Fixed game.MessagePrint so it gives Message instead of quiet center print. 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-10-31 22:06:57 +01:00
UberGames
1c0613c59a Added target_shaderremap provided by Harry Young 
Signed-off-by: UberGames <admin@ubergames.org>
 2011-10-17 11:43:14 +02:00
UberGames
e03c490c2f Some fixes ... 2011-08-02 23:56:32 +02:00
UberGames
f10493a98d Some minor fixes... 2011-08-02 13:55:24 +02:00
UberGames
bc4ea34bba Some fixes as well as some recoded functions in lua entity lib. 2011-07-28 18:34:17 +02:00
UberGames
cf0a8dfaea Fixes to some Getters and Setters for lua entity lib as well as a few new getters and setters. 2011-07-28 18:00:52 +02:00